diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 53d8dd28..7f413c82 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,8 +36,8 @@ 5.4.0.0 true publish.html - 5 - 7.2.10.5 + 6 + 7.2.10.6 false true true diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index c40bf8be..73dc9b96 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -1456,17 +1456,17 @@ namespace ENI2.Excel mdh.PortOfCallLast30Days.Add(poc30d); } - string pName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 81 + i)); - string pCountry = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 81 + i)); + string pName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 82 + i)); + string pCountry = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 82 + i)); - poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 81 + i)); - poc30d.PortOfCallLast30DaysLocode = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", 81 + i)); + poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 82 + i)); + poc30d.PortOfCallLast30DaysLocode = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", 82 + i)); if (LocodeDB.PortNameFromLocode(poc30d.PortOfCallLast30DaysLocode).IsNullOrEmpty()) poc30d.PortOfCallLast30DaysLocode = ""; // Verbesserungsvorschlag Jul/21: CrewMembersJoined Häkchen abhängig von den Namen in der Spalte - bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", 81 + i)); + bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", 82 + i)); - string crewNameString = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 81 + i)); + string crewNameString = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 82 + i)); poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty(); // if crew members joined is set explicitly to true and the name is empty, still set the field to true