From 6cb36c454834cc7b6add4ca19844965c81050fe7 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Tue, 15 Apr 2025 14:48:26 -0400 Subject: [PATCH] linting --- app.js | 2 +- app.ts | 2 +- database/addBurialSiteTypeField.d.ts | 6 ++-- database/addBurialSiteTypeField.ts | 6 ++-- database/updateBurialSiteTypeField.d.ts | 2 +- database/updateBurialSiteTypeField.ts | 2 +- database/updateCemetery.d.ts | 7 +++++ database/updateCemetery.js | 7 +++++ database/updateCemetery.ts | 7 +++++ database/updateContract.d.ts | 20 ++++++------- database/updateContract.ts | 26 +++++++++------- database/updateContractComment.d.ts | 2 +- database/updateContractComment.ts | 2 +- database/updateContractFeeQuantity.d.ts | 6 ++-- database/updateContractFeeQuantity.ts | 6 ++-- database/updateContractInterment.d.ts | 12 ++++---- database/updateContractInterment.ts | 17 +++++++---- database/updateContractTransaction.d.ts | 6 ++-- database/updateContractTransaction.ts | 8 +++-- database/updateContractType.js | 8 ++--- database/updateContractType.ts | 8 ++--- database/updateContractTypeField.js | 18 +++++------ database/updateContractTypeField.ts | 18 +++++------ database/updateFee.js | 30 +++++++++---------- database/updateFee.ts | 30 +++++++++---------- database/updateFeeCategory.js | 8 ++--- database/updateFeeCategory.ts | 8 ++--- database/updateWorkOrder.js | 12 ++++---- database/updateWorkOrder.ts | 12 ++++---- database/updateWorkOrderComment.js | 10 +++---- database/updateWorkOrderComment.ts | 10 +++---- database/updateWorkOrderMilestone.js | 12 ++++---- database/updateWorkOrderMilestone.ts | 12 ++++---- docs/README.md | 4 +-- docs/installation.md | 3 +- handlers/admin-get/burialSiteTypes.ts | 1 + handlers/admin-get/contractTypes.js | 6 ++-- handlers/admin-get/contractTypes.ts | 7 +++-- handlers/admin-get/fees.js | 4 +-- handlers/admin-get/fees.ts | 5 ++-- handlers/admin-get/tables.js | 4 +-- handlers/admin-get/tables.ts | 5 ++-- handlers/contracts-get/edit.js | 2 +- handlers/contracts-get/edit.ts | 7 +++-- handlers/contracts-get/new.js | 2 +- handlers/contracts-get/new.ts | 6 ++-- handlers/contracts-get/search.js | 8 ++--- handlers/contracts-get/search.ts | 9 +++--- handlers/contracts-get/view.ts | 1 + handlers/dashboard-get/dashboard.ts | 3 +- handlers/funeralHomes-get/edit.js | 4 +-- handlers/funeralHomes-get/edit.ts | 5 ++-- handlers/funeralHomes-get/new.js | 6 ++-- handlers/funeralHomes-get/new.ts | 7 +++-- handlers/funeralHomes-get/search.ts | 1 + handlers/funeralHomes-get/view.js | 1 - handlers/funeralHomes-get/view.ts | 2 +- handlers/reports-get/reportName.ts | 2 ++ handlers/reports-get/search.js | 6 ++-- handlers/reports-get/search.ts | 10 ++++--- handlers/workOrders-get/edit.js | 4 +-- handlers/workOrders-get/edit.ts | 6 ++-- handlers/workOrders-get/new.ts | 6 ++-- handlers/workOrders-get/outlook.js | 4 +-- handlers/workOrders-get/outlook.ts | 6 ++-- handlers/workOrders-get/search.js | 4 +-- handlers/workOrders-get/search.ts | 6 ++-- ...ation.d.ts => authentication.helpers.d.ts} | 0 ...ntication.js => authentication.helpers.js} | 0 ...ntication.ts => authentication.helpers.ts} | 0 helpers/database.helpers.js | 2 +- helpers/database.helpers.ts | 2 +- package.json | 9 ++++-- routes/login.js | 2 +- routes/login.ts | 10 +++---- 75 files changed, 290 insertions(+), 234 deletions(-) rename helpers/{functions.authentication.d.ts => authentication.helpers.d.ts} (100%) rename helpers/{functions.authentication.js => authentication.helpers.js} (100%) rename helpers/{functions.authentication.ts => authentication.helpers.ts} (100%) diff --git a/app.js b/app.js index 37476388..dbc2a87c 100644 --- a/app.js +++ b/app.js @@ -12,9 +12,9 @@ import createError from 'http-errors'; import FileStore from 'session-file-store'; import { DEBUG_NAMESPACE } from './debug.config.js'; import * as permissionHandlers from './handlers/permissions.js'; +import { getSafeRedirectURL } from './helpers/authentication.helpers.js'; import * as configFunctions from './helpers/config.helpers.js'; import { useTestDatabases } from './helpers/database.helpers.js'; -import { getSafeRedirectURL } from './helpers/functions.authentication.js'; import * as printFunctions from './helpers/functions.print.js'; import routerAdmin from './routes/admin.js'; import routerApi from './routes/api.js'; diff --git a/app.ts b/app.ts index 752bcb65..2c84fb82 100644 --- a/app.ts +++ b/app.ts @@ -14,9 +14,9 @@ import FileStore from 'session-file-store' import { DEBUG_NAMESPACE } from './debug.config.js' import * as permissionHandlers from './handlers/permissions.js' +import { getSafeRedirectURL } from './helpers/authentication.helpers.js' import * as configFunctions from './helpers/config.helpers.js' import { useTestDatabases } from './helpers/database.helpers.js' -import { getSafeRedirectURL } from './helpers/functions.authentication.js' import * as printFunctions from './helpers/functions.print.js' import routerAdmin from './routes/admin.js' import routerApi from './routes/api.js' diff --git a/database/addBurialSiteTypeField.d.ts b/database/addBurialSiteTypeField.d.ts index 49e2f48f..007778c9 100644 --- a/database/addBurialSiteTypeField.d.ts +++ b/database/addBurialSiteTypeField.d.ts @@ -1,12 +1,12 @@ export interface AddBurialSiteTypeFieldForm { - burialSiteTypeId: string | number; + burialSiteTypeId: number | string; burialSiteTypeField: string; fieldType?: string; fieldValues?: string; isRequired?: string; pattern?: string; - minLength?: string | number; - maxLength?: string | number; + minLength?: number | string; + maxLength?: number | string; orderNumber?: number; } export default function addBurialSiteTypeField(addForm: AddBurialSiteTypeFieldForm, user: User): Promise; diff --git a/database/addBurialSiteTypeField.ts b/database/addBurialSiteTypeField.ts index b7e58753..fbc7b21a 100644 --- a/database/addBurialSiteTypeField.ts +++ b/database/addBurialSiteTypeField.ts @@ -3,14 +3,14 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js' import { acquireConnection } from './pool.js' export interface AddBurialSiteTypeFieldForm { - burialSiteTypeId: string | number + burialSiteTypeId: number | string burialSiteTypeField: string fieldType?: string fieldValues?: string isRequired?: string pattern?: string - minLength?: string | number - maxLength?: string | number + minLength?: number | string + maxLength?: number | string orderNumber?: number } diff --git a/database/updateBurialSiteTypeField.d.ts b/database/updateBurialSiteTypeField.d.ts index 9dbf2f34..10cce5dd 100644 --- a/database/updateBurialSiteTypeField.d.ts +++ b/database/updateBurialSiteTypeField.d.ts @@ -3,8 +3,8 @@ export interface UpdateBurialSiteTypeFieldForm { burialSiteTypeField: string; isRequired: '0' | '1'; fieldType?: string; - minLength?: string; maxLength?: string; + minLength?: string; pattern?: string; fieldValues: string; } diff --git a/database/updateBurialSiteTypeField.ts b/database/updateBurialSiteTypeField.ts index 2c4eb999..4614cdba 100644 --- a/database/updateBurialSiteTypeField.ts +++ b/database/updateBurialSiteTypeField.ts @@ -7,8 +7,8 @@ export interface UpdateBurialSiteTypeFieldForm { burialSiteTypeField: string isRequired: '0' | '1' fieldType?: string - minLength?: string maxLength?: string + minLength?: string pattern?: string fieldValues: string } diff --git a/database/updateCemetery.d.ts b/database/updateCemetery.d.ts index 5aa978c8..d2b2dd55 100644 --- a/database/updateCemetery.d.ts +++ b/database/updateCemetery.d.ts @@ -14,4 +14,11 @@ export interface UpdateCemeteryForm { cemeteryLongitude: string; cemeterySvg: string; } +/** + * Updates a cemetery in the database. + * Be sure to rebuild burial site names after updating a cemetery. + * @param updateForm - The form data from the update cemetery form. + * @param user - The user who is updating the cemetery. + * @returns `true` if the cemetery was updated successfully, `false` otherwise. + */ export default function updateCemetery(updateForm: UpdateCemeteryForm, user: User): Promise; diff --git a/database/updateCemetery.js b/database/updateCemetery.js index 123eb876..98a204c3 100644 --- a/database/updateCemetery.js +++ b/database/updateCemetery.js @@ -1,4 +1,11 @@ import { acquireConnection } from './pool.js'; +/** + * Updates a cemetery in the database. + * Be sure to rebuild burial site names after updating a cemetery. + * @param updateForm - The form data from the update cemetery form. + * @param user - The user who is updating the cemetery. + * @returns `true` if the cemetery was updated successfully, `false` otherwise. + */ export default async function updateCemetery(updateForm, user) { const database = await acquireConnection(); const result = database diff --git a/database/updateCemetery.ts b/database/updateCemetery.ts index 3f38e7b5..5a78d13c 100644 --- a/database/updateCemetery.ts +++ b/database/updateCemetery.ts @@ -21,6 +21,13 @@ export interface UpdateCemeteryForm { cemeterySvg: string } +/** + * Updates a cemetery in the database. + * Be sure to rebuild burial site names after updating a cemetery. + * @param updateForm - The form data from the update cemetery form. + * @param user - The user who is updating the cemetery. + * @returns `true` if the cemetery was updated successfully, `false` otherwise. + */ export default async function updateCemetery( updateForm: UpdateCemeteryForm, user: User diff --git a/database/updateContract.d.ts b/database/updateContract.d.ts index 7727cd66..a1b31043 100644 --- a/database/updateContract.d.ts +++ b/database/updateContract.d.ts @@ -1,23 +1,23 @@ import { type DateString, type TimeString } from '@cityssm/utils-datetime'; export interface UpdateContractForm { - contractId: string | number; - contractTypeId: string | number; - burialSiteId: string | number; + contractId: number | string; + burialSiteId: number | string; + contractTypeId: number | string; + contractEndDateString: '' | DateString; contractStartDateString: DateString; - contractEndDateString: DateString | ''; - funeralHomeId?: string | number; + funeralHomeId?: number | string; + committalTypeId?: number | string; + funeralDateString: '' | DateString; funeralDirectorName: string; - funeralDateString: DateString | ''; - funeralTimeString: TimeString | ''; - committalTypeId?: string | number; + funeralTimeString: '' | TimeString; purchaserName?: string; purchaserAddress1?: string; purchaserAddress2?: string; purchaserCity?: string; - purchaserProvince?: string; purchaserPostalCode?: string; - purchaserPhoneNumber?: string; + purchaserProvince?: string; purchaserEmail?: string; + purchaserPhoneNumber?: string; purchaserRelationship?: string; contractTypeFieldIds?: string; [fieldValue_contractTypeFieldId: `fieldValue_${string}`]: unknown; diff --git a/database/updateContract.ts b/database/updateContract.ts index 6809ab70..52fac8b9 100644 --- a/database/updateContract.ts +++ b/database/updateContract.ts @@ -10,27 +10,31 @@ import deleteContractField from './deleteContractField.js' import { acquireConnection } from './pool.js' export interface UpdateContractForm { - contractId: string | number - contractTypeId: string | number - burialSiteId: string | number + contractId: number | string + burialSiteId: number | string + contractTypeId: number | string + + contractEndDateString: '' | DateString contractStartDateString: DateString - contractEndDateString: DateString | '' - - funeralHomeId?: string | number + + funeralHomeId?: number | string + + committalTypeId?: number | string + funeralDateString: '' | DateString funeralDirectorName: string - funeralDateString: DateString | '' - funeralTimeString: TimeString | '' - committalTypeId?: string | number + funeralTimeString: '' | TimeString purchaserName?: string + purchaserAddress1?: string purchaserAddress2?: string purchaserCity?: string - purchaserProvince?: string purchaserPostalCode?: string - purchaserPhoneNumber?: string + purchaserProvince?: string + purchaserEmail?: string + purchaserPhoneNumber?: string purchaserRelationship?: string contractTypeFieldIds?: string diff --git a/database/updateContractComment.d.ts b/database/updateContractComment.d.ts index afadb590..99330cb6 100644 --- a/database/updateContractComment.d.ts +++ b/database/updateContractComment.d.ts @@ -1,6 +1,6 @@ import { type DateString, type TimeString } from '@cityssm/utils-datetime'; export interface UpdateForm { - contractCommentId: string | number; + contractCommentId: number | string; commentDateString: DateString; commentTimeString: TimeString; comment: string; diff --git a/database/updateContractComment.ts b/database/updateContractComment.ts index f36d0f36..1963b116 100644 --- a/database/updateContractComment.ts +++ b/database/updateContractComment.ts @@ -8,7 +8,7 @@ import { import { acquireConnection } from './pool.js' export interface UpdateForm { - contractCommentId: string | number + contractCommentId: number | string commentDateString: DateString commentTimeString: TimeString comment: string diff --git a/database/updateContractFeeQuantity.d.ts b/database/updateContractFeeQuantity.d.ts index f3e79a91..ae0f6ffa 100644 --- a/database/updateContractFeeQuantity.d.ts +++ b/database/updateContractFeeQuantity.d.ts @@ -1,6 +1,6 @@ export interface UpdateBurialSiteFeeForm { - contractId: string | number; - feeId: string | number; - quantity: string | number; + contractId: number | string; + feeId: number | string; + quantity: number | string; } export default function updateContractFeeQuantity(feeQuantityForm: UpdateBurialSiteFeeForm, user: User): Promise; diff --git a/database/updateContractFeeQuantity.ts b/database/updateContractFeeQuantity.ts index 38e059a2..2c6618d9 100644 --- a/database/updateContractFeeQuantity.ts +++ b/database/updateContractFeeQuantity.ts @@ -1,9 +1,9 @@ import { acquireConnection } from './pool.js' export interface UpdateBurialSiteFeeForm { - contractId: string | number - feeId: string | number - quantity: string | number + contractId: number | string + feeId: number | string + quantity: number | string } export default async function updateContractFeeQuantity( diff --git a/database/updateContractInterment.d.ts b/database/updateContractInterment.d.ts index e7dc694e..d3abf716 100644 --- a/database/updateContractInterment.d.ts +++ b/database/updateContractInterment.d.ts @@ -1,19 +1,19 @@ import { type DateString } from '@cityssm/utils-datetime'; export interface UpdateForm { - contractId: string | number; - intermentNumber: string | number; + contractId: number | string; + intermentNumber: number | string; deceasedName: string; deceasedAddress1: string; deceasedAddress2: string; deceasedCity: string; - deceasedProvince: string; deceasedPostalCode: string; - birthDateString: DateString | ''; + deceasedProvince: string; + birthDateString: '' | DateString; birthPlace: string; - deathDateString: DateString | ''; + deathDateString: '' | DateString; deathPlace: string; deathAge: string; deathAgePeriod: string; - intermentContainerTypeId: string | number; + intermentContainerTypeId: number | string; } export default function updateContractInterment(contractForm: UpdateForm, user: User): Promise; diff --git a/database/updateContractInterment.ts b/database/updateContractInterment.ts index a52f9580..4cd2bff0 100644 --- a/database/updateContractInterment.ts +++ b/database/updateContractInterment.ts @@ -3,21 +3,26 @@ import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' import { acquireConnection } from './pool.js' export interface UpdateForm { - contractId: string | number - intermentNumber: string | number + contractId: number | string + intermentNumber: number | string + deceasedName: string + deceasedAddress1: string deceasedAddress2: string deceasedCity: string - deceasedProvince: string deceasedPostalCode: string - birthDateString: DateString | '' + deceasedProvince: string + + birthDateString: '' | DateString birthPlace: string - deathDateString: DateString | '' + deathDateString: '' | DateString deathPlace: string + deathAge: string deathAgePeriod: string - intermentContainerTypeId: string | number + + intermentContainerTypeId: number | string } export default async function updateContractInterment( diff --git a/database/updateContractTransaction.d.ts b/database/updateContractTransaction.d.ts index 30bdf1db..5bd807c9 100644 --- a/database/updateContractTransaction.d.ts +++ b/database/updateContractTransaction.d.ts @@ -1,11 +1,11 @@ import { type DateString, type TimeString } from '@cityssm/utils-datetime'; export interface ContractTransactionUpdateForm { - contractId: string | number; - transactionIndex: string | number; + contractId: number | string; + transactionIndex: number | string; transactionDateString: DateString; transactionTimeString: TimeString; - transactionAmount: string | number; externalReceiptNumber: string; + transactionAmount: number | string; transactionNote: string; } export default function updateContractTransaction(updateForm: ContractTransactionUpdateForm, user: User): Promise; diff --git a/database/updateContractTransaction.ts b/database/updateContractTransaction.ts index 7d382974..45f0866d 100644 --- a/database/updateContractTransaction.ts +++ b/database/updateContractTransaction.ts @@ -8,12 +8,14 @@ import { import { acquireConnection } from './pool.js' export interface ContractTransactionUpdateForm { - contractId: string | number - transactionIndex: string | number + contractId: number | string + transactionIndex: number | string + transactionDateString: DateString transactionTimeString: TimeString - transactionAmount: string | number + externalReceiptNumber: string + transactionAmount: number | string transactionNote: string } diff --git a/database/updateContractType.js b/database/updateContractType.js index e74ed750..ae067ebf 100644 --- a/database/updateContractType.js +++ b/database/updateContractType.js @@ -6,11 +6,11 @@ export default async function updateContractType(updateForm, user) { const result = database .prepare(`update ContractTypes set contractType = ?, - isPreneed = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + isPreneed = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and contractTypeId = ?`) + and contractTypeId = ?`) .run(updateForm.contractType, updateForm.isPreneed === undefined ? 0 : 1, user.userName, rightNowMillis, updateForm.contractTypeId); database.release(); clearCacheByTableName('ContractTypes'); diff --git a/database/updateContractType.ts b/database/updateContractType.ts index 02c11688..c7c482a6 100644 --- a/database/updateContractType.ts +++ b/database/updateContractType.ts @@ -21,11 +21,11 @@ export default async function updateContractType( .prepare( `update ContractTypes set contractType = ?, - isPreneed = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + isPreneed = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and contractTypeId = ?` + and contractTypeId = ?` ) .run( updateForm.contractType, diff --git a/database/updateContractTypeField.js b/database/updateContractTypeField.js index bdb17729..ee2da5e9 100644 --- a/database/updateContractTypeField.js +++ b/database/updateContractTypeField.js @@ -5,16 +5,16 @@ export default async function updateContractTypeField(updateForm, user) { const result = database .prepare(`update ContractTypeFields set contractTypeField = ?, - isRequired = ?, - fieldType = ?, - minLength = ?, - maxLength = ?, - pattern = ?, - fieldValues = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + isRequired = ?, + fieldType = ?, + minLength = ?, + maxLength = ?, + pattern = ?, + fieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where contractTypeFieldId = ? - and recordDelete_timeMillis is null`) + and recordDelete_timeMillis is null`) .run(updateForm.contractTypeField, Number.parseInt(updateForm.isRequired, 10), updateForm.fieldType ?? 'text', updateForm.minLength ?? 0, updateForm.maxLength ?? 100, updateForm.pattern ?? '', updateForm.fieldValues, user.userName, Date.now(), updateForm.contractTypeFieldId); database.release(); clearCacheByTableName('ContractTypeFields'); diff --git a/database/updateContractTypeField.ts b/database/updateContractTypeField.ts index b0a84e37..d7e06b72 100644 --- a/database/updateContractTypeField.ts +++ b/database/updateContractTypeField.ts @@ -24,16 +24,16 @@ export default async function updateContractTypeField( .prepare( `update ContractTypeFields set contractTypeField = ?, - isRequired = ?, - fieldType = ?, - minLength = ?, - maxLength = ?, - pattern = ?, - fieldValues = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + isRequired = ?, + fieldType = ?, + minLength = ?, + maxLength = ?, + pattern = ?, + fieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where contractTypeFieldId = ? - and recordDelete_timeMillis is null` + and recordDelete_timeMillis is null` ) .run( updateForm.contractTypeField, diff --git a/database/updateFee.js b/database/updateFee.js index 4b47a76b..4449a05c 100644 --- a/database/updateFee.js +++ b/database/updateFee.js @@ -4,22 +4,22 @@ export default async function updateFee(feeForm, user) { const result = database .prepare(`update Fees set feeCategoryId = ?, - feeName = ?, - feeDescription = ?, - feeAccount = ?, - contractTypeId = ?, - burialSiteTypeId = ?, - feeAmount = ?, - feeFunction = ?, - taxAmount = ?, - taxPercentage = ?, - includeQuantity = ?, - quantityUnit = ?, - isRequired = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + feeName = ?, + feeDescription = ?, + feeAccount = ?, + contractTypeId = ?, + burialSiteTypeId = ?, + feeAmount = ?, + feeFunction = ?, + taxAmount = ?, + taxPercentage = ?, + includeQuantity = ?, + quantityUnit = ?, + isRequired = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and feeId = ?`) + and feeId = ?`) .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.feeAccount, feeForm.contractTypeId === '' ? undefined : feeForm.contractTypeId, feeForm.burialSiteTypeId === '' ? undefined : feeForm.burialSiteTypeId, feeForm.feeAmount === undefined || feeForm.feeAmount === '' ? 0 : feeForm.feeAmount, feeForm.feeFunction ?? undefined, feeForm.taxAmount === '' ? undefined : feeForm.taxAmount, feeForm.taxPercentage === '' ? undefined : feeForm.taxPercentage, feeForm.includeQuantity === '' ? 0 : 1, feeForm.quantityUnit, feeForm.isRequired === '' ? 0 : 1, user.userName, Date.now(), feeForm.feeId); diff --git a/database/updateFee.ts b/database/updateFee.ts index 959e833f..2d115898 100644 --- a/database/updateFee.ts +++ b/database/updateFee.ts @@ -27,22 +27,22 @@ export default async function updateFee( .prepare( `update Fees set feeCategoryId = ?, - feeName = ?, - feeDescription = ?, - feeAccount = ?, - contractTypeId = ?, - burialSiteTypeId = ?, - feeAmount = ?, - feeFunction = ?, - taxAmount = ?, - taxPercentage = ?, - includeQuantity = ?, - quantityUnit = ?, - isRequired = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + feeName = ?, + feeDescription = ?, + feeAccount = ?, + contractTypeId = ?, + burialSiteTypeId = ?, + feeAmount = ?, + feeFunction = ?, + taxAmount = ?, + taxPercentage = ?, + includeQuantity = ?, + quantityUnit = ?, + isRequired = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and feeId = ?` + and feeId = ?` ) .run( feeForm.feeCategoryId, diff --git a/database/updateFeeCategory.js b/database/updateFeeCategory.js index 8cf2a3b9..58b2b456 100644 --- a/database/updateFeeCategory.js +++ b/database/updateFeeCategory.js @@ -4,11 +4,11 @@ export default async function updateFeeCategory(feeCategoryForm, user) { const result = database .prepare(`update FeeCategories set feeCategory = ?, - isGroupedFee = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + isGroupedFee = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and feeCategoryId = ?`) + and feeCategoryId = ?`) .run(feeCategoryForm.feeCategory, (feeCategoryForm.isGroupedFee ?? '') === '1' ? 1 : 0, user.userName, Date.now(), feeCategoryForm.feeCategoryId); database.release(); return result.changes > 0; diff --git a/database/updateFeeCategory.ts b/database/updateFeeCategory.ts index fe896403..bcaa9b4a 100644 --- a/database/updateFeeCategory.ts +++ b/database/updateFeeCategory.ts @@ -17,11 +17,11 @@ export default async function updateFeeCategory( .prepare( `update FeeCategories set feeCategory = ?, - isGroupedFee = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + isGroupedFee = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and feeCategoryId = ?` + and feeCategoryId = ?` ) .run( feeCategoryForm.feeCategory, diff --git a/database/updateWorkOrder.js b/database/updateWorkOrder.js index 035f428d..d6d1860d 100644 --- a/database/updateWorkOrder.js +++ b/database/updateWorkOrder.js @@ -5,13 +5,13 @@ export default async function updateWorkOrder(workOrderForm, user) { const result = database .prepare(`update WorkOrders set workOrderNumber = ?, - workOrderTypeId = ?, - workOrderDescription = ?, - workOrderOpenDate = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + workOrderTypeId = ?, + workOrderDescription = ?, + workOrderOpenDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where workOrderId = ? - and recordDelete_timeMillis is null`) + and recordDelete_timeMillis is null`) .run(workOrderForm.workOrderNumber, workOrderForm.workOrderTypeId, workOrderForm.workOrderDescription, dateStringToInteger(workOrderForm.workOrderOpenDateString), user.userName, Date.now(), workOrderForm.workOrderId); database.release(); return result.changes > 0; diff --git a/database/updateWorkOrder.ts b/database/updateWorkOrder.ts index 65130991..ccd52f2c 100644 --- a/database/updateWorkOrder.ts +++ b/database/updateWorkOrder.ts @@ -21,13 +21,13 @@ export default async function updateWorkOrder( .prepare( `update WorkOrders set workOrderNumber = ?, - workOrderTypeId = ?, - workOrderDescription = ?, - workOrderOpenDate = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + workOrderTypeId = ?, + workOrderDescription = ?, + workOrderOpenDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where workOrderId = ? - and recordDelete_timeMillis is null` + and recordDelete_timeMillis is null` ) .run( workOrderForm.workOrderNumber, diff --git a/database/updateWorkOrderComment.js b/database/updateWorkOrderComment.js index 17de433e..5f303bd5 100644 --- a/database/updateWorkOrderComment.js +++ b/database/updateWorkOrderComment.js @@ -5,12 +5,12 @@ export default async function updateWorkOrderComment(commentForm, user) { const result = database .prepare(`update WorkOrderComments set commentDate = ?, - commentTime = ?, - comment = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + commentTime = ?, + comment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and workOrderCommentId = ?`) + and workOrderCommentId = ?`) .run(dateStringToInteger(commentForm.commentDateString), timeStringToInteger(commentForm.commentTimeString), commentForm.comment, user.userName, Date.now(), commentForm.workOrderCommentId); database.release(); return result.changes > 0; diff --git a/database/updateWorkOrderComment.ts b/database/updateWorkOrderComment.ts index 3e752f9b..69dac7ef 100644 --- a/database/updateWorkOrderComment.ts +++ b/database/updateWorkOrderComment.ts @@ -25,12 +25,12 @@ export default async function updateWorkOrderComment( .prepare( `update WorkOrderComments set commentDate = ?, - commentTime = ?, - comment = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + commentTime = ?, + comment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where recordDelete_timeMillis is null - and workOrderCommentId = ?` + and workOrderCommentId = ?` ) .run( dateStringToInteger(commentForm.commentDateString), diff --git a/database/updateWorkOrderMilestone.js b/database/updateWorkOrderMilestone.js index b91af295..9a2ba2ae 100644 --- a/database/updateWorkOrderMilestone.js +++ b/database/updateWorkOrderMilestone.js @@ -5,11 +5,11 @@ export default async function updateWorkOrderMilestone(milestoneForm, user) { const result = database .prepare(`update WorkOrderMilestones set workOrderMilestoneTypeId = ?, - workOrderMilestoneDate = ?, - workOrderMilestoneTime = ?, - workOrderMilestoneDescription = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + workOrderMilestoneDate = ?, + workOrderMilestoneTime = ?, + workOrderMilestoneDescription = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where workOrderMilestoneId = ?`) .run(milestoneForm.workOrderMilestoneTypeId === '' ? undefined @@ -17,7 +17,7 @@ export default async function updateWorkOrderMilestone(milestoneForm, user) { ? 0 : dateStringToInteger(milestoneForm.workOrderMilestoneDateString), (milestoneForm.workOrderMilestoneTimeString ?? '') === '' ? 0 - : timeStringToInteger(milestoneForm.workOrderMilestoneTimeString), milestoneForm.workOrderMilestoneDescription, user.userName, Date.now(), milestoneForm.workOrderMilestoneId); + : timeStringToInteger(milestoneForm.workOrderMilestoneTimeString ?? ''), milestoneForm.workOrderMilestoneDescription, user.userName, Date.now(), milestoneForm.workOrderMilestoneId); database.release(); return result.changes > 0; } diff --git a/database/updateWorkOrderMilestone.ts b/database/updateWorkOrderMilestone.ts index 8ceb3c12..cc757a0f 100644 --- a/database/updateWorkOrderMilestone.ts +++ b/database/updateWorkOrderMilestone.ts @@ -24,11 +24,11 @@ export default async function updateWorkOrderMilestone( .prepare( `update WorkOrderMilestones set workOrderMilestoneTypeId = ?, - workOrderMilestoneDate = ?, - workOrderMilestoneTime = ?, - workOrderMilestoneDescription = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? + workOrderMilestoneDate = ?, + workOrderMilestoneTime = ?, + workOrderMilestoneDescription = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? where workOrderMilestoneId = ?` ) .run( @@ -40,7 +40,7 @@ export default async function updateWorkOrderMilestone( : dateStringToInteger(milestoneForm.workOrderMilestoneDateString), (milestoneForm.workOrderMilestoneTimeString ?? '') === '' ? 0 - : timeStringToInteger(milestoneForm.workOrderMilestoneTimeString!), + : timeStringToInteger(milestoneForm.workOrderMilestoneTimeString ?? ''), milestoneForm.workOrderMilestoneDescription, user.userName, diff --git a/docs/README.md b/docs/README.md index c5e601ba..a893a573 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,11 +2,11 @@ # Sunrise CMS Help Documentation -**Thank you for taking the time to read the documentation.** +**Thank you for taking the time to read the Sunrise Cemetery Management System (CMS) documentation.** ![Burial Site View](./burialSite-view.png) -**Coming soon.** +**In development** ## 👩 User Documentation diff --git a/docs/installation.md b/docs/installation.md index 23be471a..20e6b9c1 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -4,7 +4,8 @@ # Installation -While Sunrise CMS can run on a high end server, that is by no means a requirement. +While the Sunrise Cemetery Management System (CMS) can run on a high end server, +that is by no means a requirement. Most user workstations are sufficient for modest installations. ## Minimum Requirements diff --git a/handlers/admin-get/burialSiteTypes.ts b/handlers/admin-get/burialSiteTypes.ts index e870828c..b489cdbc 100644 --- a/handlers/admin-get/burialSiteTypes.ts +++ b/handlers/admin-get/burialSiteTypes.ts @@ -10,6 +10,7 @@ export default async function handler( response.render('admin-burialSiteTypes', { headTitle: "Burial Site Type Management", + burialSiteTypes }) } diff --git a/handlers/admin-get/contractTypes.js b/handlers/admin-get/contractTypes.js index b9fe1d8b..11b229c2 100644 --- a/handlers/admin-get/contractTypes.js +++ b/handlers/admin-get/contractTypes.js @@ -13,9 +13,9 @@ export default async function handler(_request, response) { } } response.render('admin-contractTypes', { - headTitle: "Contract Type Management", - contractTypes, + headTitle: 'Contract Type Management', allContractTypeFields, - contractTypePrintTitles + contractTypePrintTitles, + contractTypes }); } diff --git a/handlers/admin-get/contractTypes.ts b/handlers/admin-get/contractTypes.ts index 62a40e45..c48030b2 100644 --- a/handlers/admin-get/contractTypes.ts +++ b/handlers/admin-get/contractTypes.ts @@ -27,9 +27,10 @@ export default async function handler( } response.render('admin-contractTypes', { - headTitle: "Contract Type Management", - contractTypes, + headTitle: 'Contract Type Management', + allContractTypeFields, - contractTypePrintTitles + contractTypePrintTitles, + contractTypes }) } diff --git a/handlers/admin-get/fees.js b/handlers/admin-get/fees.js index c77d6d24..328dbb17 100644 --- a/handlers/admin-get/fees.js +++ b/handlers/admin-get/fees.js @@ -8,8 +8,8 @@ export default async function handler(_request, response) { const burialSiteTypes = await getBurialSiteTypes(); response.render('admin-fees', { headTitle: 'Fee Management', - feeCategories, + burialSiteTypes, contractTypes, - burialSiteTypes + feeCategories }); } diff --git a/handlers/admin-get/fees.ts b/handlers/admin-get/fees.ts index 5cf07c94..79825dc9 100644 --- a/handlers/admin-get/fees.ts +++ b/handlers/admin-get/fees.ts @@ -22,8 +22,9 @@ export default async function handler( response.render('admin-fees', { headTitle: 'Fee Management', - feeCategories, + + burialSiteTypes, contractTypes, - burialSiteTypes + feeCategories }) } diff --git a/handlers/admin-get/tables.js b/handlers/admin-get/tables.js index 9009f759..4791be0b 100644 --- a/handlers/admin-get/tables.js +++ b/handlers/admin-get/tables.js @@ -5,8 +5,8 @@ export default async function handler(_request, response) { const burialSiteStatuses = await getBurialSiteStatuses(); response.render('admin-tables', { headTitle: 'Config Table Management', - workOrderTypes, + burialSiteStatuses, workOrderMilestoneTypes, - burialSiteStatuses + workOrderTypes }); } diff --git a/handlers/admin-get/tables.ts b/handlers/admin-get/tables.ts index f0df76f2..562a9a30 100644 --- a/handlers/admin-get/tables.ts +++ b/handlers/admin-get/tables.ts @@ -16,8 +16,9 @@ export default async function handler( response.render('admin-tables', { headTitle: 'Config Table Management', - workOrderTypes, + + burialSiteStatuses, workOrderMilestoneTypes, - burialSiteStatuses + workOrderTypes }) } diff --git a/handlers/contracts-get/edit.js b/handlers/contracts-get/edit.js index 82b3e8d0..ab8b24bb 100644 --- a/handlers/contracts-get/edit.js +++ b/handlers/contracts-get/edit.js @@ -17,10 +17,10 @@ export default async function handler(request, response) { response.render('contract-edit', { headTitle: 'Contract Update', contract, + committalTypes, contractTypePrints, contractTypes, funeralHomes, - committalTypes, intermentContainerTypes, workOrderTypes, isCreate: false diff --git a/handlers/contracts-get/edit.ts b/handlers/contracts-get/edit.ts index f317d3c0..cfb9c5a8 100644 --- a/handlers/contracts-get/edit.ts +++ b/handlers/contracts-get/edit.ts @@ -40,12 +40,13 @@ export default async function handler( response.render('contract-edit', { headTitle: 'Contract Update', - contract, - contractTypePrints, + contract, + + committalTypes, + contractTypePrints, contractTypes, funeralHomes, - committalTypes, intermentContainerTypes, workOrderTypes, diff --git a/handlers/contracts-get/new.js b/handlers/contracts-get/new.js index f3d758d0..c06bf2ca 100644 --- a/handlers/contracts-get/new.js +++ b/handlers/contracts-get/new.js @@ -28,9 +28,9 @@ export default async function handler(request, response) { response.render('contract-edit', { headTitle: 'Create a New Contract', contract, + committalTypes, contractTypes, funeralHomes, - committalTypes, intermentContainerTypes, isCreate: true }); diff --git a/handlers/contracts-get/new.ts b/handlers/contracts-get/new.ts index 9d44beb9..34a7b416 100644 --- a/handlers/contracts-get/new.ts +++ b/handlers/contracts-get/new.ts @@ -1,6 +1,7 @@ -import { dateToInteger, dateToString } from '@cityssm/utils-datetime' import type { Request, Response } from 'express' +import { dateToInteger, dateToString } from '@cityssm/utils-datetime' + import getBurialSite from '../../database/getBurialSite.js' import getFuneralHomes from '../../database/getFuneralHomes.js' import { getConfigProperty } from '../../helpers/config.helpers.js' @@ -39,11 +40,12 @@ export default async function handler( response.render('contract-edit', { headTitle: 'Create a New Contract', + contract, + committalTypes, contractTypes, funeralHomes, - committalTypes, intermentContainerTypes, isCreate: true diff --git a/handlers/contracts-get/search.js b/handlers/contracts-get/search.js index 49e7e83d..60019092 100644 --- a/handlers/contracts-get/search.js +++ b/handlers/contracts-get/search.js @@ -7,11 +7,11 @@ export default async function handler(request, response) { const contractTypes = await getContractTypes(); const funeralHomes = await getFuneralHomes(); response.render('contract-search', { - headTitle: "Contract Search", - cemeteries, + headTitle: 'Contract Search', burialSiteTypes, + cemeteries, + cemeteryId: request.query.cemeteryId, contractTypes, - funeralHomes, - cemeteryId: request.query.cemeteryId + funeralHomes }); } diff --git a/handlers/contracts-get/search.ts b/handlers/contracts-get/search.ts index 8e11dcd3..408af85f 100644 --- a/handlers/contracts-get/search.ts +++ b/handlers/contracts-get/search.ts @@ -17,11 +17,12 @@ export default async function handler( const funeralHomes = await getFuneralHomes() response.render('contract-search', { - headTitle: "Contract Search", - cemeteries, + headTitle: 'Contract Search', + burialSiteTypes, + cemeteries, + cemeteryId: request.query.cemeteryId, contractTypes, - funeralHomes, - cemeteryId: request.query.cemeteryId + funeralHomes }) } diff --git a/handlers/contracts-get/view.ts b/handlers/contracts-get/view.ts index f87b0542..47c67745 100644 --- a/handlers/contracts-get/view.ts +++ b/handlers/contracts-get/view.ts @@ -27,6 +27,7 @@ export default async function handler( response.render('contract-view', { headTitle: `Contract #${contract.contractId.toString()}`, + contract, contractTypePrints }) diff --git a/handlers/dashboard-get/dashboard.ts b/handlers/dashboard-get/dashboard.ts index 0d1d037a..59c7d9b1 100644 --- a/handlers/dashboard-get/dashboard.ts +++ b/handlers/dashboard-get/dashboard.ts @@ -1,6 +1,7 @@ -import { dateToString } from '@cityssm/utils-datetime' import type { Request, Response } from 'express' +import { dateToString } from '@cityssm/utils-datetime' + import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' export default async function handler( diff --git a/handlers/funeralHomes-get/edit.js b/handlers/funeralHomes-get/edit.js index 3f7cf9db..44ece07d 100644 --- a/handlers/funeralHomes-get/edit.js +++ b/handlers/funeralHomes-get/edit.js @@ -8,7 +8,7 @@ export default async function handler(request, response) { } response.render('funeralHome-edit', { headTitle: funeralHome.funeralHomeName, - isCreate: false, - funeralHome + funeralHome, + isCreate: false }); } diff --git a/handlers/funeralHomes-get/edit.ts b/handlers/funeralHomes-get/edit.ts index daf2d7e2..92ac1281 100644 --- a/handlers/funeralHomes-get/edit.ts +++ b/handlers/funeralHomes-get/edit.ts @@ -18,7 +18,8 @@ export default async function handler( response.render('funeralHome-edit', { headTitle: funeralHome.funeralHomeName, - isCreate: false, - funeralHome + + funeralHome, + isCreate: false }) } diff --git a/handlers/funeralHomes-get/new.js b/handlers/funeralHomes-get/new.js index 715e82f6..83f6ec92 100644 --- a/handlers/funeralHomes-get/new.js +++ b/handlers/funeralHomes-get/new.js @@ -5,8 +5,8 @@ export default function handler(_request, response) { funeralHomeProvince: getConfigProperty('settings.provinceDefault') }; response.render('funeralHome-edit', { - headTitle: "Create a Funeral Home", - isCreate: true, - funeralHome + headTitle: 'Create a Funeral Home', + funeralHome, + isCreate: true }); } diff --git a/handlers/funeralHomes-get/new.ts b/handlers/funeralHomes-get/new.ts index 9c18a968..1bb3515b 100644 --- a/handlers/funeralHomes-get/new.ts +++ b/handlers/funeralHomes-get/new.ts @@ -10,8 +10,9 @@ export default function handler(_request: Request, response: Response): void { } response.render('funeralHome-edit', { - headTitle: "Create a Funeral Home", - isCreate: true, - funeralHome + headTitle: 'Create a Funeral Home', + + funeralHome, + isCreate: true }) } diff --git a/handlers/funeralHomes-get/search.ts b/handlers/funeralHomes-get/search.ts index b2b3ee24..2edf9909 100644 --- a/handlers/funeralHomes-get/search.ts +++ b/handlers/funeralHomes-get/search.ts @@ -10,6 +10,7 @@ export default async function handler( response.render('funeralHome-search', { headTitle: "Funeral Home Search", + funeralHomes }) } diff --git a/handlers/funeralHomes-get/view.js b/handlers/funeralHomes-get/view.js index 190983c2..6da81e7b 100644 --- a/handlers/funeralHomes-get/view.js +++ b/handlers/funeralHomes-get/view.js @@ -8,7 +8,6 @@ export default async function handler(request, response) { } response.render('funeralHome-view', { headTitle: funeralHome.funeralHomeName, - isCreate: false, funeralHome }); } diff --git a/handlers/funeralHomes-get/view.ts b/handlers/funeralHomes-get/view.ts index 0c8c6f25..2589ae80 100644 --- a/handlers/funeralHomes-get/view.ts +++ b/handlers/funeralHomes-get/view.ts @@ -18,7 +18,7 @@ export default async function handler( response.render('funeralHome-view', { headTitle: funeralHome.funeralHomeName, - isCreate: false, + funeralHome }) } diff --git a/handlers/reports-get/reportName.ts b/handlers/reports-get/reportName.ts index d0b5206a..891fc7f8 100644 --- a/handlers/reports-get/reportName.ts +++ b/handlers/reports-get/reportName.ts @@ -1,4 +1,5 @@ import type { Request, Response } from 'express' + import papaParse from 'papaparse' import getReportData, { @@ -19,6 +20,7 @@ export default async function handler( if (rows === undefined) { response.status(404).json({ success: false, + message: 'Report Not Found' }) diff --git a/handlers/reports-get/search.js b/handlers/reports-get/search.js index 44e201ee..6142975f 100644 --- a/handlers/reports-get/search.js +++ b/handlers/reports-get/search.js @@ -8,9 +8,9 @@ export default async function handler(_request, response) { const burialSiteStatuses = await getBurialSiteStatuses(); response.render('report-search', { headTitle: 'Reports', - todayDateString: dateToString(rightNow), - cemeteries, + burialSiteStatuses, burialSiteTypes, - burialSiteStatuses + cemeteries, + todayDateString: dateToString(rightNow) }); } diff --git a/handlers/reports-get/search.ts b/handlers/reports-get/search.ts index 9526eb2b..3aec6dc7 100644 --- a/handlers/reports-get/search.ts +++ b/handlers/reports-get/search.ts @@ -1,6 +1,7 @@ -import { dateToString } from '@cityssm/utils-datetime' import type { Request, Response } from 'express' +import { dateToString } from '@cityssm/utils-datetime' + import getCemeteries from '../../database/getCemeteries.js' import { getBurialSiteStatuses, @@ -19,9 +20,10 @@ export default async function handler( response.render('report-search', { headTitle: 'Reports', - todayDateString: dateToString(rightNow), - cemeteries, + + burialSiteStatuses, burialSiteTypes, - burialSiteStatuses + cemeteries, + todayDateString: dateToString(rightNow) }) } diff --git a/handlers/workOrders-get/edit.js b/handlers/workOrders-get/edit.js index bca16425..4a6261d2 100644 --- a/handlers/workOrders-get/edit.js +++ b/handlers/workOrders-get/edit.js @@ -21,9 +21,9 @@ export default async function handler(request, response) { response.render('workOrder-edit', { headTitle: `Work Order #${workOrder.workOrderNumber}`, workOrder, + burialSiteStatuses, isCreate: false, - workOrderTypes, workOrderMilestoneTypes, - burialSiteStatuses + workOrderTypes }); } diff --git a/handlers/workOrders-get/edit.ts b/handlers/workOrders-get/edit.ts index a5142fc0..25209141 100644 --- a/handlers/workOrders-get/edit.ts +++ b/handlers/workOrders-get/edit.ts @@ -44,10 +44,12 @@ export default async function handler( response.render('workOrder-edit', { headTitle: `Work Order #${workOrder.workOrderNumber}`, + workOrder, + + burialSiteStatuses, isCreate: false, - workOrderTypes, workOrderMilestoneTypes, - burialSiteStatuses + workOrderTypes }) } diff --git a/handlers/workOrders-get/new.ts b/handlers/workOrders-get/new.ts index 1dcd73e4..6234dd35 100644 --- a/handlers/workOrders-get/new.ts +++ b/handlers/workOrders-get/new.ts @@ -1,6 +1,7 @@ -import { dateToInteger, dateToString } from '@cityssm/utils-datetime' import type { Request, Response } from 'express' +import { dateToInteger, dateToString } from '@cityssm/utils-datetime' + import { getWorkOrderTypes } from '../../helpers/functions.cache.js' import type { WorkOrder } from '../../types/recordTypes.js' @@ -19,9 +20,10 @@ export default async function handler( response.render('workOrder-edit', { headTitle: 'New Work Order', + workOrder, + isCreate: true, workOrderTypes }) } - diff --git a/handlers/workOrders-get/outlook.js b/handlers/workOrders-get/outlook.js index d3028110..24b1d6d5 100644 --- a/handlers/workOrders-get/outlook.js +++ b/handlers/workOrders-get/outlook.js @@ -4,7 +4,7 @@ export default async function handler(request, response) { const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); response.render('workOrder-outlook', { headTitle: 'Work Order Outlook Integration', - workOrderTypes, - workOrderMilestoneTypes + workOrderMilestoneTypes, + workOrderTypes }); } diff --git a/handlers/workOrders-get/outlook.ts b/handlers/workOrders-get/outlook.ts index ff6ae5ca..89b8d134 100644 --- a/handlers/workOrders-get/outlook.ts +++ b/handlers/workOrders-get/outlook.ts @@ -14,8 +14,8 @@ export default async function handler( response.render('workOrder-outlook', { headTitle: 'Work Order Outlook Integration', - workOrderTypes, - workOrderMilestoneTypes + + workOrderMilestoneTypes, + workOrderTypes }) } - diff --git a/handlers/workOrders-get/search.js b/handlers/workOrders-get/search.js index 98cdc622..56609013 100644 --- a/handlers/workOrders-get/search.js +++ b/handlers/workOrders-get/search.js @@ -4,7 +4,7 @@ export default async function handler(request, response) { const workOrderTypes = await getWorkOrderTypes(); response.render('workOrder-search', { headTitle: 'Work Order Search', - workOrderTypes, - workOrderOpenDateString + workOrderOpenDateString, + workOrderTypes }); } diff --git a/handlers/workOrders-get/search.ts b/handlers/workOrders-get/search.ts index 0714eb9c..502efdc4 100644 --- a/handlers/workOrders-get/search.ts +++ b/handlers/workOrders-get/search.ts @@ -12,8 +12,8 @@ export default async function handler( response.render('workOrder-search', { headTitle: 'Work Order Search', - workOrderTypes, - workOrderOpenDateString + + workOrderOpenDateString, + workOrderTypes }) } - diff --git a/helpers/functions.authentication.d.ts b/helpers/authentication.helpers.d.ts similarity index 100% rename from helpers/functions.authentication.d.ts rename to helpers/authentication.helpers.d.ts diff --git a/helpers/functions.authentication.js b/helpers/authentication.helpers.js similarity index 100% rename from helpers/functions.authentication.js rename to helpers/authentication.helpers.js diff --git a/helpers/functions.authentication.ts b/helpers/authentication.helpers.ts similarity index 100% rename from helpers/functions.authentication.ts rename to helpers/authentication.helpers.ts diff --git a/helpers/database.helpers.js b/helpers/database.helpers.js index 0d424c84..483df8cf 100644 --- a/helpers/database.helpers.js +++ b/helpers/database.helpers.js @@ -2,7 +2,7 @@ import fs from 'node:fs/promises'; import Debug from 'debug'; import { DEBUG_NAMESPACE } from '../debug.config.js'; import { getConfigProperty } from './config.helpers.js'; -const debug = Debug(`${DEBUG_NAMESPACE}:database.helpers`); +const debug = Debug(`${DEBUG_NAMESPACE}:database.helpers:${process.pid}`); export const useTestDatabases = getConfigProperty('application.useTestDatabases') || process.env.TEST_DATABASES === 'true'; if (useTestDatabases) { diff --git a/helpers/database.helpers.ts b/helpers/database.helpers.ts index ac206993..3e6e76df 100644 --- a/helpers/database.helpers.ts +++ b/helpers/database.helpers.ts @@ -6,7 +6,7 @@ import { DEBUG_NAMESPACE } from '../debug.config.js' import { getConfigProperty } from './config.helpers.js' -const debug = Debug(`${DEBUG_NAMESPACE}:database.helpers`) +const debug = Debug(`${DEBUG_NAMESPACE}:database.helpers:${process.pid}`) export const useTestDatabases = getConfigProperty('application.useTestDatabases') || diff --git a/package.json b/package.json index b96eec1e..0d019c83 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,12 @@ }, "scripts": { "start": "cross-env NODE_ENV=production node ./bin/www.js", - "dev:test": "cross-env NODE_ENV=dev DEBUG=sunrise:*,dynamics-gp:* TEST_DATABASES=true nodemon --inspect ./bin/www.js", - "dev:test:process": "cross-env NODE_ENV=dev DEBUG=sunrise:* TEST_DATABASES=true nodemon --inspect ./bin/wwwProcess.js", - "dev:live": "cross-env NODE_ENV=dev DEBUG=sunrise:* nodemon --inspect ./bin/www.js", + "dev:test": "cross-env NODE_ENV=dev DEBUG=sunrise:*,dynamics-gp:* TEST_DATABASES=true nodemon ./bin/www.js", + "dev:test:inspect": "cross-env NODE_ENV=dev DEBUG=sunrise:*,dynamics-gp:* TEST_DATABASES=true nodemon --inspect ./bin/www.js", + "dev:test:process": "cross-env NODE_ENV=dev DEBUG=sunrise:* TEST_DATABASES=true nodemon ./bin/wwwProcess.js", + "dev:test:process:inspect": "cross-env NODE_ENV=dev DEBUG=sunrise:* TEST_DATABASES=true nodemon --inspect ./bin/wwwProcess.js", + "dev:live": "cross-env NODE_ENV=dev DEBUG=sunrise:* nodemon ./bin/www.js", + "dev:live:inspect": "cross-env NODE_ENV=dev DEBUG=sunrise:* nodemon --inspect ./bin/www.js", "cy:open": "cypress open --config-file cypress.config.js", "cy:run": "cypress run --config-file cypress.config.js", "cy:run:firefox": "cypress run --config-file cypress.config.js --browser firefox", diff --git a/routes/login.js b/routes/login.js index 59a7583f..3848166b 100644 --- a/routes/login.js +++ b/routes/login.js @@ -1,10 +1,10 @@ import Debug from 'debug'; import { Router } from 'express'; import { DEBUG_NAMESPACE } from '../debug.config.js'; +import { authenticate, getSafeRedirectURL } from '../helpers/authentication.helpers.js'; import { getConfigProperty } from '../helpers/config.helpers.js'; import { useTestDatabases } from '../helpers/database.helpers.js'; import { getApiKey } from '../helpers/functions.api.js'; -import { authenticate, getSafeRedirectURL } from '../helpers/functions.authentication.js'; const debug = Debug(`${DEBUG_NAMESPACE}:login`); export const router = Router(); function getHandler(request, response) { diff --git a/routes/login.ts b/routes/login.ts index c21a9e5c..af829d80 100644 --- a/routes/login.ts +++ b/routes/login.ts @@ -2,13 +2,13 @@ import Debug from 'debug' import { type Request, type Response, Router } from 'express' import { DEBUG_NAMESPACE } from '../debug.config.js' -import { getConfigProperty } from '../helpers/config.helpers.js' -import { useTestDatabases } from '../helpers/database.helpers.js' -import { getApiKey } from '../helpers/functions.api.js' import { authenticate, getSafeRedirectURL -} from '../helpers/functions.authentication.js' +} from '../helpers/authentication.helpers.js' +import { getConfigProperty } from '../helpers/config.helpers.js' +import { useTestDatabases } from '../helpers/database.helpers.js' +import { getApiKey } from '../helpers/functions.api.js' const debug = Debug(`${DEBUG_NAMESPACE}:login`) @@ -40,7 +40,7 @@ async function postHandler( request: Request< unknown, unknown, - { password: string; redirect: string; userName: string; } + { password: string; redirect: string; userName: string } >, response: Response ): Promise {