steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set end date for cremations

deepsource-autofix-76c6eb20
Dan Gowans 2022-09-08 16:10:53 -04:00
parent 55addc1085
commit bcddcdc689
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
temp/legacy.importFromCSV.js
View File

@ -302,7 +302,6 @@ function importFromMasterCSV() {
let deceasedLotOccupancyId; let deceasedLotOccupancyId;
if (masterRow.CM_DECEASED_NAME) { if (masterRow.CM_DECEASED_NAME) {
deceasedOccupancyStartDateString = formatDateString(masterRow.CM_INTERMENT_YR, masterRow.CM_INTERMENT_MON, masterRow.CM_INTERMENT_DAY); deceasedOccupancyStartDateString = formatDateString(masterRow.CM_INTERMENT_YR, masterRow.CM_INTERMENT_MON, masterRow.CM_INTERMENT_DAY);
const occupancyEndDateString = "";
if (deceasedOccupancyStartDateString === "0000-00-00" && if (deceasedOccupancyStartDateString === "0000-00-00" &&
masterRow.CM_DEATH_YR !== "" && masterRow.CM_DEATH_YR !== "" &&
masterRow.CM_DEATH_YR !== "0") { masterRow.CM_DEATH_YR !== "0") {
@ -312,13 +311,16 @@ function importFromMasterCSV() {
deceasedOccupancyStartDateString === "0000-00-00") { deceasedOccupancyStartDateString === "0000-00-00") {
deceasedOccupancyStartDateString = "0001-01-01"; deceasedOccupancyStartDateString = "0001-01-01";
} }
const deceasedOccupancyEndDateString = lotId
? ""
: deceasedOccupancyStartDateString;
deceasedLotOccupancyId = addLotOccupancy({ deceasedLotOccupancyId = addLotOccupancy({
occupancyTypeId: lotId occupancyTypeId: lotId
? deceasedOccupancyType.occupancyTypeId ? deceasedOccupancyType.occupancyTypeId
: cremationOccupancyType.occupancyTypeId, : cremationOccupancyType.occupancyTypeId,
lotId, lotId,
occupancyStartDateString: deceasedOccupancyStartDateString, occupancyStartDateString: deceasedOccupancyStartDateString,
occupancyEndDateString, occupancyEndDateString: deceasedOccupancyEndDateString,
occupancyTypeFieldIds: "" occupancyTypeFieldIds: ""
}, user); }, user);
const deceasedPostalCode = ((masterRow.CM_POST1 || "") + const deceasedPostalCode = ((masterRow.CM_POST1 || "") +

8
temp/legacy.importFromCSV.ts
View File

@ -630,8 +630,6 @@ function importFromMasterCSV() {
masterRow.CM_INTERMENT_DAY masterRow.CM_INTERMENT_DAY
); );
const occupancyEndDateString = "";
// if interment date unavailable // if interment date unavailable
if ( if (
deceasedOccupancyStartDateString === "0000-00-00" && deceasedOccupancyStartDateString === "0000-00-00" &&
@ -652,6 +650,10 @@ function importFromMasterCSV() {
deceasedOccupancyStartDateString = "0001-01-01"; deceasedOccupancyStartDateString = "0001-01-01";
} }
const deceasedOccupancyEndDateString = lotId
? ""
: deceasedOccupancyStartDateString;
deceasedLotOccupancyId = addLotOccupancy( deceasedLotOccupancyId = addLotOccupancy(
{ {
occupancyTypeId: lotId occupancyTypeId: lotId
@ -660,7 +662,7 @@ function importFromMasterCSV() {
lotId, lotId,
occupancyStartDateString: occupancyStartDateString:
deceasedOccupancyStartDateString, deceasedOccupancyStartDateString,
occupancyEndDateString, occupancyEndDateString: deceasedOccupancyEndDateString,
occupancyTypeFieldIds: "" occupancyTypeFieldIds: ""
}, },
user user