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

Fixed a few bugs in the modified Excel import

Browse Source
This commit is contained in:
Daniel Schick 2025-08-05 09:57:48 +02:00
parent 973b0c267c
commit a434b419ad
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ENI2/Excel/ExcelUtil.cs
View File

@ -1495,7 +1495,7 @@ namespace ENI2.Excel
} }
// Leer/def. Zeilen entfernen // Leer/def. Zeilen entfernen
if (!poc30d.PortOfCallLast30DaysDateOfDeparture.HasValue && (poc30d.PortOfCallLast30DaysLocode == null)) if (!poc30d.PortOfCallLast30DaysDateOfDeparture.HasValue && (poc30d.PortOfCallLast30DaysLocode.IsNullOrEmpty()))
mdh.PortOfCallLast30Days.Remove(poc30d); mdh.PortOfCallLast30Days.Remove(poc30d);
} }
} }
@ -1610,6 +1610,9 @@ namespace ENI2.Excel
} }
SEC sec = secMessage.Elements[0] as SEC; SEC sec = secMessage.Elements[0] as SEC;
((ISublistContainer)sec).DeleteElements();
ScanMessage(sec, reader); ScanMessage(sec, reader);
reader.ReadBoolean("SEC.AreMatterToReport"); // das berücksichtigen wir derzeit nicht in der DB (implizit) reader.ReadBoolean("SEC.AreMatterToReport"); // das berücksichtigen wir derzeit nicht in der DB (implizit)
@ -1660,6 +1663,8 @@ namespace ENI2.Excel
if (!sec.KielCanalPassagePlannedIncomming.HasValue && !sec.KielCanalPassagePlannedOutgoing.HasValue) if (!sec.KielCanalPassagePlannedIncomming.HasValue && !sec.KielCanalPassagePlannedOutgoing.HasValue)
sec.KielCanalPassagePlanned = false; sec.KielCanalPassagePlanned = false;
string sheetTitle = "1. VOYAGE"; string sheetTitle = "1. VOYAGE";
// 4.8.25: Changed this area to work like reading from a Dakosy Sheet (by values in rows, not cell names) // 4.8.25: Changed this area to work like reading from a Dakosy Sheet (by values in rows, not cell names)
if (reader.HasWorksheetNamed(sheetTitle)) if (reader.HasWorksheetNamed(sheetTitle))
@ -1668,10 +1673,10 @@ namespace ENI2.Excel
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
if (!(sec.GetPortFacilityWithIdentifier(i.ToString()) is LastTenPortFacilitiesCalled l10fc)) if (!(sec.GetPortFacilityWithIdentifier((i + 1).ToString()) is LastTenPortFacilitiesCalled l10fc))
{ {
l10fc = new LastTenPortFacilitiesCalled(); l10fc = new LastTenPortFacilitiesCalled();
l10fc.Identifier = i.ToString(); l10fc.Identifier = (i + 1).ToString();
l10fc.SEC = sec; l10fc.SEC = sec;
sec.LastTenPortFacilitesCalled.Add(l10fc); sec.LastTenPortFacilitesCalled.Add(l10fc);
} }
@ -1711,10 +1716,10 @@ namespace ENI2.Excel
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
if (!(sec.GetShipToShipWithIdentifier(i.ToString()) is ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2sActivity)) if (!(sec.GetShipToShipWithIdentifier((i + 1).ToString()) is ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2sActivity))
{ {
s2sActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled(); s2sActivity = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
s2sActivity.Identifier = i.ToString(); s2sActivity.Identifier = (i + 1).ToString();
s2sActivity.SEC = sec; s2sActivity.SEC = sec;
sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2sActivity); sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2sActivity);
} }