From 8a22aa1ca54ac2da61bbf8f60f333c5d90be53e4 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Wed, 14 Dec 2022 15:08:16 -0500 Subject: [PATCH] only create milestones with active types --- temp/legacy.importFromCSV.js | 100 +++++++++++++---------- temp/legacy.importFromCSV.ts | 152 +++++++++++++++++++---------------- 2 files changed, 138 insertions(+), 114 deletions(-) diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 08d75424..cd0ff15c 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -964,30 +964,36 @@ function importFromWorkOrderCSV() { }, user); let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN; let maxMilestoneCompletionDateString = workOrderOpenDateString; - addWorkOrderMilestone({ - 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); + if (acknowledgedWorkOrderMilestoneType) { addWorkOrderMilestone({ workOrderId: workOrder.workOrderId, - workOrderMilestoneTypeId: deathWorkOrderMilestoneType.workOrderMilestoneTypeId, - workOrderMilestoneDateString, - workOrderMilestoneDescription: "Death Place: " + workOrderRow.WO_DEATH_PLACE, - workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneDateString + workOrderMilestoneTypeId: acknowledgedWorkOrderMilestoneType.workOrderMilestoneTypeId, + workOrderMilestoneDateString: workOrderOpenDateString, + workOrderMilestoneDescription: "", + workOrderMilestoneCompletionDateString: workOrderRow.WO_CONFIRMATION_IN + ? workOrderOpenDateString : undefined, - workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString ? "00:00" : 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); + 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) { maxMilestoneCompletionDateString = workOrderMilestoneDateString; } @@ -1002,19 +1008,21 @@ function importFromWorkOrderCSV() { funeralHour += 12; } const workOrderMilestoneTimeString = formatTimeString(funeralHour.toString(), workOrderRow.WO_FUNERAL_MIN); - addWorkOrderMilestone({ - workOrderId: workOrder.workOrderId, - workOrderMilestoneTypeId: funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, - workOrderMilestoneDateString, - workOrderMilestoneTimeString, - workOrderMilestoneDescription: "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME, - workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneDateString - : undefined, - workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneTimeString - : undefined - }, user); + if (funeralWorkOrderMilestoneType) { + addWorkOrderMilestone({ + workOrderId: workOrder.workOrderId, + workOrderMilestoneTypeId: funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, + workOrderMilestoneDateString, + workOrderMilestoneTimeString, + workOrderMilestoneDescription: "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME, + workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString + ? workOrderMilestoneDateString + : undefined, + workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString + ? workOrderMilestoneTimeString + : undefined + }, user); + } if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { maxMilestoneCompletionDateString = workOrderMilestoneDateString; } @@ -1022,7 +1030,7 @@ function importFromWorkOrderCSV() { hasIncompleteMilestones = true; } } - if (workOrderRow.WO_CREMATION === "Y") { + if (workOrderRow.WO_CREMATION === "Y" && cremationWorkOrderMilestoneType) { addWorkOrderMilestone({ workOrderId: workOrder.workOrderId, workOrderMilestoneTypeId: cremationWorkOrderMilestoneType.workOrderMilestoneTypeId, @@ -1038,16 +1046,20 @@ function importFromWorkOrderCSV() { } if (workOrderRow.WO_INTERMENT_YR) { const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_INTERMENT_YR, workOrderRow.WO_INTERMENT_MON, workOrderRow.WO_INTERMENT_DAY); - addWorkOrderMilestone({ - workOrderId: workOrder.workOrderId, - workOrderMilestoneTypeId: intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, - workOrderMilestoneDateString, - workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH, - workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneDateString - : undefined, - workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString ? "23:59" : undefined - }, user); + if (intermentWorkOrderMilestoneType) { + addWorkOrderMilestone({ + workOrderId: workOrder.workOrderId, + workOrderMilestoneTypeId: intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, + workOrderMilestoneDateString, + workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH, + workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString + ? workOrderMilestoneDateString + : undefined, + workOrderMilestoneCompletionTimeString: workOrderMilestoneDateString < currentDateString + ? "23:59" + : undefined + }, user); + } if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { maxMilestoneCompletionDateString = workOrderMilestoneDateString; } diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index 09fd28fb..b105b018 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -1589,22 +1589,24 @@ function importFromWorkOrderCSV() { let hasIncompleteMilestones = !workOrderRow.WO_CONFIRMATION_IN; let maxMilestoneCompletionDateString = workOrderOpenDateString; - addWorkOrderMilestone( - { - 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 (acknowledgedWorkOrderMilestoneType) { + addWorkOrderMilestone( + { + 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( @@ -1613,23 +1615,27 @@ function importFromWorkOrderCSV() { workOrderRow.WO_DEATH_DAY ); - 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 (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) { maxMilestoneCompletionDateString = workOrderMilestoneDateString; @@ -1657,26 +1663,28 @@ function importFromWorkOrderCSV() { workOrderRow.WO_FUNERAL_MIN ); - addWorkOrderMilestone( - { - workOrderId: workOrder.workOrderId, - workOrderMilestoneTypeId: - funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, - workOrderMilestoneDateString, - workOrderMilestoneTimeString, - workOrderMilestoneDescription: - "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME, - workOrderMilestoneCompletionDateString: - workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneDateString - : undefined, - workOrderMilestoneCompletionTimeString: - workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneTimeString - : undefined - }, - user - ); + if (funeralWorkOrderMilestoneType) { + addWorkOrderMilestone( + { + workOrderId: workOrder.workOrderId, + workOrderMilestoneTypeId: + funeralWorkOrderMilestoneType.workOrderMilestoneTypeId, + workOrderMilestoneDateString, + workOrderMilestoneTimeString, + workOrderMilestoneDescription: + "Funeral Home: " + workOrderRow.WO_FUNERAL_HOME, + workOrderMilestoneCompletionDateString: + workOrderMilestoneDateString < currentDateString + ? workOrderMilestoneDateString + : undefined, + workOrderMilestoneCompletionTimeString: + workOrderMilestoneDateString < currentDateString + ? workOrderMilestoneTimeString + : undefined + }, + user + ); + } if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { maxMilestoneCompletionDateString = workOrderMilestoneDateString; @@ -1687,7 +1695,7 @@ function importFromWorkOrderCSV() { } } - if (workOrderRow.WO_CREMATION === "Y") { + if (workOrderRow.WO_CREMATION === "Y" && cremationWorkOrderMilestoneType) { addWorkOrderMilestone( { workOrderId: workOrder.workOrderId, @@ -1715,22 +1723,26 @@ function importFromWorkOrderCSV() { workOrderRow.WO_INTERMENT_DAY ); - addWorkOrderMilestone( - { - workOrderId: workOrder.workOrderId, - workOrderMilestoneTypeId: - intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, - workOrderMilestoneDateString, - workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH, - workOrderMilestoneCompletionDateString: - workOrderMilestoneDateString < currentDateString - ? workOrderMilestoneDateString - : undefined, - workOrderMilestoneCompletionTimeString: - workOrderMilestoneDateString < currentDateString ? "23:59" : undefined - }, - user - ); + if (intermentWorkOrderMilestoneType) { + addWorkOrderMilestone( + { + workOrderId: workOrder.workOrderId, + workOrderMilestoneTypeId: + intermentWorkOrderMilestoneType.workOrderMilestoneTypeId, + workOrderMilestoneDateString, + workOrderMilestoneDescription: "Depth: " + workOrderRow.WO_DEPTH, + workOrderMilestoneCompletionDateString: + workOrderMilestoneDateString < currentDateString + ? workOrderMilestoneDateString + : undefined, + workOrderMilestoneCompletionTimeString: + workOrderMilestoneDateString < currentDateString + ? "23:59" + : undefined + }, + user + ); + } if (workOrderMilestoneDateString > maxMilestoneCompletionDateString) { maxMilestoneCompletionDateString = workOrderMilestoneDateString;