diff --git a/helpers/initializer.database.cemetery.js b/helpers/initializer.database.cemetery.js index 9766eb54..80ab0870 100644 --- a/helpers/initializer.database.cemetery.js +++ b/helpers/initializer.database.cemetery.js @@ -82,6 +82,10 @@ const initializeCemeteryDatabase = () => { occupancyType: "Interment", orderNumber: 2 }, session); + addOccupancyType({ + occupancyType: "Cremation", + orderNumber: 3 + }, session); addOccupancyTypeField({ occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Death Date", diff --git a/helpers/initializer.database.cemetery.ts b/helpers/initializer.database.cemetery.ts index acb24172..02dbe37a 100644 --- a/helpers/initializer.database.cemetery.ts +++ b/helpers/initializer.database.cemetery.ts @@ -153,6 +153,11 @@ const initializeCemeteryDatabase = () => { orderNumber: 2 }, session); + addOccupancyType({ + occupancyType: "Cremation", + orderNumber: 3 + }, session); + addOccupancyTypeField({ occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Death Date", diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 740558b3..482c5100 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -160,6 +160,7 @@ const reservedLotStatus = cacheFunctions.getLotStatusByLotStatus("Reserved"); const takenLotStatus = cacheFunctions.getLotStatusByLotStatus("Taken"); const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Preneed"); const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment"); +const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation"); const preneedOwnerLotOccupantType = cacheFunctions.getLotOccupantTypesByLotOccupantType("Preneed Owner"); const deceasedLotOccupantType = cacheFunctions.getLotOccupantTypesByLotOccupantType("Deceased"); const arrangerLotOccupantType = cacheFunctions.getLotOccupantTypesByLotOccupantType("Arranger"); @@ -193,15 +194,18 @@ function importFromMasterCSV() { const lotType = getLotType({ cemetery: masterRow.CM_CEMETERY }); - const lotId = addLot({ - lotName: lotName, - lotTypeId: lotType.lotTypeId, - lotStatusId: availableLotStatus.lotStatusId, - mapId: map.mapId, - mapKey: lotName, - lotLatitude: "", - lotLongitude: "" - }, user); + let lotId; + if (masterRow.CM_CEMETERY !== "00") { + lotId = addLot({ + lotName: lotName, + lotTypeId: lotType.lotTypeId, + lotStatusId: availableLotStatus.lotStatusId, + mapId: map.mapId, + mapKey: lotName, + lotLatitude: "", + lotLongitude: "" + }, user); + } if (masterRow.CM_PRENEED_ORDER) { let occupancyStartDateString = formatDateString(masterRow.CM_PURCHASE_YR, masterRow.CM_PURCHASE_MON, masterRow.CM_PURCHASE_DAY); let occupancyEndDateString = ""; @@ -266,7 +270,7 @@ function importFromMasterCSV() { occupancyStartDateString = "0001-01-01"; } const lotOccupancyId = addLotOccupancy({ - occupancyTypeId: deceasedOccupancyType.occupancyTypeId, + occupancyTypeId: lotId ? deceasedOccupancyType.occupancyTypeId : cremationOccupancyType.occupancyTypeId, lotId, occupancyStartDateString, occupancyEndDateString, @@ -394,13 +398,17 @@ function importFromPrepaidCSV() { if (!prepaidRow.CMPP_PREPAID_FOR_NAME) { continue; } + let cemetery = prepaidRow.CMPP_CEMETERY; + if (cemetery && cemetery === ".m") { + cemetery = "HC"; + } let lot; - if (prepaidRow.CMPP_CEMETERY) { + if (cemetery) { const map = getMap({ - cemetery: prepaidRow.CMPP_CEMETERY + cemetery }); const lotName = buildLotName({ - cemetery: prepaidRow.CMPP_CEMETERY, + cemetery, block: prepaidRow.CMPP_BLOCK, range1: prepaidRow.CMPP_RANGE1, range2: prepaidRow.CMPP_RANGE2, @@ -419,7 +427,7 @@ function importFromPrepaidCSV() { } else { const lotType = getLotType({ - cemetery: prepaidRow.CMPP_CEMETERY + cemetery }); const lotId = addLot({ lotName: lotName, diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index 6347f59c..64335843 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -373,6 +373,7 @@ const takenLotStatus = cacheFunctions.getLotStatusByLotStatus("Taken"); const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Preneed"); const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment"); +const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation"); const preneedOwnerLotOccupantType = cacheFunctions.getLotOccupantTypesByLotOccupantType("Preneed Owner"); const deceasedLotOccupantType = cacheFunctions.getLotOccupantTypesByLotOccupantType("Deceased"); @@ -418,15 +419,19 @@ function importFromMasterCSV() { cemetery: masterRow.CM_CEMETERY }); - const lotId = addLot({ - lotName: lotName, - lotTypeId: lotType.lotTypeId, - lotStatusId: availableLotStatus.lotStatusId, - mapId: map.mapId, - mapKey: lotName, - lotLatitude: "", - lotLongitude: "" - }, user); + let lotId: number; + + if (masterRow.CM_CEMETERY !== "00") { + lotId = addLot({ + lotName: lotName, + lotTypeId: lotType.lotTypeId, + lotStatusId: availableLotStatus.lotStatusId, + mapId: map.mapId, + mapKey: lotName, + lotLatitude: "", + lotLongitude: "" + }, user); + } if (masterRow.CM_PRENEED_ORDER) { @@ -523,7 +528,7 @@ function importFromMasterCSV() { } const lotOccupancyId = addLotOccupancy({ - occupancyTypeId: deceasedOccupancyType.occupancyTypeId, + occupancyTypeId: lotId ? deceasedOccupancyType.occupancyTypeId : cremationOccupancyType.occupancyTypeId, lotId, occupancyStartDateString, occupancyEndDateString, @@ -686,16 +691,22 @@ function importFromPrepaidCSV() { continue; } + let cemetery = prepaidRow.CMPP_CEMETERY; + + if (cemetery && cemetery === ".m") { + cemetery = "HC" + } + let lot: recordTypes.Lot; - if (prepaidRow.CMPP_CEMETERY) { + if (cemetery) { const map = getMap({ - cemetery: prepaidRow.CMPP_CEMETERY + cemetery }); const lotName = buildLotName({ - cemetery: prepaidRow.CMPP_CEMETERY, + cemetery, block: prepaidRow.CMPP_BLOCK, range1: prepaidRow.CMPP_RANGE1, range2: prepaidRow.CMPP_RANGE2, @@ -716,7 +727,7 @@ function importFromPrepaidCSV() { } else { const lotType = getLotType({ - cemetery: prepaidRow.CMPP_CEMETERY + cemetery }); const lotId = addLot({