linting and polish

pull/11/head
Dan Gowans 2025-04-03 11:40:04 -04:00
parent 6125ef0030
commit 495231afd6
14 changed files with 101 additions and 49 deletions

View File

@ -1,5 +1,5 @@
export interface AddBurialSiteForm {
burialSiteNameSegment1: string;
burialSiteNameSegment1?: string;
burialSiteNameSegment2?: string;
burialSiteNameSegment3?: string;
burialSiteNameSegment4?: string;

View File

@ -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

View File

@ -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 ?? '',

View File

@ -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';

View File

@ -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'

View File

@ -1 +1 @@
export declare function getCemeteryIdByKey(cemeteryKey: string, user: User): Promise<number>;
export declare function getCemeteryIdByKey(cemeteryKeyToSearch: string | undefined, user: User): Promise<number>;

View File

@ -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: '',

View File

@ -23,7 +23,7 @@ const cemeteryToCemeteryName = {
const cemeteryCache = new Map<string, number>()
export async function getCemeteryIdByKey(
cemeteryKey: string,
cemeteryKeyToSearch: string | undefined,
user: User
): Promise<number> {
/*
@ -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: '',

View File

@ -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),

View File

@ -342,7 +342,7 @@ async function importFromMasterCSV(): Promise<void> {
* 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<void> {
masterRow.CM_PURCHASE_DAY
)
let contractEndDateString: DateString | '' = ''
let contractEndDateString: '' | DateString = ''
if (
masterRow.CM_INTERMENT_YR !== '' &&
@ -418,8 +418,9 @@ async function importFromMasterCSV(): Promise<void> {
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<void> {
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<void> {
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<void> {
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<void> {
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 === ''

View File

@ -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 {

View File

@ -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
}

View File

@ -37,6 +37,7 @@
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>

View File

@ -447,19 +447,28 @@
<label class="label" for="contract--purchaserName">
Purchaser Name
</label>
<div class="control">
<input class="input" id="contract--purchaserName" name="purchaserName" type="text" maxlength="100" autocomplete="off" required value="<%= contract.purchaserName %>" />
<div class="control has-icons-right">
<input class="input" id="contract--purchaserName" name="purchaserName" type="text"
maxlength="100" autocomplete="off" required
value="<%= contract.purchaserName %>" />
<span class="icon is-right">
<i class="fas fa-asterisk" aria-hidden="true"></i>
</span>
</div>
</div>
<div class="field">
<label class="label" for="contract--purchaserAddress1">Address</label>
<div class="control">
<input class="input" id="contract--purchaserAddress1" name="purchaserAddress1" type="text" maxlength="50" placeholder="Line 1" autocomplete="off" value="<%= contract.purchaserAddress1 %>" />
<input class="input" id="contract--purchaserAddress1" name="purchaserAddress1" type="text"
maxlength="50" placeholder="Line 1" autocomplete="off"
value="<%= contract.purchaserAddress1 %>" />
</div>
</div>
<div class="field">
<div class="control">
<input class="input" id="contract--purchaserAddress2" name="purchaserAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" value="<%= contract.purchaserAddress2 %>" />
<input class="input" id="contract--purchaserAddress2" name="purchaserAddress2" type="text"
maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2"
value="<%= contract.purchaserAddress2 %>" />
</div>
</div>
<div class="field">
@ -475,7 +484,8 @@
<div class="field">
<label class="label" for="contract--purchaserProvince">Province</label>
<div class="control">
<input class="input" id="contract--purchaserProvince" name="purchaserProvince" type="text" maxlength="2" value="<%= contract.purchaserProvince %>" />
<input class="input" id="contract--purchaserProvince" name="purchaserProvince" type="text" maxlength="2"
value="<%= contract.purchaserProvince %>" />
</div>
</div>
</div>
@ -483,7 +493,9 @@
<div class="field">
<label class="label" for="contract--purchaserPostalCode">Postal Code</label>
<div class="control">
<input class="input" id="contract--purchaserPostalCode" name="purchaserPostalCode" type="text" maxlength="7" autocomplete="off" value="<%= contract.purchaserPostalCode %>" />
<input class="input" id="contract--purchaserPostalCode" name="purchaserPostalCode" type="text"
maxlength="7" autocomplete="off"
value="<%= contract.purchaserPostalCode %>" />
</div>
</div>
</div>
@ -493,7 +505,9 @@
<div class="field">
<label class="label" for="contract--purchaserPhoneNumber">Phone Number</label>
<div class="control">
<input class="input" id="contract--purchaserPhoneNumber" name="purchaserPhoneNumber" type="text" maxlength="30" autocomplete="off" value="<%= contract.purchaserPhoneNumber %>" />
<input class="input" id="contract--purchaserPhoneNumber" name="purchaserPhoneNumber" type="text"
maxlength="30" autocomplete="off"
value="<%= contract.purchaserPhoneNumber %>" />
</div>
</div>
</div>
@ -501,7 +515,9 @@
<div class="field">
<label class="label" for="contract--purchaserEmail">Email Address</label>
<div class="control">
<input class="input" id="contract--purchaserEmail" name="purchaserEmail" type="email" maxlength="100" autocomplete="off" value="<%= contract.purchaserEmail %>" />
<input class="input" id="contract--purchaserEmail" name="purchaserEmail" type="email"
maxlength="100" autocomplete="off"
value="<%= contract.purchaserEmail %>" />
</div>
</div>
</div>
@ -556,19 +572,28 @@
<span class="is-recipient-or-deceased"><%= (contract.isPreneed ? "Recipient" : "Deceased") %></span>
Name
</label>
<div class="control">
<input class="input" id="contract--deceasedName" name="deceasedName" type="text" maxlength="100" autocomplete="off" required value="<%= contract.deceasedName %>" />
<div class="control has-icons-right">
<input class="input" id="contract--deceasedName" name="deceasedName" type="text"
maxlength="100" autocomplete="off" required
value="<%= contract.deceasedName %>" />
<span class="icon is-right">
<i class="fas fa-asterisk" aria-hidden="true"></i>
</span>
</div>
</div>
<div class="field">
<label class="label" for="contract--deceasedAddress1">Address</label>
<div class="control">
<input class="input" id="contract--deceasedAddress1" name="deceasedAddress1" type="text" maxlength="50" placeholder="Line 1" autocomplete="off" value="<%= contract.deceasedAddress1 %>" />
<input class="input" id="contract--deceasedAddress1" name="deceasedAddress1" type="text"
maxlength="50" placeholder="Line 1" autocomplete="off"
value="<%= contract.deceasedAddress1 %>" />
</div>
</div>
<div class="field">
<div class="control">
<input class="input" id="contract--deceasedAddress2" name="deceasedAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" value="<%= contract.deceasedAddress2 %>" />
<input class="input" id="contract--deceasedAddress2" name="deceasedAddress2" type="text"
maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2"
value="<%= contract.deceasedAddress2 %>" />
</div>
</div>
<div class="field">
@ -584,7 +609,9 @@
<div class="field">
<label class="label" for="contract--deceasedProvince">Province</label>
<div class="control">
<input class="input" id="contract--deceasedProvince" name="deceasedProvince" type="text" maxlength="2" value="<%= contract.deceasedProvince %>" />
<input class="input" id="contract--deceasedProvince" name="deceasedProvince" type="text"
maxlength="2"
value="<%= contract.deceasedProvince %>" />
</div>
</div>
</div>
@ -592,7 +619,9 @@
<div class="field">
<label class="label" for="contract--deceasedPostalCode">Postal Code</label>
<div class="control">
<input class="input" id="contract--deceasedPostalCode" name="deceasedPostalCode" type="text" maxlength="7" autocomplete="off" value="<%= contract.deceasedPostalCode %>" />
<input class="input" id="contract--deceasedPostalCode" name="deceasedPostalCode" type="text"
maxlength="7" autocomplete="off"
value="<%= contract.deceasedPostalCode %>" />
</div>
</div>
</div>
@ -604,7 +633,8 @@
Date of Birth
</label>
<div class="control has-icons-left">
<input class="input" id="contract--birthDateString" name="birthDateString" type="date" value="<%= contract.birthDateString %>" />
<input class="input" id="contract--birthDateString" name="birthDateString" type="date"
value="<%= contract.birthDateString %>" />
<span class="icon is-left">
<i class="fas fa-calendar" aria-hidden="true"></i>
</span>
@ -631,7 +661,8 @@
Date of Death
</label>
<div class="control has-icons-left">
<input class="input" id="contract--deathDateString" name="deathDateString" type="date" value="<%= contract.deathDateString %>" />
<input class="input" id="contract--deathDateString" name="deathDateString" type="date"
value="<%= contract.deathDateString %>" />
<span class="icon is-left">
<i class="fas fa-calendar" aria-hidden="true"></i>
</span>
@ -654,7 +685,9 @@
<label class="label" for="contract--deathAge">Death Age</label>
<div class="field has-addons">
<div class="control is-expanded">
<input class="input has-text-right" id="contract--deathAge" name="deathAge" type="number" min="0" max="150" value="<%= contract.deathAge %>" />
<input class="input has-text-right" id="contract--deathAge" name="deathAge" type="number"
min="0" max="150"
value="<%= contract.deathAge %>" />
</div>
<div class="control is-expanded">
<div class="select is-fullwidth">