From 495231afd61341f011dcfe7e6a27aa3c56ddace1 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 3 Apr 2025 11:40:04 -0400 Subject: [PATCH] linting and polish --- database/addBurialSite.d.ts | 2 +- database/addBurialSite.js | 4 +- database/addBurialSite.ts | 6 +- routes/workOrders.js | 4 +- routes/workOrders.ts | 4 +- temp/legacyImportFromCsv/data.cemeteries.d.ts | 2 +- temp/legacyImportFromCsv/data.cemeteries.js | 5 +- temp/legacyImportFromCsv/data.cemeteries.ts | 6 +- temp/legacyImportFromCsv/index.js | 14 ++-- temp/legacyImportFromCsv/index.ts | 29 +++++--- types/recordTypes.d.ts | 2 +- types/recordTypes.ts | 4 +- views/_header.ejs | 1 + views/contract-edit.ejs | 67 ++++++++++++++----- 14 files changed, 101 insertions(+), 49 deletions(-) diff --git a/database/addBurialSite.d.ts b/database/addBurialSite.d.ts index 96cc8a2b..23e57225 100644 --- a/database/addBurialSite.d.ts +++ b/database/addBurialSite.d.ts @@ -1,5 +1,5 @@ export interface AddBurialSiteForm { - burialSiteNameSegment1: string; + burialSiteNameSegment1?: string; burialSiteNameSegment2?: string; burialSiteNameSegment3?: string; burialSiteNameSegment4?: string; diff --git a/database/addBurialSite.js b/database/addBurialSite.js index d4cc6020..729bbdaa 100644 --- a/database/addBurialSite.js +++ b/database/addBurialSite.js @@ -42,10 +42,10 @@ export default async function addBurialSite(burialSiteForm, user) { recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) - values (?, ?, + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) - .run(burialSiteForm.burialSiteNameSegment1, burialSiteForm.burialSiteNameSegment2 ?? '', burialSiteForm.burialSiteNameSegment3 ?? '', burialSiteForm.burialSiteNameSegment4 ?? '', burialSiteForm.burialSiteNameSegment5 ?? '', burialSiteName, burialSiteForm.burialSiteTypeId, burialSiteForm.burialSiteStatusId === '' + .run(burialSiteForm.burialSiteNameSegment1 ?? '', burialSiteForm.burialSiteNameSegment2 ?? '', burialSiteForm.burialSiteNameSegment3 ?? '', burialSiteForm.burialSiteNameSegment4 ?? '', burialSiteForm.burialSiteNameSegment5 ?? '', burialSiteName, burialSiteForm.burialSiteTypeId, burialSiteForm.burialSiteStatusId === '' ? undefined : burialSiteForm.burialSiteStatusId, burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId, burialSiteForm.cemeterySvgId, burialSiteForm.burialSiteImage, burialSiteForm.burialSiteLatitude === '' ? undefined diff --git a/database/addBurialSite.ts b/database/addBurialSite.ts index 983259b5..5fa5d7d8 100644 --- a/database/addBurialSite.ts +++ b/database/addBurialSite.ts @@ -5,7 +5,7 @@ import getCemetery from './getCemetery.js' import { acquireConnection } from './pool.js' export interface AddBurialSiteForm { - burialSiteNameSegment1: string + burialSiteNameSegment1?: string burialSiteNameSegment2?: string burialSiteNameSegment3?: string burialSiteNameSegment4?: string @@ -83,12 +83,12 @@ export default async function addBurialSite( recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) - values (?, ?, + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( - burialSiteForm.burialSiteNameSegment1, + burialSiteForm.burialSiteNameSegment1 ?? '', burialSiteForm.burialSiteNameSegment2 ?? '', burialSiteForm.burialSiteNameSegment3 ?? '', burialSiteForm.burialSiteNameSegment4 ?? '', diff --git a/routes/workOrders.js b/routes/workOrders.js index d3d70d8e..c8bdd9d7 100644 --- a/routes/workOrders.js +++ b/routes/workOrders.js @@ -7,16 +7,16 @@ import handler_outlook from '../handlers/workOrders-get/outlook.js'; import handler_search from '../handlers/workOrders-get/search.js'; import handler_view from '../handlers/workOrders-get/view.js'; import handler_doAddWorkOrderBurialSite from '../handlers/workOrders-post/doAddWorkOrderBurialSite.js'; -import handler_doAddWorkOrderContract from '../handlers/workOrders-post/doAddWorkOrderContract.js'; import handler_doAddWorkOrderComment from '../handlers/workOrders-post/doAddWorkOrderComment.js'; +import handler_doAddWorkOrderContract from '../handlers/workOrders-post/doAddWorkOrderContract.js'; import handler_doAddWorkOrderMilestone from '../handlers/workOrders-post/doAddWorkOrderMilestone.js'; import handler_doCloseWorkOrder from '../handlers/workOrders-post/doCloseWorkOrder.js'; import handler_doCompleteWorkOrderMilestone from '../handlers/workOrders-post/doCompleteWorkOrderMilestone.js'; import handler_doCreateWorkOrder from '../handlers/workOrders-post/doCreateWorkOrder.js'; import handler_doDeleteWorkOrder from '../handlers/workOrders-post/doDeleteWorkOrder.js'; import handler_doDeleteWorkOrderBurialSite from '../handlers/workOrders-post/doDeleteWorkOrderBurialSite.js'; -import handler_doDeleteWorkOrderContract from '../handlers/workOrders-post/doDeleteWorkOrderContract.js'; import handler_doDeleteWorkOrderComment from '../handlers/workOrders-post/doDeleteWorkOrderComment.js'; +import handler_doDeleteWorkOrderContract from '../handlers/workOrders-post/doDeleteWorkOrderContract.js'; import handler_doDeleteWorkOrderMilestone from '../handlers/workOrders-post/doDeleteWorkOrderMilestone.js'; import handler_doGetWorkOrderMilestones from '../handlers/workOrders-post/doGetWorkOrderMilestones.js'; import handler_doReopenWorkOrder from '../handlers/workOrders-post/doReopenWorkOrder.js'; diff --git a/routes/workOrders.ts b/routes/workOrders.ts index 3161fbeb..76e5628c 100644 --- a/routes/workOrders.ts +++ b/routes/workOrders.ts @@ -8,16 +8,16 @@ import handler_outlook from '../handlers/workOrders-get/outlook.js' import handler_search from '../handlers/workOrders-get/search.js' import handler_view from '../handlers/workOrders-get/view.js' import handler_doAddWorkOrderBurialSite from '../handlers/workOrders-post/doAddWorkOrderBurialSite.js' -import handler_doAddWorkOrderContract from '../handlers/workOrders-post/doAddWorkOrderContract.js' import handler_doAddWorkOrderComment from '../handlers/workOrders-post/doAddWorkOrderComment.js' +import handler_doAddWorkOrderContract from '../handlers/workOrders-post/doAddWorkOrderContract.js' import handler_doAddWorkOrderMilestone from '../handlers/workOrders-post/doAddWorkOrderMilestone.js' import handler_doCloseWorkOrder from '../handlers/workOrders-post/doCloseWorkOrder.js' import handler_doCompleteWorkOrderMilestone from '../handlers/workOrders-post/doCompleteWorkOrderMilestone.js' import handler_doCreateWorkOrder from '../handlers/workOrders-post/doCreateWorkOrder.js' import handler_doDeleteWorkOrder from '../handlers/workOrders-post/doDeleteWorkOrder.js' import handler_doDeleteWorkOrderBurialSite from '../handlers/workOrders-post/doDeleteWorkOrderBurialSite.js' -import handler_doDeleteWorkOrderContract from '../handlers/workOrders-post/doDeleteWorkOrderContract.js' import handler_doDeleteWorkOrderComment from '../handlers/workOrders-post/doDeleteWorkOrderComment.js' +import handler_doDeleteWorkOrderContract from '../handlers/workOrders-post/doDeleteWorkOrderContract.js' import handler_doDeleteWorkOrderMilestone from '../handlers/workOrders-post/doDeleteWorkOrderMilestone.js' import handler_doGetWorkOrderMilestones from '../handlers/workOrders-post/doGetWorkOrderMilestones.js' import handler_doReopenWorkOrder from '../handlers/workOrders-post/doReopenWorkOrder.js' diff --git a/temp/legacyImportFromCsv/data.cemeteries.d.ts b/temp/legacyImportFromCsv/data.cemeteries.d.ts index ccf2cce7..2524c127 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.d.ts +++ b/temp/legacyImportFromCsv/data.cemeteries.d.ts @@ -1 +1 @@ -export declare function getCemeteryIdByKey(cemeteryKey: string, user: User): Promise; +export declare function getCemeteryIdByKey(cemeteryKeyToSearch: string | undefined, user: User): Promise; diff --git a/temp/legacyImportFromCsv/data.cemeteries.js b/temp/legacyImportFromCsv/data.cemeteries.js index 1f2dd395..a51915cc 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.js +++ b/temp/legacyImportFromCsv/data.cemeteries.js @@ -18,13 +18,14 @@ const cemeteryToCemeteryName = { WS: 'West Section' }; const cemeteryCache = new Map(); -export async function getCemeteryIdByKey(cemeteryKey, user) { +export async function getCemeteryIdByKey(cemeteryKeyToSearch, user) { /* if (masterRow.CM_CEMETERY === "HS" && (masterRow.CM_BLOCK === "F" || masterRow.CM_BLOCK === "G" || masterRow.CM_BLOCK === "H" || masterRow.CM_BLOCK === "J")) { mapCacheKey += "-" + masterRow.CM_BLOCK; } */ + const cemeteryKey = cemeteryKeyToSearch ?? ''; if (cemeteryCache.has(cemeteryKey)) { return cemeteryCache.get(cemeteryKey); } @@ -34,7 +35,7 @@ export async function getCemeteryIdByKey(cemeteryKey, user) { const cemeteryId = await addCemetery({ cemeteryName: cemeteryToCemeteryName[cemeteryKey] ?? cemeteryKey, cemeteryDescription: '', - cemeteryKey, + cemeteryKey: cemeteryKey, cemeterySvg: '', cemeteryLatitude: '', cemeteryLongitude: '', diff --git a/temp/legacyImportFromCsv/data.cemeteries.ts b/temp/legacyImportFromCsv/data.cemeteries.ts index d75a4b74..7896e67b 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.ts +++ b/temp/legacyImportFromCsv/data.cemeteries.ts @@ -23,7 +23,7 @@ const cemeteryToCemeteryName = { const cemeteryCache = new Map() export async function getCemeteryIdByKey( - cemeteryKey: string, + cemeteryKeyToSearch: string | undefined, user: User ): Promise { /* @@ -33,6 +33,8 @@ export async function getCemeteryIdByKey( } */ + const cemeteryKey = cemeteryKeyToSearch ?? '' + if (cemeteryCache.has(cemeteryKey)) { return cemeteryCache.get(cemeteryKey) as number } @@ -47,7 +49,7 @@ export async function getCemeteryIdByKey( cemeteryName: cemeteryToCemeteryName[cemeteryKey] ?? cemeteryKey, cemeteryDescription: '', - cemeteryKey, + cemeteryKey: cemeteryKey, cemeterySvg: '', diff --git a/temp/legacyImportFromCsv/index.js b/temp/legacyImportFromCsv/index.js index a7100910..1e687b6b 100644 --- a/temp/legacyImportFromCsv/index.js +++ b/temp/legacyImportFromCsv/index.js @@ -182,8 +182,8 @@ async function importFromMasterCSV() { purchaserCity: masterRow.CM_CITY, purchaserProvince: masterRow.CM_PROV, purchaserPostalCode, - purchaserPhoneNumber: '', purchaserEmail: '', + purchaserPhoneNumber: '', deceasedName: masterRow.CM_DECEASED_NAME === '' ? masterRow.CM_PRENEED_OWNER : masterRow.CM_DECEASED_NAME, @@ -379,14 +379,15 @@ async function importFromPrepaidCSV() { burialSiteNameSegment2, burialSiteNameSegment3, burialSiteNameSegment4, - burialSiteTypeId, burialSiteStatusId: importIds.reservedBurialSiteStatusId, + burialSiteTypeId, cemeteryId, cemeterySvgId: burialSiteName.includes(',') ? burialSiteName.split(',')[0] : burialSiteName, burialSiteLatitude: '', - burialSiteLongitude: '' + burialSiteLongitude: '', + burialSiteImage: '' }, user); burialSite = await getBurialSite(burialSiteId); } @@ -611,22 +612,23 @@ async function importFromWorkOrderCSV() { const cemeteryId = await getCemeteryIdByKey(workOrderRow.WO_CEMETERY, user); const burialSiteTypeId = getBurialSiteTypeId(workOrderRow.WO_CEMETERY); const burialSiteId = await addBurialSite({ - cemeteryId, burialSiteNameSegment1, burialSiteNameSegment2, burialSiteNameSegment3, burialSiteNameSegment4, + cemeteryId, cemeterySvgId: burialSiteName.includes(',') ? burialSiteName.split(',')[0] : burialSiteName, burialSiteStatusId: importIds.takenBurialSiteStatusId, burialSiteTypeId, + burialSiteImage: '', burialSiteLatitude: '', burialSiteLongitude: '' }, user); burialSite = await getBurialSite(burialSiteId); } - const workOrderContainsLot = workOrder.workOrderBurialSites.find((possibleLot) => (possibleLot.burialSiteId = burialSite.burialSiteId)); + const workOrderContainsLot = workOrder?.workOrderBurialSites?.find((possibleLot) => (possibleLot.burialSiteId === burialSite?.burialSiteId)); if (!workOrderContainsLot) { await addWorkOrderBurialSite({ workOrderId: workOrder.workOrderId, @@ -671,8 +673,8 @@ async function importFromWorkOrderCSV() { deceasedAddress1: workOrderRow.WO_ADDRESS, deceasedAddress2: '', deceasedCity: workOrderRow.WO_CITY, - deceasedProvince: workOrderRow.WO_PROV.slice(0, 2), deceasedPostalCode: `${workOrderRow.WO_POST1} ${workOrderRow.WO_POST2}`, + deceasedProvince: workOrderRow.WO_PROV.slice(0, 2), deathDateString: workOrderRow.WO_DEATH_YR === '' ? '' : formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY), diff --git a/temp/legacyImportFromCsv/index.ts b/temp/legacyImportFromCsv/index.ts index 62669406..f2cab908 100644 --- a/temp/legacyImportFromCsv/index.ts +++ b/temp/legacyImportFromCsv/index.ts @@ -342,7 +342,7 @@ async function importFromMasterCSV(): Promise { * Preneed Record */ - let preneedContractStartDateString: DateString | '' + let preneedContractStartDateString: '' | DateString let preneedContractId: number if (masterRow.CM_PRENEED_OWNER !== '' || masterRow.CM_STATUS === 'P') { @@ -352,7 +352,7 @@ async function importFromMasterCSV(): Promise { masterRow.CM_PURCHASE_DAY ) - let contractEndDateString: DateString | '' = '' + let contractEndDateString: '' | DateString = '' if ( masterRow.CM_INTERMENT_YR !== '' && @@ -418,8 +418,9 @@ async function importFromMasterCSV(): Promise { purchaserCity: masterRow.CM_CITY, purchaserProvince: masterRow.CM_PROV, purchaserPostalCode, - purchaserPhoneNumber: '', + purchaserEmail: '', + purchaserPhoneNumber: '', deceasedName: masterRow.CM_DECEASED_NAME === '' @@ -731,14 +732,19 @@ async function importFromPrepaidCSV(): Promise { burialSiteNameSegment2, burialSiteNameSegment3, burialSiteNameSegment4, - burialSiteTypeId, + burialSiteStatusId: importIds.reservedBurialSiteStatusId, + burialSiteTypeId, + cemeteryId, cemeterySvgId: burialSiteName.includes(',') ? burialSiteName.split(',')[0] : burialSiteName, + burialSiteLatitude: '', - burialSiteLongitude: '' + burialSiteLongitude: '', + + burialSiteImage: '' }, user ) @@ -1079,16 +1085,20 @@ async function importFromWorkOrderCSV(): Promise { const burialSiteId = await addBurialSite( { - cemeteryId, burialSiteNameSegment1, burialSiteNameSegment2, burialSiteNameSegment3, burialSiteNameSegment4, + + cemeteryId, cemeterySvgId: burialSiteName.includes(',') ? burialSiteName.split(',')[0] : burialSiteName, + burialSiteStatusId: importIds.takenBurialSiteStatusId, burialSiteTypeId, + + burialSiteImage: '', burialSiteLatitude: '', burialSiteLongitude: '' }, @@ -1098,8 +1108,8 @@ async function importFromWorkOrderCSV(): Promise { burialSite = await getBurialSite(burialSiteId) } - const workOrderContainsLot = workOrder.workOrderBurialSites!.find( - (possibleLot) => (possibleLot.burialSiteId = burialSite.burialSiteId) + const workOrderContainsLot = workOrder?.workOrderBurialSites?.find( + (possibleLot) => (possibleLot.burialSiteId === burialSite?.burialSiteId) ) if (!workOrderContainsLot) { @@ -1174,11 +1184,12 @@ async function importFromWorkOrderCSV(): Promise { committalTypeId, deceasedName: workOrderRow.WO_DECEASED_NAME, + deceasedAddress1: workOrderRow.WO_ADDRESS, deceasedAddress2: '', deceasedCity: workOrderRow.WO_CITY, - deceasedProvince: workOrderRow.WO_PROV.slice(0, 2), deceasedPostalCode: `${workOrderRow.WO_POST1} ${workOrderRow.WO_POST2}`, + deceasedProvince: workOrderRow.WO_PROV.slice(0, 2), deathDateString: workOrderRow.WO_DEATH_YR === '' diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts index 6ea7cdeb..8a88a7d6 100644 --- a/types/recordTypes.d.ts +++ b/types/recordTypes.d.ts @@ -248,8 +248,8 @@ export interface FuneralHome extends Record { funeralHomeAddress1?: string; funeralHomeAddress2?: string; funeralHomeCity?: string; - funeralHomeProvince?: string; funeralHomePostalCode?: string; + funeralHomeProvince?: string; funeralHomePhoneNumber?: string; } export interface IntermentContainerType extends Record { diff --git a/types/recordTypes.ts b/types/recordTypes.ts index c280a303..6fc5719b 100644 --- a/types/recordTypes.ts +++ b/types/recordTypes.ts @@ -336,11 +336,13 @@ export interface FuneralHome extends Record { funeralHomeId?: number funeralHomeKey?: string funeralHomeName?: string + funeralHomeAddress1?: string funeralHomeAddress2?: string funeralHomeCity?: string - funeralHomeProvince?: string funeralHomePostalCode?: string + funeralHomeProvince?: string + funeralHomePhoneNumber?: string } diff --git a/views/_header.ejs b/views/_header.ejs index c2890063..b819d553 100644 --- a/views/_header.ejs +++ b/views/_header.ejs @@ -37,6 +37,7 @@ + diff --git a/views/contract-edit.ejs b/views/contract-edit.ejs index 186bfd0f..0953af3b 100644 --- a/views/contract-edit.ejs +++ b/views/contract-edit.ejs @@ -447,19 +447,28 @@ -
- +
+ + + +
- +
- +
@@ -475,7 +484,8 @@
- +
@@ -483,7 +493,9 @@
- +
@@ -493,7 +505,9 @@
- +
@@ -501,7 +515,9 @@
- +
@@ -556,19 +572,28 @@ <%= (contract.isPreneed ? "Recipient" : "Deceased") %> Name -
- +
+ + + +
- +
- +
@@ -584,7 +609,9 @@
- +
@@ -592,7 +619,9 @@
- +
@@ -604,7 +633,8 @@ Date of Birth
- + @@ -631,7 +661,8 @@ Date of Death
- + @@ -654,7 +685,9 @@
- +