linting

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

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'

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;
+    minLength?: number | string;
-    maxLength?: string | number;
+    maxLength?: number | string;
     orderNumber?: number;
 }
 export default function addBurialSiteTypeField(addForm: AddBurialSiteTypeFieldForm, user: User): Promise<number>;

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
+  minLength?: number | string
-  maxLength?: string | number
+  maxLength?: number | string
   orderNumber?: number
 }
 

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

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
 }

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<boolean>;

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

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

database/updateContract.d.ts

@@ -1,23 +1,23 @@
 import { type DateString, type TimeString } from '@cityssm/utils-datetime';
 export interface UpdateContractForm {
-    contractId: string | number;
+    contractId: number | string;
-    contractTypeId: string | number;
+    burialSiteId: number | string;
-    burialSiteId: string | number;
+    contractTypeId: number | string;
+    contractEndDateString: '' | DateString;
     contractStartDateString: DateString;
-    contractEndDateString: DateString | '';
+    funeralHomeId?: number | string;
-    funeralHomeId?: string | number;
+    committalTypeId?: number | string;
+    funeralDateString: '' | DateString;
     funeralDirectorName: string;
-    funeralDateString: DateString | '';
+    funeralTimeString: '' | TimeString;
-    funeralTimeString: TimeString | '';
-    committalTypeId?: string | number;
     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;

database/updateContract.ts

@@ -10,27 +10,31 @@ import deleteContractField from './deleteContractField.js'
 import { acquireConnection } from './pool.js'
 
 export interface UpdateContractForm {
-  contractId: string | number
+  contractId: number | string
-  contractTypeId: string | number
-  burialSiteId: string | number
 
+  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
-  funeralTimeString: TimeString | ''
-  committalTypeId?: string | number
 
   purchaserName?: string
+
   purchaserAddress1?: string
   purchaserAddress2?: string
   purchaserCity?: string
-  purchaserProvince?: string
   purchaserPostalCode?: string
-  purchaserPhoneNumber?: string
+  purchaserProvince?: string
+  
   purchaserEmail?: string
+  purchaserPhoneNumber?: string
   purchaserRelationship?: string
 
   contractTypeFieldIds?: string

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;

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

database/updateContractFeeQuantity.d.ts

@@ -1,6 +1,6 @@
 export interface UpdateBurialSiteFeeForm {
-    contractId: string | number;
+    contractId: number | string;
-    feeId: string | number;
+    feeId: number | string;
-    quantity: string | number;
+    quantity: number | string;
 }
 export default function updateContractFeeQuantity(feeQuantityForm: UpdateBurialSiteFeeForm, user: User): Promise<boolean>;

database/updateContractFeeQuantity.ts

@@ -1,9 +1,9 @@
 import { acquireConnection } from './pool.js'
 
 export interface UpdateBurialSiteFeeForm {
-  contractId: string | number
+  contractId: number | string
-  feeId: string | number
+  feeId: number | string
-  quantity: string | number
+  quantity: number | string
 }
 
 export default async function updateContractFeeQuantity(

database/updateContractInterment.d.ts

@@ -1,19 +1,19 @@
 import { type DateString } from '@cityssm/utils-datetime';
 export interface UpdateForm {
-    contractId: string | number;
+    contractId: number | string;
-    intermentNumber: string | number;
+    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<boolean>;

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
+  contractId: number | string
-  intermentNumber: string | number
+  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(

database/updateContractTransaction.d.ts

@@ -1,11 +1,11 @@
 import { type DateString, type TimeString } from '@cityssm/utils-datetime';
 export interface ContractTransactionUpdateForm {
-    contractId: string | number;
+    contractId: number | string;
-    transactionIndex: string | number;
+    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<boolean>;

database/updateContractTransaction.ts

@@ -8,12 +8,14 @@ import {
 import { acquireConnection } from './pool.js'
 
 export interface ContractTransactionUpdateForm {
-  contractId: string | number
+  contractId: number | string
-  transactionIndex: string | number
+  transactionIndex: number | string
+
   transactionDateString: DateString
   transactionTimeString: TimeString
-  transactionAmount: string | number
+
   externalReceiptNumber: string
+  transactionAmount: number | string
   transactionNote: string
 }
 

database/updateWorkOrderMilestone.js

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

database/updateWorkOrderMilestone.ts

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

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
 

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

handlers/admin-get/burialSiteTypes.ts

@@ -10,6 +10,7 @@ export default async function handler(
 
   response.render('admin-burialSiteTypes', {
     headTitle: "Burial Site Type Management",
+    
     burialSiteTypes
   })
 }

handlers/admin-get/contractTypes.js

@@ -13,9 +13,9 @@ export default async function handler(_request, response) {
         }
     }
     response.render('admin-contractTypes', {
-        headTitle: "Contract Type Management",
+        headTitle: 'Contract Type Management',
-        contractTypes,
         allContractTypeFields,
-        contractTypePrintTitles
+        contractTypePrintTitles,
+        contractTypes
     });
 }

handlers/admin-get/contractTypes.ts

@@ -27,9 +27,10 @@ export default async function handler(
   }
 
   response.render('admin-contractTypes', {
-    headTitle: "Contract Type Management",
+    headTitle: 'Contract Type Management',
-    contractTypes,
+
     allContractTypeFields,
-    contractTypePrintTitles
+    contractTypePrintTitles,
+    contractTypes
   })
 }

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
     });
 }

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

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
     });
 }

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

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

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,
 

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
     });

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

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",
+        headTitle: 'Contract Search',
-        cemeteries,
         burialSiteTypes,
+        cemeteries,
+        cemeteryId: request.query.cemeteryId,
         contractTypes,
-        funeralHomes,
+        funeralHomes
-        cemeteryId: request.query.cemeteryId
     });
 }

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",
+    headTitle: 'Contract Search',
-    cemeteries,
+
     burialSiteTypes,
+    cemeteries,
+    cemeteryId: request.query.cemeteryId,
     contractTypes,
-    funeralHomes,
+    funeralHomes
-    cemeteryId: request.query.cemeteryId
   })
 }

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

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(

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
     });
 }

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

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",
+        headTitle: 'Create a Funeral Home',
-        isCreate: true,
+        funeralHome,
-        funeralHome
+        isCreate: true
     });
 }

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",
+    headTitle: 'Create a Funeral Home',
-    isCreate: true,
+
-    funeralHome
+    funeralHome,
+    isCreate: true
   })
 }

handlers/funeralHomes-get/search.ts

@@ -10,6 +10,7 @@ export default async function handler(
 
   response.render('funeralHome-search', {
     headTitle: "Funeral Home Search",
+    
     funeralHomes
   })
 }

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
     });
 }

handlers/funeralHomes-get/view.ts

@@ -18,7 +18,7 @@ export default async function handler(
 
   response.render('funeralHome-view', {
     headTitle: funeralHome.funeralHomeName,
-    isCreate: false,
+
     funeralHome
   })
 }

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'
     })
 

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),
+        burialSiteStatuses,
-        cemeteries,
         burialSiteTypes,
-        burialSiteStatuses
+        cemeteries,
+        todayDateString: dateToString(rightNow)
     });
 }

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

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
     });
 }

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

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

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
     });
 }

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

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
     });
 }

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

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

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

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": "cross-env NODE_ENV=dev DEBUG=sunrise:*,dynamics-gp:* TEST_DATABASES=true nodemon ./bin/www.js",
-    "dev:test:process": "cross-env NODE_ENV=dev DEBUG=sunrise:* TEST_DATABASES=true nodemon --inspect ./bin/wwwProcess.js",
+    "dev:test:inspect": "cross-env NODE_ENV=dev DEBUG=sunrise:*,dynamics-gp:* TEST_DATABASES=true nodemon --inspect ./bin/www.js",
-    "dev:live": "cross-env NODE_ENV=dev DEBUG=sunrise:* 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",

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

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