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,6 +964,7 @@ function importFromWorkOrderCSV() {
}, user); }, user);
let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN; let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN;
let maxMilestoneCompletionDateString = workOrderOpenDateString; let maxMilestoneCompletionDateString = workOrderOpenDateString;
if (acknowledgedWorkOrderMilestoneType) {
addWorkOrderMilestone({ addWorkOrderMilestone({
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId: acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId,
@ -976,8 +977,10 @@ function importFromWorkOrderCSV() {
? "00:00" ? "00:00"
: undefined : undefined
}, user); }, user);
}
if (workOrderRow.WO_DEATH_YR) { if (workOrderRow.WO_DEATH_YR) {
const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY); const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
if (deathWorkOrderMilestoneType) {
addWorkOrderMilestone({ addWorkOrderMilestone({
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: deathWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId: deathWorkOrderMilestoneType.workOrderMilestoneTypeId,
@ -986,8 +989,11 @@ function importFromWorkOrderCSV() {
workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
? workOrderMilestoneDateString ? workOrderMilestoneDateString
: undefined, : undefined,
workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString ? "00:00" : undefined workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString
? "00:00"
: undefined
}, user); }, user);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
} }
@ -1002,6 +1008,7 @@ function importFromWorkOrderCSV() {
funeralHour += 12; funeralHour += 12;
} }
const workOrderMilestoneTimeString = formatTimeString(funeralHour.toString(), workOrderRow.WO_FUNERAL_MIN); const workOrderMilestoneTimeString = formatTimeString(funeralHour.toString(), workOrderRow.WO_FUNERAL_MIN);
if (funeralWorkOrderMilestoneType) {
addWorkOrderMilestone({ addWorkOrderMilestone({
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId: funeralWorkOrderMilestoneType.workOrderMilestoneTypeId,
@ -1015,6 +1022,7 @@ function importFromWorkOrderCSV() {
? workOrderMilestoneTimeString ? workOrderMilestoneTimeString
: undefined : undefined
}, user); }, 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,6 +1046,7 @@ 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);
if (intermentWorkOrderMilestoneType) {
addWorkOrderMilestone({ addWorkOrderMilestone({
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
workOrderMilestoneTypeId: intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneTypeId: intermentWorkOrderMilestoneType.workOrderMilestoneTypeId,
@ -1046,8 +1055,11 @@ function importFromWorkOrderCSV() {
workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
? workOrderMilestoneDateString ? workOrderMilestoneDateString
: undefined, : undefined,
workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString ? "23:59" : undefined workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString
? "23:59"
: undefined
}, user); }, user);
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
} }

View File

@ -1589,6 +1589,7 @@ function importFromWorkOrderCSV() {
let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN; let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN;
let maxMilestoneCompletionDateString = workOrderOpenDateString; let maxMilestoneCompletionDateString = workOrderOpenDateString;
if (acknowledgedWorkOrderMilestoneType) {
addWorkOrderMilestone( addWorkOrderMilestone(
{ {
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
@ -1605,6 +1606,7 @@ function importFromWorkOrderCSV() {
}, },
user user
); );
}
if (workOrderRow.WO_DEATH_YR) { if (workOrderRow.WO_DEATH_YR) {
const workOrderMilestoneDateString = formatDateString( const workOrderMilestoneDateString = formatDateString(
@ -1613,6 +1615,7 @@ function importFromWorkOrderCSV() {
workOrderRow.WO_DEATH_DAY workOrderRow.WO_DEATH_DAY
); );
if (deathWorkOrderMilestoneType) {
addWorkOrderMilestone( addWorkOrderMilestone(
{ {
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
@ -1626,10 +1629,13 @@ function importFromWorkOrderCSV() {
? workOrderMilestoneDateString ? workOrderMilestoneDateString
: undefined, : undefined,
workOrderMilestoneCompletionTimeString: workOrderMilestoneCompletionTimeString:
workOrderMilestoneDateString < currentDateString ? "00:00" : undefined workOrderMilestoneDateString < currentDateString
? "00:00"
: undefined
}, },
user user
); );
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;
@ -1657,6 +1663,7 @@ function importFromWorkOrderCSV() {
workOrderRow.WO_FUNERAL_MIN workOrderRow.WO_FUNERAL_MIN
); );
if (funeralWorkOrderMilestoneType) {
addWorkOrderMilestone( addWorkOrderMilestone(
{ {
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
@ -1677,6 +1684,7 @@ function importFromWorkOrderCSV() {
}, },
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,6 +1723,7 @@ function importFromWorkOrderCSV() {
workOrderRow.WO_INTERMENT_DAY workOrderRow.WO_INTERMENT_DAY
); );
if (intermentWorkOrderMilestoneType) {
addWorkOrderMilestone( addWorkOrderMilestone(
{ {
workOrderId: workOrder.workOrderId, workOrderId: workOrder.workOrderId,
@ -1727,10 +1736,13 @@ function importFromWorkOrderCSV() {
? workOrderMilestoneDateString ? workOrderMilestoneDateString
: undefined, : undefined,
workOrderMilestoneCompletionTimeString: workOrderMilestoneCompletionTimeString:
workOrderMilestoneDateString < currentDateString ? "23:59" : undefined workOrderMilestoneDateString < currentDateString
? "23:59"
: undefined
}, },
user user
); );
}
if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) {
maxMilestoneCompletionDateString = workOrderMilestoneDateString; maxMilestoneCompletionDateString = workOrderMilestoneDateString;