diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 22956d13..8e94a5bf 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -302,7 +302,6 @@ function importFromMasterCSV() { let deceasedLotOccupancyId; if (masterRow.CM_DECEASED_NAME) { deceasedOccupancyStartDateString = formatDateString(masterRow.CM_INTERMENT_YR, masterRow.CM_INTERMENT_MON, masterRow.CM_INTERMENT_DAY); - const occupancyEndDateString = ""; if (deceasedOccupancyStartDateString === "0000-00-00" && masterRow.CM_DEATH_YR !== "" && masterRow.CM_DEATH_YR !== "0") { @@ -312,13 +311,16 @@ function importFromMasterCSV() { deceasedOccupancyStartDateString === "0000-00-00") { deceasedOccupancyStartDateString = "0001-01-01"; } + const deceasedOccupancyEndDateString = lotId + ? "" + : deceasedOccupancyStartDateString; deceasedLotOccupancyId = addLotOccupancy({ occupancyTypeId: lotId ? deceasedOccupancyType.occupancyTypeId : cremationOccupancyType.occupancyTypeId, lotId, occupancyStartDateString: deceasedOccupancyStartDateString, - occupancyEndDateString, + occupancyEndDateString: deceasedOccupancyEndDateString, occupancyTypeFieldIds: "" }, user); const deceasedPostalCode = ((masterRow.CM_POST1 || "") + diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index ccd86b43..d0716c94 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -630,8 +630,6 @@ function importFromMasterCSV() { masterRow.CM_INTERMENT_DAY ); - const occupancyEndDateString = ""; - // if interment date unavailable if ( deceasedOccupancyStartDateString === "0000-00-00" && @@ -652,6 +650,10 @@ function importFromMasterCSV() { deceasedOccupancyStartDateString = "0001-01-01"; } + const deceasedOccupancyEndDateString = lotId + ? "" + : deceasedOccupancyStartDateString; + deceasedLotOccupancyId = addLotOccupancy( { occupancyTypeId: lotId @@ -660,7 +662,7 @@ function importFromMasterCSV() { lotId, occupancyStartDateString: deceasedOccupancyStartDateString, - occupancyEndDateString, + occupancyEndDateString: deceasedOccupancyEndDateString, occupancyTypeFieldIds: "" }, user