assign fields to occupancy type

deepsource-autofix-76c6eb20
Dan Gowans 2022-12-14 14:01:31 -05:00
parent c5b42fdc7c
commit 81855c83a7
4 changed files with 261 additions and 174 deletions

View File

@ -87,11 +87,11 @@ const initializeCemeteryDatabase = () => {
occupancyType: "Interment", occupancyType: "Interment",
orderNumber: 2 orderNumber: 2
}, session); }, session);
addOccupancyType({ const cremationOccupancyTypeId = addOccupancyType({
occupancyType: "Cremation", occupancyType: "Cremation",
orderNumber: 3 orderNumber: 3
}, session); }, session);
addOccupancyTypeField({ const deathDateField = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Date", occupancyTypeField: "Death Date",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -100,8 +100,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 10, minimumLength: 10,
maximumLength: 10, maximumLength: 10,
orderNumber: 1 orderNumber: 1
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(deathDateField, session);
addOccupancyTypeField(Object.assign(deathDateField, { occupancyTypeId: cremationOccupancyTypeId }), session);
const deathAgeField = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Age", occupancyTypeField: "Death Age",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -110,8 +112,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 1, minimumLength: 1,
maximumLength: 3, maximumLength: 3,
orderNumber: 2 orderNumber: 2
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(deathAgeField, session);
addOccupancyTypeField(Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }), session);
const deathAgePeriod = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Age Period", occupancyTypeField: "Death Age Period",
occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn", occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
@ -120,8 +124,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 1, minimumLength: 1,
maximumLength: 10, maximumLength: 10,
orderNumber: 3 orderNumber: 3
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(deathAgePeriod, session);
addOccupancyTypeField(Object.assign(deathAgePeriod, { occupancyTypeId: cremationOccupancyTypeId }), session);
const deathPlace = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Place", occupancyTypeField: "Death Place",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -130,8 +136,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 1, minimumLength: 1,
maximumLength: 100, maximumLength: 100,
orderNumber: 4 orderNumber: 4
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(deathPlace, session);
addOccupancyTypeField(Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }), session);
const funeralHome = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Funeral Home", occupancyTypeField: "Funeral Home",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -140,8 +148,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 1, minimumLength: 1,
maximumLength: 100, maximumLength: 100,
orderNumber: 10 orderNumber: 10
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(funeralHome, session);
addOccupancyTypeField(Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }), session);
const funeralDate = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Funeral Date", occupancyTypeField: "Funeral Date",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -150,8 +160,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 10, minimumLength: 10,
maximumLength: 10, maximumLength: 10,
orderNumber: 11 orderNumber: 11
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(funeralDate, session);
addOccupancyTypeField(Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }), session);
const containerType = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Container Type", occupancyTypeField: "Container Type",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -160,8 +172,10 @@ const initializeCemeteryDatabase = () => {
minimumLength: 1, minimumLength: 1,
maximumLength: 100, maximumLength: 100,
orderNumber: 20 orderNumber: 20
}, session); };
addOccupancyTypeField({ addOccupancyTypeField(containerType, session);
addOccupancyTypeField(Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }), session);
const committalType = {
occupancyTypeId: intermentOccupancyTypeId, occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Committal Type", occupancyTypeField: "Committal Type",
occupancyTypeFieldValues: "", occupancyTypeFieldValues: "",
@ -170,7 +184,9 @@ const initializeCemeteryDatabase = () => {
minimumLength: 1, minimumLength: 1,
maximumLength: 100, maximumLength: 100,
orderNumber: 21 orderNumber: 21
}, session); };
addOccupancyTypeField(committalType, session);
addOccupancyTypeField(Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }), session);
addFeeCategory({ addFeeCategory({
feeCategory: "Interment Rights", feeCategory: "Interment Rights",
orderNumber: 1 orderNumber: 1

View File

@ -185,7 +185,7 @@ const initializeCemeteryDatabase = () => {
session session
); );
addOccupancyType( const cremationOccupancyTypeId = addOccupancyType(
{ {
occupancyType: "Cremation", occupancyType: "Cremation",
orderNumber: 3 orderNumber: 3
@ -193,115 +193,163 @@ const initializeCemeteryDatabase = () => {
session session
); );
// Death Date
const deathDateField = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Date",
occupancyTypeFieldValues: "",
pattern: "\\d{4}([\\/-]\\d{2}){2}",
isRequired: "",
minimumLength: 10,
maximumLength: 10,
orderNumber: 1
};
addOccupancyTypeField(deathDateField, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(deathDateField, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Date",
occupancyTypeFieldValues: "",
pattern: "\\d{4}([\\/-]\\d{2}){2}",
isRequired: "",
minimumLength: 10,
maximumLength: 10,
orderNumber: 1
},
session session
); );
// Death Age
const deathAgeField = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Age",
occupancyTypeFieldValues: "",
pattern: "\\d+",
isRequired: "",
minimumLength: 1,
maximumLength: 3,
orderNumber: 2
};
addOccupancyTypeField(deathAgeField, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Age",
occupancyTypeFieldValues: "",
pattern: "\\d+",
isRequired: "",
minimumLength: 1,
maximumLength: 3,
orderNumber: 2
},
session session
); );
// Death Age Period
const deathAgePeriod = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Age Period",
occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 10,
orderNumber: 3
};
addOccupancyTypeField(deathAgePeriod, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(deathAgePeriod, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Age Period",
occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 10,
orderNumber: 3
},
session session
); );
// Death Place
const deathPlace = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Place",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 4
};
addOccupancyTypeField(deathPlace, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Death Place",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 4
},
session session
); );
// Funeral Home
const funeralHome = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Funeral Home",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 10
};
addOccupancyTypeField(funeralHome, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Funeral Home",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 10
},
session session
); );
// Funeral Date
const funeralDate = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Funeral Date",
occupancyTypeFieldValues: "",
pattern: "\\d{4}([\\/-]\\d{2}){2}",
isRequired: "",
minimumLength: 10,
maximumLength: 10,
orderNumber: 11
};
addOccupancyTypeField(funeralDate, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Funeral Date",
occupancyTypeFieldValues: "",
pattern: "\\d{4}([\\/-]\\d{2}){2}",
isRequired: "",
minimumLength: 10,
maximumLength: 10,
orderNumber: 11
},
session session
); );
// Container Type
const containerType = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Container Type",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 20
};
addOccupancyTypeField(containerType, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Container Type",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 20
},
session session
); );
// Committal Type
const committalType = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Committal Type",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 21
};
addOccupancyTypeField(committalType, session);
addOccupancyTypeField( addOccupancyTypeField(
{ Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }),
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: "Committal Type",
occupancyTypeFieldValues: "",
pattern: "",
isRequired: "",
minimumLength: 1,
maximumLength: 100,
orderNumber: 21
},
session session
); );

View File

@ -181,7 +181,6 @@ const takenLotStatus = cacheFunctions.getLotStatusByLotStatus("Taken");
const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Preneed"); const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Preneed");
const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment"); const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment");
const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation"); const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation");
const allOccupancyTypeFields = cacheFunctions.getAllOccupancyTypeFields();
const preneedOwnerLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Preneed Owner"); const preneedOwnerLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Preneed Owner");
const funeralDirectorLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Funeral Director"); const funeralDirectorLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Funeral Director");
const deceasedLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Deceased"); const deceasedLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Deceased");
@ -418,7 +417,9 @@ function importFromMasterCSV() {
const lotOccupancyFieldValue = formatDateString(masterRow.CM_DEATH_YR, masterRow.CM_DEATH_MON, masterRow.CM_DEATH_DAY); const lotOccupancyFieldValue = formatDateString(masterRow.CM_DEATH_YR, masterRow.CM_DEATH_MON, masterRow.CM_DEATH_DAY);
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: (lotId
? deceasedOccupancyType
: cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Date"; return occupancyTypeField.occupancyTypeField === "Death Date";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
@ -427,7 +428,9 @@ function importFromMasterCSV() {
if (masterRow.CM_AGE !== "") { if (masterRow.CM_AGE !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: (lotId
? deceasedOccupancyType
: cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Age"; return occupancyTypeField.occupancyTypeField === "Death Age";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: masterRow.CM_AGE lotOccupancyFieldValue: masterRow.CM_AGE
@ -436,8 +439,10 @@ function importFromMasterCSV() {
if (masterRow.CM_PERIOD !== "") { if (masterRow.CM_PERIOD !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: (lotId
return (occupancyTypeField.occupancyTypeField === "Death Age Period"); ? deceasedOccupancyType
: cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Age Period";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: masterRow.CM_PERIOD lotOccupancyFieldValue: masterRow.CM_PERIOD
}, user); }, user);
@ -461,7 +466,9 @@ function importFromMasterCSV() {
const lotOccupancyFieldValue = formatDateString(masterRow.CM_FUNERAL_YR, masterRow.CM_FUNERAL_MON, masterRow.CM_FUNERAL_DAY); const lotOccupancyFieldValue = formatDateString(masterRow.CM_FUNERAL_YR, masterRow.CM_FUNERAL_MON, masterRow.CM_FUNERAL_DAY);
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: (lotId
? deceasedOccupancyType
: cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Funeral Date"; return occupancyTypeField.occupancyTypeField === "Funeral Date";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
@ -470,8 +477,10 @@ function importFromMasterCSV() {
if (masterRow.CM_CONTAINER_TYPE !== "") { if (masterRow.CM_CONTAINER_TYPE !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: (lotId
return (occupancyTypeField.occupancyTypeField === "Container Type"); ? deceasedOccupancyType
: cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Container Type";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: masterRow.CM_CONTAINER_TYPE lotOccupancyFieldValue: masterRow.CM_CONTAINER_TYPE
}, user); }, user);
@ -483,8 +492,10 @@ function importFromMasterCSV() {
} }
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: (lotId
return (occupancyTypeField.occupancyTypeField === "Committal Type"); ? deceasedOccupancyType
: cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Committal Type";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: commitalType lotOccupancyFieldValue: commitalType
}, user); }, user);
@ -867,7 +878,7 @@ function importFromWorkOrderCSV() {
const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY); const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Date"; return occupancyTypeField.occupancyTypeField === "Death Date";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
@ -876,7 +887,7 @@ function importFromWorkOrderCSV() {
if (workOrderRow.WO_DEATH_PLACE !== "") { if (workOrderRow.WO_DEATH_PLACE !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Place"; return occupancyTypeField.occupancyTypeField === "Death Place";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE
@ -885,7 +896,7 @@ function importFromWorkOrderCSV() {
if (workOrderRow.WO_AGE !== "") { if (workOrderRow.WO_AGE !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Age"; return occupancyTypeField.occupancyTypeField === "Death Age";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_AGE lotOccupancyFieldValue: workOrderRow.WO_AGE
@ -894,7 +905,7 @@ function importFromWorkOrderCSV() {
if (workOrderRow.WO_PERIOD !== "") { if (workOrderRow.WO_PERIOD !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Death Age Period"; return occupancyTypeField.occupancyTypeField === "Death Age Period";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_PERIOD lotOccupancyFieldValue: workOrderRow.WO_PERIOD
@ -919,7 +930,7 @@ function importFromWorkOrderCSV() {
const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_FUNERAL_YR, workOrderRow.WO_FUNERAL_MON, workOrderRow.WO_FUNERAL_DAY); const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_FUNERAL_YR, workOrderRow.WO_FUNERAL_MON, workOrderRow.WO_FUNERAL_DAY);
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Funeral Date"; return occupancyTypeField.occupancyTypeField === "Funeral Date";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
@ -928,7 +939,7 @@ function importFromWorkOrderCSV() {
if (workOrderRow.WO_CONTAINER_TYPE !== "") { if (workOrderRow.WO_CONTAINER_TYPE !== "") {
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Container Type"; return occupancyTypeField.occupancyTypeField === "Container Type";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_CONTAINER_TYPE lotOccupancyFieldValue: workOrderRow.WO_CONTAINER_TYPE
@ -941,7 +952,7 @@ function importFromWorkOrderCSV() {
} }
addOrUpdateLotOccupancyField({ addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
return occupancyTypeField.occupancyTypeField === "Committal Type"; return occupancyTypeField.occupancyTypeField === "Committal Type";
}).occupancyTypeFieldId, }).occupancyTypeFieldId,
lotOccupancyFieldValue: commitalType lotOccupancyFieldValue: commitalType

View File

@ -415,8 +415,6 @@ const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Pre
const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment"); const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment");
const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation"); const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation");
const allOccupancyTypeFields = cacheFunctions.getAllOccupancyTypeFields();
const preneedOwnerLotOccupantType = const preneedOwnerLotOccupantType =
cacheFunctions.getLotOccupantTypeByLotOccupantType("Preneed Owner"); cacheFunctions.getLotOccupantTypeByLotOccupantType("Preneed Owner");
const funeralDirectorLotOccupantType = const funeralDirectorLotOccupantType =
@ -760,11 +758,12 @@ function importFromMasterCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find( occupancyTypeFieldId: (lotId
(occupancyTypeField) => { ? deceasedOccupancyType
return occupancyTypeField.occupancyTypeField === "Death Date"; : cremationOccupancyType
} ).occupancyTypeFields.find((occupancyTypeField) => {
).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Death Date";
}).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
}, },
user user
@ -775,11 +774,12 @@ function importFromMasterCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find( occupancyTypeFieldId: (lotId
(occupancyTypeField) => { ? deceasedOccupancyType
return occupancyTypeField.occupancyTypeField === "Death Age"; : cremationOccupancyType
} ).occupancyTypeFields.find((occupancyTypeField) => {
).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Death Age";
}).occupancyTypeFieldId,
lotOccupancyFieldValue: masterRow.CM_AGE lotOccupancyFieldValue: masterRow.CM_AGE
}, },
user user
@ -790,13 +790,12 @@ function importFromMasterCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find( occupancyTypeFieldId: (lotId
(occupancyTypeField) => { ? deceasedOccupancyType
return ( : cremationOccupancyType
occupancyTypeField.occupancyTypeField === "Death Age Period" ).occupancyTypeFields.find((occupancyTypeField) => {
); return occupancyTypeField.occupancyTypeField === "Death Age Period";
} }).occupancyTypeFieldId,
).occupancyTypeFieldId,
lotOccupancyFieldValue: masterRow.CM_PERIOD lotOccupancyFieldValue: masterRow.CM_PERIOD
}, },
user user
@ -848,11 +847,12 @@ function importFromMasterCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find( occupancyTypeFieldId: (lotId
(occupancyTypeField) => { ? deceasedOccupancyType
return occupancyTypeField.occupancyTypeField === "Funeral Date"; : cremationOccupancyType
} ).occupancyTypeFields.find((occupancyTypeField) => {
).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Funeral Date";
}).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
}, },
user user
@ -863,13 +863,12 @@ function importFromMasterCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find( occupancyTypeFieldId: (lotId
(occupancyTypeField) => { ? deceasedOccupancyType
return ( : cremationOccupancyType
occupancyTypeField.occupancyTypeField === "Container Type" ).occupancyTypeFields.find((occupancyTypeField) => {
); return occupancyTypeField.occupancyTypeField === "Container Type";
} }).occupancyTypeFieldId,
).occupancyTypeFieldId,
lotOccupancyFieldValue: masterRow.CM_CONTAINER_TYPE lotOccupancyFieldValue: masterRow.CM_CONTAINER_TYPE
}, },
user user
@ -886,13 +885,12 @@ function importFromMasterCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find( occupancyTypeFieldId: (lotId
(occupancyTypeField) => { ? deceasedOccupancyType
return ( : cremationOccupancyType
occupancyTypeField.occupancyTypeField === "Committal Type" ).occupancyTypeFields.find((occupancyTypeField) => {
); return occupancyTypeField.occupancyTypeField === "Committal Type";
} }).occupancyTypeFieldId,
).occupancyTypeFieldId,
lotOccupancyFieldValue: commitalType lotOccupancyFieldValue: commitalType
}, },
user user
@ -1432,9 +1430,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Death Date"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Death Date";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
}, },
user user
@ -1445,9 +1445,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Death Place"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Death Place";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE
}, },
user user
@ -1458,9 +1460,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Death Age"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Death Age";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_AGE lotOccupancyFieldValue: workOrderRow.WO_AGE
}, },
user user
@ -1471,9 +1475,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Death Age Period"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Death Age Period";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_PERIOD lotOccupancyFieldValue: workOrderRow.WO_PERIOD
}, },
user user
@ -1523,9 +1529,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Funeral Date"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Funeral Date";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue lotOccupancyFieldValue
}, },
user user
@ -1536,9 +1544,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Container Type"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Container Type";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue: workOrderRow.WO_CONTAINER_TYPE lotOccupancyFieldValue: workOrderRow.WO_CONTAINER_TYPE
}, },
user user
@ -1555,9 +1565,11 @@ function importFromWorkOrderCSV() {
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
{ {
lotOccupancyId: lotOccupancyId, lotOccupancyId: lotOccupancyId,
occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => { occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
return occupancyTypeField.occupancyTypeField === "Committal Type"; (occupancyTypeField) => {
}).occupancyTypeFieldId, return occupancyTypeField.occupancyTypeField === "Committal Type";
}
).occupancyTypeFieldId,
lotOccupancyFieldValue: commitalType lotOccupancyFieldValue: commitalType
}, },
user user