diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 4f4ab7f8..34eef3a9 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,8 +36,8 @@ 5.4.0.0 true publish.html - 5 - 7.2.0.%2a + 6 + 7.2.0.6 false true true diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs index 9951e1b4..d2f9ff71 100644 --- a/ENI2/Excel/DakosyUtil.cs +++ b/ENI2/Excel/DakosyUtil.cs @@ -93,7 +93,7 @@ namespace ENI2.Excel if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD)) { if (ScanNOA_NOD(message, reader)) ExcelReader.SaveMessage(message); continue; } if ((message.MessageNotificationClass == Message.NotificationClass.PASA) && notificationClasses.Contains(Message.NotificationClass.PASA)) - { if (ScanPAS(message, reader)) ExcelReader.SaveMessage(message); continue; } + { if (ScanPASA(message, reader)) ExcelReader.SaveMessage(message); continue; } if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD)) { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; } if ((message.MessageNotificationClass == Message.NotificationClass.POBA) && notificationClasses.Contains(Message.NotificationClass.POBA)) @@ -778,7 +778,7 @@ namespace ENI2.Excel #region PAS - private static bool ScanPAS(Message pasMessage, ExcelReader reader) + private static bool ScanPASA(Message pasMessage, ExcelReader reader) { bool result = false; for (int i = 0; i < 1000; i++) @@ -807,7 +807,7 @@ namespace ENI2.Excel pas.PassengerNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("H{0}", i + 16)), out canceled); if(canceled) return false; pas.PassengerIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("O{0}", i + 16)), out canceled); - if (!canceled) return false; + if (canceled) return false; pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("passenger arrival", string.Format("P{0}", i + 16)); pas.EmergencyCare = reader.ReadCellAsText("passenger arrival", string.Format("Q{0}", i + 16));