From 092decd6e122a9f4c432f22fee6d009a908f5622 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 13 Apr 2023 10:19:36 -0400 Subject: [PATCH] expand period abbreviations --- temp/legacy.importFromCSV.js | 6 ++++-- temp/legacy.importFromCSV.ts | 13 +++++++------ temp/legacy.importFromCsv.data.d.ts | 1 + temp/legacy.importFromCsv.data.js | 16 ++++++++++++++++ temp/legacy.importFromCsv.data.ts | 18 ++++++++++++++++++ temp/legacy.importFromCsv.ids.ts | 10 +++++----- 6 files changed, 51 insertions(+), 13 deletions(-) diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 91d693a1..990969b8 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -308,12 +308,13 @@ async function importFromMasterCSV() { }, user); } if (masterRow.CM_PERIOD !== '') { + const period = importData.getDeathAgePeriod(masterRow.CM_PERIOD); await addOrUpdateLotOccupancyField({ lotOccupancyId: deceasedLotOccupancyId, occupancyTypeFieldId: occupancyType.occupancyTypeFields.find((occupancyTypeField) => { return (occupancyTypeField.occupancyTypeField === 'Death Age Period'); }).occupancyTypeFieldId, - lotOccupancyFieldValue: masterRow.CM_PERIOD + lotOccupancyFieldValue: period }, user); } if (masterRow.CM_FUNERAL_HOME !== '') { @@ -791,12 +792,13 @@ async function importFromWorkOrderCSV() { }, user); } if (workOrderRow.WO_PERIOD !== '') { + const period = importData.getDeathAgePeriod(workOrderRow.WO_PERIOD); await addOrUpdateLotOccupancyField({ lotOccupancyId, occupancyTypeFieldId: occupancyType.occupancyTypeFields.find((occupancyTypeField) => { return (occupancyTypeField.occupancyTypeField === 'Death Age Period'); }).occupancyTypeFieldId, - lotOccupancyFieldValue: workOrderRow.WO_PERIOD + lotOccupancyFieldValue: period }, user); } if (workOrderRow.WO_FUNERAL_HOME !== '') { diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index 0a34497d..1353038d 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -49,10 +49,7 @@ import { addWorkOrderMilestone } from '../helpers/lotOccupancyDB/addWorkOrderMil import { closeWorkOrder } from '../helpers/lotOccupancyDB/closeWorkOrder.js' -import { - dateIntegerToString, - dateToString -} from '@cityssm/utils-datetime' +import { dateIntegerToString, dateToString } from '@cityssm/utils-datetime' import type * as recordTypes from '../types/recordTypes' @@ -637,6 +634,8 @@ async function importFromMasterCSV(): Promise { } if (masterRow.CM_PERIOD !== '') { + const period = importData.getDeathAgePeriod(masterRow.CM_PERIOD) + await addOrUpdateLotOccupancyField( { lotOccupancyId: deceasedLotOccupancyId, @@ -647,7 +646,7 @@ async function importFromMasterCSV(): Promise { ) } )!.occupancyTypeFieldId!, - lotOccupancyFieldValue: masterRow.CM_PERIOD + lotOccupancyFieldValue: period }, user ) @@ -1368,6 +1367,8 @@ async function importFromWorkOrderCSV(): Promise { } if (workOrderRow.WO_PERIOD !== '') { + const period = importData.getDeathAgePeriod(workOrderRow.WO_PERIOD) + await addOrUpdateLotOccupancyField( { lotOccupancyId, @@ -1378,7 +1379,7 @@ async function importFromWorkOrderCSV(): Promise { ) } )!.occupancyTypeFieldId!, - lotOccupancyFieldValue: workOrderRow.WO_PERIOD + lotOccupancyFieldValue: period }, user ) diff --git a/temp/legacy.importFromCsv.data.d.ts b/temp/legacy.importFromCsv.data.d.ts index 7a36b697..1b4c5bdc 100644 --- a/temp/legacy.importFromCsv.data.d.ts +++ b/temp/legacy.importFromCsv.data.d.ts @@ -11,3 +11,4 @@ export declare function buildLotName(lotNamePieces: { interment: string; }): string; export declare function getFuneralHomeLotOccupancyOccupantData(funeralHomeKey: string): recordTypes.LotOccupancyOccupant; +export declare function getDeathAgePeriod(legacyDeathAgePeriod: string): string; diff --git a/temp/legacy.importFromCsv.data.js b/temp/legacy.importFromCsv.data.js index 9ce63062..74779d78 100644 --- a/temp/legacy.importFromCsv.data.js +++ b/temp/legacy.importFromCsv.data.js @@ -117,3 +117,19 @@ export function getFuneralHomeLotOccupancyOccupantData(funeralHomeKey) { occupantProvince: 'ON' }; } +export function getDeathAgePeriod(legacyDeathAgePeriod) { + switch (legacyDeathAgePeriod.toLowerCase()) { + case 'yrs': { + return 'Years'; + } + case 'mts': { + return 'Months'; + } + case 'dys': { + return 'Days'; + } + default: { + return legacyDeathAgePeriod; + } + } +} diff --git a/temp/legacy.importFromCsv.data.ts b/temp/legacy.importFromCsv.data.ts index 2ec07f2f..bddb5525 100644 --- a/temp/legacy.importFromCsv.data.ts +++ b/temp/legacy.importFromCsv.data.ts @@ -136,3 +136,21 @@ export function getFuneralHomeLotOccupancyOccupantData( occupantProvince: 'ON' } } + +export function getDeathAgePeriod(legacyDeathAgePeriod: string): string { + switch (legacyDeathAgePeriod.toLowerCase()) { + case 'yrs': { + return 'Years' + } + case 'mts': { + return 'Months' + } + case 'dys': { + return 'Days' + } + + default: { + return legacyDeathAgePeriod + } + } +} diff --git a/temp/legacy.importFromCsv.ids.ts b/temp/legacy.importFromCsv.ids.ts index 55c54590..5acb0680 100644 --- a/temp/legacy.importFromCsv.ids.ts +++ b/temp/legacy.importFromCsv.ids.ts @@ -17,14 +17,14 @@ export function getFeeIdByFeeDescription(feeDescription: string): number { readonly: true }) - const records: Array<{ - feeId: number - feeDescription: string - }> = database + const records = database .prepare( "select feeId, feeDescription from Fees where feeDescription like 'CMPP_FEE_%'" ) - .all() + .all() as Array<{ + feeId: number + feeDescription: string + }> for (const record of records) { feeCache.set(record.feeDescription, record.feeId)