add cremation occupancy type

deepsource-autofix-76c6eb20
Dan Gowans 2022-08-23 16:17:30 -04:00
parent 345dfc8299
commit 37f10ed88b
4 changed files with 56 additions and 28 deletions

View File

@ -82,6 +82,10 @@ const initializeCemeteryDatabase = () => {
occupancyType: "Interment",
orderNumber: 2
}, session);
addOccupancyType({
occupancyType: "Cremation",
orderNumber: 3
}, session);
addOccupancyTypeField({
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Date",

View File

@ -153,6 +153,11 @@ const initializeCemeteryDatabase = () => {
orderNumber: 2
}, session);
addOccupancyType({
occupancyType: "Cremation",
orderNumber: 3
}, session);
addOccupancyTypeField({
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Date",

View File

@ -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,

View File

@ -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({