only create milestones with active types

deepsource-autofix-76c6eb20
Dan Gowans 2022-12-14 15:08:16 -05:00
parent 5f249d7dbd
commit 8a22aa1ca5
2 changed files with 138 additions and 114 deletions

View File

@ -964,30 +964,36 @@ function importFromWorkOrderCSV() {
}, user); }, user);
let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN; let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN;
let maxMilestoneCompletionDateString = workOrderOpenDateString; let maxMilestoneCompletionDateString = workOrderOpenDateString;
addWorkOrderMilestone({ if (acknowledgedWorkOrderMilestoneType) {
workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDateString: workOrderOpenDateString,
workOrderMilestoneDescription: "",
workOrderMilestoneCompletionDateString: workOrderRow.WO_CONFIRMATION_IN
? workOrderOpenDateString
: undefined,
workOrderMilestoneCompletionTimeString: workOrderRow.WO_CONFIRMATION_IN
? "00:00"
: undefined
}, user);
if (workOrderRow.WO_DEATH_YR) {
const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
addWorkOrderMilestone({ addWorkOrderMilestone({
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: deathWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId: acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDateString, workOrderMilestoneDateString: workOrderOpenDateString,
workOrderMilestoneDescription: "Death Place: " + workOrderRow.WO_DEATH_PLACE, workOrderMilestoneDescription: "",
workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionDateString: workOrderRow.WO_CONFIRMATION_IN
? workOrderMilestoneDateString ? workOrderOpenDateString
: undefined, : undefined,
workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString ? "00:00" : undefined workOrderMilestoneCompletionTimeString: workOrderRow.WO_CONFIRMATION_IN
? "00:00"
: undefined
}, user); }, user);
}
if (workOrderRow.WO_DEATH_YR) {
const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
if (deathWorkOrderMilestoneType) {
addWorkOrderMilestone({
workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: deathWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDateString,
workOrderMilestoneDescription: "Death Place: " + workOrderRow.WO_DEATH_PLACE,
workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
? workOrderMilestoneDateString
: undefined,
workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString
? "00:00"
: undefined
}, user);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
} }
@ -1002,19 +1008,21 @@ function importFromWorkOrderCSV() {
funeralHour += 12; funeralHour += 12;
} }
const workOrderMilestoneTimeString = formatTimeString(funeralHour.toString(), workOrderRow.WO_FUNERAL_MIN); const workOrderMilestoneTimeString = formatTimeString(funeralHour.toString(), workOrderRow.WO_FUNERAL_MIN);
addWorkOrderMilestone({ if (funeralWorkOrderMilestoneType) {
workOrderId: workOrder.workOrderId, addWorkOrderMilestone({
workOrderMilestoneTypeId: funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderId: workOrder.workOrderId,
workOrderMilestoneDateString, workOrderMilestoneTypeId: funeralWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneTimeString, workOrderMilestoneDateString,
workOrderMilestoneDescription: "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME, workOrderMilestoneTimeString,
workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString workOrderMilestoneDescription: "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME,
? workOrderMilestoneDateString workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
: undefined, ? workOrderMilestoneDateString
workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString : undefined,
? workOrderMilestoneTimeString workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString
: undefined ? workOrderMilestoneTimeString
}, user); : undefined
}, user);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
} }
@ -1022,7 +1030,7 @@ function importFromWorkOrderCSV() {
hasIncompleteMilestones = true; hasIncompleteMilestones = true;
} }
} }
if (workOrderRow.WO_CREMATION === "Y") { if (workOrderRow.WO_CREMATION === "Y" && cremationWorkOrderMilestoneType) {
addWorkOrderMilestone({ addWorkOrderMilestone({
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: cremationWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId: cremationWorkOrderMilestoneType.workOrderMilestoneTypeId,
@ -1038,16 +1046,20 @@ function importFromWorkOrderCSV() {
} }
if (workOrderRow.WO_INTERMENT_YR) { if (workOrderRow.WO_INTERMENT_YR) {
const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_INTERMENT_YR, workOrderRow.WO_INTERMENT_MON, workOrderRow.WO_INTERMENT_DAY); const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_INTERMENT_YR, workOrderRow.WO_INTERMENT_MON, workOrderRow.WO_INTERMENT_DAY);
addWorkOrderMilestone({ if (intermentWorkOrderMilestoneType) {
workOrderId: workOrder.workOrderId, addWorkOrderMilestone({
workOrderMilestoneTypeId: intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderId: workOrder.workOrderId,
workOrderMilestoneDateString, workOrderMilestoneTypeId: intermentWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH, workOrderMilestoneDateString,
workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH,
? workOrderMilestoneDateString workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
: undefined, ? workOrderMilestoneDateString
workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString ? "23:59" : undefined : undefined,
}, user); workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString
? "23:59"
: undefined
}, user);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
} }

View File

@ -1589,22 +1589,24 @@ function importFromWorkOrderCSV() {
let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN; let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN;
let maxMilestoneCompletionDateString = workOrderOpenDateString; let maxMilestoneCompletionDateString = workOrderOpenDateString;
addWorkOrderMilestone( if (acknowledgedWorkOrderMilestoneType) {
{ addWorkOrderMilestone(
workOrderId: workOrder.workOrderId, {
workOrderMilestoneTypeId: workOrderId: workOrder.workOrderId,
acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId:
workOrderMilestoneDateString: workOrderOpenDateString, acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDescription: "", workOrderMilestoneDateString: workOrderOpenDateString,
workOrderMilestoneCompletionDateString: workOrderRow.WO_CONFIRMATION_IN workOrderMilestoneDescription: "",
? workOrderOpenDateString workOrderMilestoneCompletionDateString: workOrderRow.WO_CONFIRMATION_IN
: undefined, ? workOrderOpenDateString
workOrderMilestoneCompletionTimeString: workOrderRow.WO_CONFIRMATION_IN : undefined,
? "00:00" workOrderMilestoneCompletionTimeString: workOrderRow.WO_CONFIRMATION_IN
: undefined ? "00:00"
}, : undefined
user },
); user
);
}
if (workOrderRow.WO_DEATH_YR) { if (workOrderRow.WO_DEATH_YR) {
const workOrderMilestoneDateString = formatDateString( const workOrderMilestoneDateString = formatDateString(
@ -1613,23 +1615,27 @@ function importFromWorkOrderCSV() {
workOrderRow.WO_DEATH_DAY workOrderRow.WO_DEATH_DAY
); );
addWorkOrderMilestone( if (deathWorkOrderMilestoneType) {
{ addWorkOrderMilestone(
workOrderId: workOrder.workOrderId, {
workOrderMilestoneTypeId: workOrderId: workOrder.workOrderId,
deathWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId:
workOrderMilestoneDateString, deathWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDescription: workOrderMilestoneDateString,
"Death Place: " + workOrderRow.WO_DEATH_PLACE, workOrderMilestoneDescription:
workOrderMilestoneCompletionDateString: "Death Place: " + workOrderRow.WO_DEATH_PLACE,
workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionDateString:
? workOrderMilestoneDateString workOrderMilestoneDateString < currentDateString
: undefined, ? workOrderMilestoneDateString
workOrderMilestoneCompletionTimeString: : undefined,
workOrderMilestoneDateString < currentDateString ? "00:00" : undefined workOrderMilestoneCompletionTimeString:
}, workOrderMilestoneDateString < currentDateString
user ? "00:00"
); : undefined
},
user
);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
@ -1657,26 +1663,28 @@ function importFromWorkOrderCSV() {
workOrderRow.WO_FUNERAL_MIN workOrderRow.WO_FUNERAL_MIN
); );
addWorkOrderMilestone( if (funeralWorkOrderMilestoneType) {
{ addWorkOrderMilestone(
workOrderId: workOrder.workOrderId, {
workOrderMilestoneTypeId: workOrderId: workOrder.workOrderId,
funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId:
workOrderMilestoneDateString, funeralWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneTimeString, workOrderMilestoneDateString,
workOrderMilestoneDescription: workOrderMilestoneTimeString,
"Funeral Home: " + workOrderRow.WO_FUNERAL_HOME, workOrderMilestoneDescription:
workOrderMilestoneCompletionDateString: "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME,
workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionDateString:
? workOrderMilestoneDateString workOrderMilestoneDateString < currentDateString
: undefined, ? workOrderMilestoneDateString
workOrderMilestoneCompletionTimeString: : undefined,
workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionTimeString:
? workOrderMilestoneTimeString workOrderMilestoneDateString < currentDateString
: undefined ? workOrderMilestoneTimeString
}, : undefined
user },
); user
);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
@ -1687,7 +1695,7 @@ function importFromWorkOrderCSV() {
} }
} }
if (workOrderRow.WO_CREMATION === "Y") { if (workOrderRow.WO_CREMATION === "Y" && cremationWorkOrderMilestoneType) {
addWorkOrderMilestone( addWorkOrderMilestone(
{ {
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
@ -1715,22 +1723,26 @@ function importFromWorkOrderCSV() {
workOrderRow.WO_INTERMENT_DAY workOrderRow.WO_INTERMENT_DAY
); );
addWorkOrderMilestone( if (intermentWorkOrderMilestoneType) {
{ addWorkOrderMilestone(
workOrderId: workOrder.workOrderId, {
workOrderMilestoneTypeId: workOrderId: workOrder.workOrderId,
intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId:
workOrderMilestoneDateString, intermentWorkOrderMilestoneType.workOrderMilestoneTypeId,
workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH, workOrderMilestoneDateString,
workOrderMilestoneCompletionDateString: workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH,
workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionDateString:
? workOrderMilestoneDateString workOrderMilestoneDateString < currentDateString
: undefined, ? workOrderMilestoneDateString
workOrderMilestoneCompletionTimeString: : undefined,
workOrderMilestoneDateString < currentDateString ? "23:59" : undefined workOrderMilestoneCompletionTimeString:
}, workOrderMilestoneDateString < currentDateString
user ? "23:59"
); : undefined
},
user
);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;