code cleanup

cypress/e2e/01-admin/database.cy.ts

@@ -1,7 +1,4 @@
-/* eslint-disable unicorn/filename-case, promise/catch-or-return, promise/always-return */
-
 import { testAdmin } from '../../../test/_globals.js'
-
 import { logout, login, ajaxDelayMillis } from '../../support/index.js'
 
 describe('Admin - Database Maintenance', () => {

cypress/e2e/01-admin/feeManagement.cy.js

@@ -1,6 +1,6 @@
+import * as configFunctions from '../../../helpers/functions.config.js';
 import { testAdmin } from '../../../test/_globals.js';
 import { logout, login, ajaxDelayMillis } from '../../support/index.js';
-import * as configFunctions from '../../../helpers/functions.config.js';
 describe('Admin - Fee Management', () => {
     beforeEach('Loads page', () => {
         logout();

cypress/e2e/01-admin/feeManagement.cy.ts

@@ -1,12 +1,10 @@
-/* eslint-disable unicorn/filename-case, promise/catch-or-return, promise/always-return, @typescript-eslint/no-non-null-assertion */
+// eslint-disable-next-line eslint-comments/disable-enable-pair
-
+/* eslint-disable @typescript-eslint/no-non-null-assertion, promise/always-return, promise/catch-or-return */
-import { testAdmin } from '../../../test/_globals.js'
-
-import { logout, login, ajaxDelayMillis } from '../../support/index.js'
 
 import * as configFunctions from '../../../helpers/functions.config.js'
-
+import { testAdmin } from '../../../test/_globals.js'
-import type * as recordTypes from '../../../types/recordTypes'
+import type { Fee } from '../../../types/recordTypes.js'
+import { logout, login, ajaxDelayMillis } from '../../support/index.js'
 
 describe('Admin - Fee Management', () => {
   beforeEach('Loads page', () => {
@@ -31,7 +29,7 @@ describe('Admin - Fee Management', () => {
     cy.injectAxe()
     cy.checkA11y()
 
-    cy.fixture('fee.json').then((fee: recordTypes.Fee) => {
+    cy.fixture('fee.json').then((fee: Fee) => {
       cy.get(".modal input[name='feeCategory']").type(fee.feeCategory!)
 
       cy.get(".modal button[type='submit']").click()
@@ -53,7 +51,7 @@ describe('Admin - Fee Management', () => {
     cy.injectAxe()
     cy.checkA11y()
 
-    cy.fixture('fee.json').then((fee: recordTypes.Fee) => {
+    cy.fixture('fee.json').then((fee: Fee) => {
       cy.get(".modal input[name='feeName']").type(fee.feeName!)
 
       cy.get(".modal textarea[name='feeDescription']").type(fee.feeDescription!)

gulpfile.js

@@ -1,9 +1,9 @@
 import gulp from 'gulp';
 import changed from 'gulp-changed';
-import minify from 'gulp-minify';
 import include from 'gulp-include';
-import dartSass from 'sass';
+import minify from 'gulp-minify';
 import gulpSass from 'gulp-sass';
+import dartSass from 'sass';
 const sass = gulpSass(dartSass);
 const publicSCSSDestination = 'public/stylesheets';
 function publicSCSSFunction() {

gulpfile.ts

@@ -1,12 +1,13 @@
-/* eslint-disable node/no-unpublished-import */
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable n/no-unpublished-import */
 
 import gulp from 'gulp'
 import changed from 'gulp-changed'
-import minify from 'gulp-minify'
 import include from 'gulp-include'
-
+import minify from 'gulp-minify'
-import dartSass from 'sass'
 import gulpSass from 'gulp-sass'
+import dartSass from 'sass'
+
 const sass = gulpSass(dartSass)
 
 /*

handlers/dashboard-get/dashboard.js

@@ -1,7 +1,7 @@
 import { dateToString } from '@cityssm/utils-datetime';
+import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js';
 import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js';
 import { getWorkOrders } from '../../helpers/lotOccupancyDB/getWorkOrders.js';
-import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js';
 export async function handler(_request, response) {
     const currentDateString = dateToString(new Date());
     const workOrderMilestones = await getWorkOrderMilestones({

handlers/dashboard-get/dashboard.ts

@@ -1,10 +1,9 @@
+import { dateToString } from '@cityssm/utils-datetime'
 import type { Request, Response } from 'express'
 
-import { dateToString } from '@cityssm/utils-datetime'
+import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js'
-
 import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'
 import { getWorkOrders } from '../../helpers/lotOccupancyDB/getWorkOrders.js'
-import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js'
 
 export async function handler(
   _request: Request,

handlers/lotOccupancies-get/edit.ts

@@ -8,9 +8,7 @@ import {
   getOccupancyTypes,
   getWorkOrderTypes
 } from '../../helpers/functions.cache.js'
-
 import * as configFunctions from '../../helpers/functions.config.js'
-
 import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js'
 import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
 

handlers/lotOccupancies-get/new.js

@@ -1,8 +1,8 @@
 import { dateToInteger, dateToString } from '@cityssm/utils-datetime';
 import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js';
+import * as configFunctions from '../../helpers/functions.config.js';
 import { getLot } from '../../helpers/lotOccupancyDB/getLot.js';
 import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
-import * as configFunctions from '../../helpers/functions.config.js';
 export async function handler(request, response) {
     const startDate = new Date();
     const lotOccupancy = {

handlers/lotOccupancies-get/new.ts

@@ -1,9 +1,8 @@
-import type { Request, Response } from 'express'
-
 import {
   dateToInteger,
   dateToString
 } from '@cityssm/utils-datetime'
+import type { Request, Response } from 'express'
 
 import {
   getLotOccupantTypes,
@@ -11,13 +10,10 @@ import {
   getLotTypes,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-
+import * as configFunctions from '../../helpers/functions.config.js'
 import { getLot } from '../../helpers/lotOccupancyDB/getLot.js'
 import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
-
+import type { LotOccupancy } from '../../types/recordTypes.js'
-import * as configFunctions from '../../helpers/functions.config.js'
-
-import type * as recordTypes from '../../types/recordTypes'
 
 export async function handler(
   request: Request,
@@ -25,7 +21,7 @@ export async function handler(
 ): Promise<void> {
   const startDate = new Date()
 
-  const lotOccupancy: recordTypes.LotOccupancy = {
+  const lotOccupancy: LotOccupancy = {
     occupancyStartDate: dateToInteger(startDate),
     occupancyStartDateString: dateToString(startDate)
   }

handlers/lotOccupancies-get/search.js

@@ -1,12 +1,12 @@
+import { getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js';
 import * as configFunctions from '../../helpers/functions.config.js';
 import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
-import { getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const maps = await getMaps();
     const lotTypes = await getLotTypes();
     const occupancyTypes = await getOccupancyTypes();
     response.render('lotOccupancy-search', {
-        headTitle: configFunctions.getProperty('aliases.occupancy') + ' Search',
+        headTitle: `${configFunctions.getProperty('aliases.occupancy')} Search`,
         maps,
         lotTypes,
         occupancyTypes,

handlers/lotOccupancies-get/search.ts

@@ -1,13 +1,11 @@
 import type { Request, Response } from 'express'
 
-import * as configFunctions from '../../helpers/functions.config.js'
-
-import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
-
 import {
   getLotTypes,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
+import * as configFunctions from '../../helpers/functions.config.js'
+import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
 
 export async function handler(
   request: Request,
@@ -18,7 +16,7 @@ export async function handler(
   const occupancyTypes = await getOccupancyTypes()
 
   response.render('lotOccupancy-search', {
-    headTitle: configFunctions.getProperty('aliases.occupancy') + ' Search',
+    headTitle: `${configFunctions.getProperty('aliases.occupancy')} Search`,
     maps,
     lotTypes,
     occupancyTypes,

handlers/lotOccupancies-get/view.js

@@ -4,8 +4,7 @@ import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js
 export async function handler(request, response) {
     const lotOccupancy = await getLotOccupancy(request.params.lotOccupancyId);
     if (lotOccupancy === undefined) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/lotOccupancies/?error=lotOccupancyIdNotFound`);
-            '/lotOccupancies/?error=lotOccupancyIdNotFound');
         return;
     }
     const occupancyTypePrints = await getOccupancyTypePrintsById(lotOccupancy.occupancyTypeId);

handlers/lotOccupancies-get/view.ts

@@ -1,8 +1,7 @@
 import type { Request, Response } from 'express'
+
 import { getOccupancyTypePrintsById } from '../../helpers/functions.cache.js'
-
 import * as configFunctions from '../../helpers/functions.config.js'
-
 import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js'
 
 export async function handler(
@@ -13,8 +12,9 @@ export async function handler(
 
   if (lotOccupancy === undefined) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty(
-        '/lotOccupancies/?error=lotOccupancyIdNotFound'
+        'reverseProxy.urlPrefix'
+      )}/lotOccupancies/?error=lotOccupancyIdNotFound`
     )
     return
   }

handlers/maps-get/new.js

@@ -7,7 +7,7 @@ export async function handler(_request, response) {
     };
     const mapSVGs = await getMapSVGs();
     response.render('map-edit', {
-        headTitle: configFunctions.getProperty('aliases.map') + ' Create',
+        headTitle: `${configFunctions.getProperty('aliases.map')} Create`,
         isCreate: true,
         map,
         mapSVGs

handlers/maps-get/new.ts

@@ -16,7 +16,7 @@ export async function handler(
   const mapSVGs = await getMapSVGs()
 
   response.render('map-edit', {
-    headTitle: configFunctions.getProperty('aliases.map') + ' Create',
+    headTitle: `${configFunctions.getProperty('aliases.map')} Create`,
     isCreate: true,
     map,
     mapSVGs

handlers/maps-get/next.js

@@ -4,12 +4,9 @@ export async function handler(request, response) {
     const mapId = Number.parseInt(request.params.mapId, 10);
     const nextMapId = await getNextMapId(mapId);
     if (nextMapId === undefined) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/maps/?error=noNextMapIdFound`);
-            '/maps/?error=noNextMapIdFound');
         return;
     }
-    response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+    response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/maps/${nextMapId.toString()}`);
-        '/maps/' +
-        nextMapId.toString());
 }
 export default handler;

handlers/maps-get/next.ts

@@ -13,16 +13,17 @@ export async function handler(
 
   if (nextMapId === undefined) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty(
-        '/maps/?error=noNextMapIdFound'
+        'reverseProxy.urlPrefix'
+      )}/maps/?error=noNextMapIdFound`
     )
     return
   }
 
   response.redirect(
-    configFunctions.getProperty('reverseProxy.urlPrefix') +
+    `${configFunctions.getProperty(
-      '/maps/' +
+      'reverseProxy.urlPrefix'
-      nextMapId.toString()
+    )}/maps/${nextMapId.toString()}`
   )
 }
 

handlers/maps-get/previous.js

@@ -4,12 +4,9 @@ export async function handler(request, response) {
     const mapId = Number.parseInt(request.params.mapId, 10);
     const previousMapId = await getPreviousMapId(mapId);
     if (previousMapId === undefined) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/maps/?error=noPreviousMapIdFound`);
-            '/maps/?error=noPreviousMapIdFound');
         return;
     }
-    response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+    response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/maps/${previousMapId.toString()}`);
-        '/maps/' +
-        previousMapId.toString());
 }
 export default handler;

handlers/maps-get/previous.ts

@@ -13,16 +13,17 @@ export async function handler(
 
   if (previousMapId === undefined) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty(
-        '/maps/?error=noPreviousMapIdFound'
+        'reverseProxy.urlPrefix'
+      )}/maps/?error=noPreviousMapIdFound`
     )
     return
   }
 
   response.redirect(
-    configFunctions.getProperty('reverseProxy.urlPrefix') +
+    `${configFunctions.getProperty(
-      '/maps/' +
+      'reverseProxy.urlPrefix'
-      previousMapId.toString()
+    )}/maps/${previousMapId.toString()}`
   )
 }
 

handlers/maps-get/search.js

@@ -3,7 +3,7 @@ import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
 export async function handler(_request, response) {
     const maps = await getMaps();
     response.render('map-search', {
-        headTitle: configFunctions.getProperty('aliases.map') + ' Search',
+        headTitle: `${configFunctions.getProperty('aliases.map')} Search`,
         maps
     });
 }

handlers/maps-get/search.ts

@@ -7,7 +7,7 @@ export async function handler(_request: Request, response: Response): Promise<vo
   const maps = await getMaps()
 
   response.render('map-search', {
-    headTitle: configFunctions.getProperty('aliases.map') + ' Search',
+    headTitle: `${configFunctions.getProperty('aliases.map')} Search`,
     maps
   })
 }

handlers/maps-get/view.js

@@ -5,8 +5,7 @@ import { getMap } from '../../helpers/lotOccupancyDB/getMap.js';
 export async function handler(request, response) {
     const map = await getMap(request.params.mapId);
     if (map === undefined) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/maps/?error=mapIdNotFound`);
-            '/maps/?error=mapIdNotFound');
         return;
     }
     const lotTypeSummary = await getLotTypeSummary({

handlers/maps-get/view.ts

@@ -13,8 +13,7 @@ export async function handler(
 
   if (map === undefined) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty('reverseProxy.urlPrefix')}/maps/?error=mapIdNotFound`
-        '/maps/?error=mapIdNotFound'
     )
     return
   }

handlers/permissions.ts

@@ -1,7 +1,6 @@
 import type { Request, Response, NextFunction } from 'express'
 
 import * as configFunctions from '../helpers/functions.config.js'
-
 import * as userFunctions from '../helpers/functions.user.js'
 
 const urlPrefix = configFunctions.getProperty('reverseProxy.urlPrefix')

handlers/reports-get/reportName.js

@@ -1,14 +1,8 @@
-import { getReportData } from '../../helpers/lotOccupancyDB/getReportData.js';
 import papaparse from 'papaparse';
+import { getReportData } from '../../helpers/lotOccupancyDB/getReportData.js';
 export async function handler(request, response) {
     const reportName = request.params.reportName;
-    let rows;
+    const rows = await getReportData(reportName, request.query);
-    switch (reportName) {
-        default: {
-            rows = await getReportData(reportName, request.query);
-            break;
-        }
-    }
     if (rows === undefined) {
         response.status(404).json({
             success: false,

handlers/reports-get/reportName.ts

@@ -1,26 +1,18 @@
 import type { Request, Response } from 'express'
+import papaparse from 'papaparse'
 
 import {
   getReportData,
   type ReportParameters
 } from '../../helpers/lotOccupancyDB/getReportData.js'
 
-import papaparse from 'papaparse'
-
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const reportName = request.params.reportName
 
-  let rows: unknown[] | undefined
+  const rows = await getReportData(reportName, request.query as ReportParameters)
-
-  switch (reportName) {
-    default: {
-      rows = await getReportData(reportName, request.query as ReportParameters)
-      break
-    }
-  }
 
   if (rows === undefined) {
     response.status(404).json({

handlers/reports-get/search.js

@@ -1,6 +1,6 @@
 import * as dateTimeFunctions from '@cityssm/utils-datetime';
-import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
 import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js';
+import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
 export async function handler(_request, response) {
     const rightNow = new Date();
     const maps = await getMaps();

handlers/reports-get/search.ts

@@ -1,9 +1,8 @@
+import * as dateTimeFunctions from '@cityssm/utils-datetime'
 import type { Request, Response } from 'express'
 
-import * as dateTimeFunctions from '@cityssm/utils-datetime'
-
-import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
 import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js'
+import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
 
 export async function handler(_request: Request, response: Response): Promise<void> {
   const rightNow = new Date()

handlers/workOrders-get/edit.js

@@ -8,15 +8,11 @@ export async function handler(request, response) {
         includeMilestones: true
     });
     if (workOrder === undefined) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/workOrders/?error=workOrderIdNotFound`);
-            '/workOrders/?error=workOrderIdNotFound');
         return;
     }
     if (workOrder.workOrderCloseDate) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/workOrders/${workOrder.workOrderId.toString()}/?error=workOrderIsClosed`);
-            '/workOrders/' +
-            workOrder.workOrderId.toString() +
-            '/?error=workOrderIsClosed');
         return;
     }
     const workOrderTypes = await getWorkOrderTypes();

handlers/workOrders-get/edit.ts

@@ -20,18 +20,18 @@ export async function handler(
 
   if (workOrder === undefined) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty(
-        '/workOrders/?error=workOrderIdNotFound'
+        'reverseProxy.urlPrefix'
+      )}/workOrders/?error=workOrderIdNotFound`
     )
     return
   }
 
   if (workOrder.workOrderCloseDate) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty(
-        '/workOrders/' +
+        'reverseProxy.urlPrefix'
-        workOrder.workOrderId!.toString() +
+      )}/workOrders/${workOrder.workOrderId!.toString()}/?error=workOrderIsClosed`
-        '/?error=workOrderIsClosed'
     )
     return
   }

handlers/workOrders-get/view.js

@@ -7,8 +7,7 @@ export async function handler(request, response) {
         includeMilestones: true
     });
     if (workOrder === undefined) {
-        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/workOrders/?error=workOrderIdNotFound`);
-            '/workOrders/?error=workOrderIdNotFound');
         return;
     }
     response.render('workOrder-view', {

handlers/workOrders-get/view.ts

@@ -1,7 +1,6 @@
 import type { Request, Response } from 'express'
 
 import * as configFunctions from '../../helpers/functions.config.js'
-
 import { getWorkOrder } from '../../helpers/lotOccupancyDB/getWorkOrder.js'
 
 export async function handler(
@@ -16,8 +15,9 @@ export async function handler(
 
   if (workOrder === undefined) {
     response.redirect(
-      configFunctions.getProperty('reverseProxy.urlPrefix') +
+      `${configFunctions.getProperty(
-        '/workOrders/?error=workOrderIdNotFound'
+        'reverseProxy.urlPrefix'
+      )}/workOrders/?error=workOrderIdNotFound`
     )
     return
   }

routes/admin.js

@@ -1,66 +1,66 @@
 import { Router } from 'express';
-import handler_fees from '../handlers/admin-get/fees.js';
-import handler_doAddFeeCategory from '../handlers/admin-post/doAddFeeCategory.js';
-import handler_doUpdateFeeCategory from '../handlers/admin-post/doUpdateFeeCategory.js';
-import handler_doMoveFeeCategoryUp from '../handlers/admin-post/doMoveFeeCategoryUp.js';
-import handler_doMoveFeeCategoryDown from '../handlers/admin-post/doMoveFeeCategoryDown.js';
-import handler_doDeleteFeeCategory from '../handlers/admin-post/doDeleteFeeCategory.js';
-import handler_doAddFee from '../handlers/admin-post/doAddFee.js';
-import handler_doUpdateFee from '../handlers/admin-post/doUpdateFee.js';
-import handler_doMoveFeeUp from '../handlers/admin-post/doMoveFeeUp.js';
-import handler_doMoveFeeDown from '../handlers/admin-post/doMoveFeeDown.js';
-import handler_doDeleteFee from '../handlers/admin-post/doDeleteFee.js';
-import handler_occupancyTypes from '../handlers/admin-get/occupancyTypes.js';
-import handler_doAddOccupancyType from '../handlers/admin-post/doAddOccupancyType.js';
-import handler_doUpdateOccupancyType from '../handlers/admin-post/doUpdateOccupancyType.js';
-import handler_doMoveOccupancyTypeUp from '../handlers/admin-post/doMoveOccupancyTypeUp.js';
-import handler_doMoveOccupancyTypeDown from '../handlers/admin-post/doMoveOccupancyTypeDown.js';
-import handler_doDeleteOccupancyType from '../handlers/admin-post/doDeleteOccupancyType.js';
-import handler_doAddOccupancyTypeField from '../handlers/admin-post/doAddOccupancyTypeField.js';
-import handler_doUpdateOccupancyTypeField from '../handlers/admin-post/doUpdateOccupancyTypeField.js';
-import handler_doMoveOccupancyTypeFieldUp from '../handlers/admin-post/doMoveOccupancyTypeFieldUp.js';
-import handler_doMoveOccupancyTypeFieldDown from '../handlers/admin-post/doMoveOccupancyTypeFieldDown.js';
-import handler_doDeleteOccupancyTypeField from '../handlers/admin-post/doDeleteOccupancyTypeField.js';
-import handler_doAddOccupancyTypePrint from '../handlers/admin-post/doAddOccupancyTypePrint.js';
-import handler_doMoveOccupancyTypePrintUp from '../handlers/admin-post/doMoveOccupancyTypePrintUp.js';
-import handler_doMoveOccupancyTypePrintDown from '../handlers/admin-post/doMoveOccupancyTypePrintDown.js';
-import handler_doDeleteOccupancyTypePrint from '../handlers/admin-post/doDeleteOccupancyTypePrint.js';
-import handler_lotTypes from '../handlers/admin-get/lotTypes.js';
-import handler_doAddLotType from '../handlers/admin-post/doAddLotType.js';
-import handler_doUpdateLotType from '../handlers/admin-post/doUpdateLotType.js';
-import handler_doMoveLotTypeUp from '../handlers/admin-post/doMoveLotTypeUp.js';
-import handler_doMoveLotTypeDown from '../handlers/admin-post/doMoveLotTypeDown.js';
-import handler_doDeleteLotType from '../handlers/admin-post/doDeleteLotType.js';
-import handler_doAddLotTypeField from '../handlers/admin-post/doAddLotTypeField.js';
-import handler_doUpdateLotTypeField from '../handlers/admin-post/doUpdateLotTypeField.js';
-import handler_doMoveLotTypeFieldUp from '../handlers/admin-post/doMoveLotTypeFieldUp.js';
-import handler_doMoveLotTypeFieldDown from '../handlers/admin-post/doMoveLotTypeFieldDown.js';
-import handler_doDeleteLotTypeField from '../handlers/admin-post/doDeleteLotTypeField.js';
-import handler_tables from '../handlers/admin-get/tables.js';
-import handler_doAddWorkOrderType from '../handlers/admin-post/doAddWorkOrderType.js';
-import handler_doUpdateWorkOrderType from '../handlers/admin-post/doUpdateWorkOrderType.js';
-import handler_doMoveWorkOrderTypeUp from '../handlers/admin-post/doMoveWorkOrderTypeUp.js';
-import handler_doMoveWorkOrderTypeDown from '../handlers/admin-post/doMoveWorkOrderTypeDown.js';
-import handler_doDeleteWorkOrderType from '../handlers/admin-post/doDeleteWorkOrderType.js';
-import handler_doAddWorkOrderMilestoneType from '../handlers/admin-post/doAddWorkOrderMilestoneType.js';
-import handler_doUpdateWorkOrderMilestoneType from '../handlers/admin-post/doUpdateWorkOrderMilestoneType.js';
-import handler_doMoveWorkOrderMilestoneTypeUp from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js';
-import handler_doMoveWorkOrderMilestoneTypeDown from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js';
-import handler_doDeleteWorkOrderMilestoneType from '../handlers/admin-post/doDeleteWorkOrderMilestoneType.js';
-import handler_doAddLotStatus from '../handlers/admin-post/doAddLotStatus.js';
-import handler_doUpdateLotStatus from '../handlers/admin-post/doUpdateLotStatus.js';
-import handler_doMoveLotStatusUp from '../handlers/admin-post/doMoveLotStatusUp.js';
-import handler_doMoveLotStatusDown from '../handlers/admin-post/doMoveLotStatusDown.js';
-import handler_doDeleteLotStatus from '../handlers/admin-post/doDeleteLotStatus.js';
-import handler_doAddLotOccupantType from '../handlers/admin-post/doAddLotOccupantType.js';
-import handler_doUpdateLotOccupantType from '../handlers/admin-post/doUpdateLotOccupantType.js';
-import handler_doMoveLotOccupantTypeUp from '../handlers/admin-post/doMoveLotOccupantTypeUp.js';
-import handler_doMoveLotOccupantTypeDown from '../handlers/admin-post/doMoveLotOccupantTypeDown.js';
-import handler_doDeleteLotOccupantType from '../handlers/admin-post/doDeleteLotOccupantType.js';
 import handler_database from '../handlers/admin-get/database.js';
+import handler_fees from '../handlers/admin-get/fees.js';
+import handler_lotTypes from '../handlers/admin-get/lotTypes.js';
+import handler_ntfyStartup from '../handlers/admin-get/ntfyStartup.js';
+import handler_occupancyTypes from '../handlers/admin-get/occupancyTypes.js';
+import handler_tables from '../handlers/admin-get/tables.js';
+import handler_doAddFee from '../handlers/admin-post/doAddFee.js';
+import handler_doAddFeeCategory from '../handlers/admin-post/doAddFeeCategory.js';
+import handler_doAddLotOccupantType from '../handlers/admin-post/doAddLotOccupantType.js';
+import handler_doAddLotStatus from '../handlers/admin-post/doAddLotStatus.js';
+import handler_doAddLotType from '../handlers/admin-post/doAddLotType.js';
+import handler_doAddLotTypeField from '../handlers/admin-post/doAddLotTypeField.js';
+import handler_doAddOccupancyType from '../handlers/admin-post/doAddOccupancyType.js';
+import handler_doAddOccupancyTypeField from '../handlers/admin-post/doAddOccupancyTypeField.js';
+import handler_doAddOccupancyTypePrint from '../handlers/admin-post/doAddOccupancyTypePrint.js';
+import handler_doAddWorkOrderMilestoneType from '../handlers/admin-post/doAddWorkOrderMilestoneType.js';
+import handler_doAddWorkOrderType from '../handlers/admin-post/doAddWorkOrderType.js';
 import handler_doBackupDatabase from '../handlers/admin-post/doBackupDatabase.js';
 import handler_doCleanupDatabase from '../handlers/admin-post/doCleanupDatabase.js';
-import handler_ntfyStartup from '../handlers/admin-get/ntfyStartup.js';
+import handler_doDeleteFee from '../handlers/admin-post/doDeleteFee.js';
+import handler_doDeleteFeeCategory from '../handlers/admin-post/doDeleteFeeCategory.js';
+import handler_doDeleteLotOccupantType from '../handlers/admin-post/doDeleteLotOccupantType.js';
+import handler_doDeleteLotStatus from '../handlers/admin-post/doDeleteLotStatus.js';
+import handler_doDeleteLotType from '../handlers/admin-post/doDeleteLotType.js';
+import handler_doDeleteLotTypeField from '../handlers/admin-post/doDeleteLotTypeField.js';
+import handler_doDeleteOccupancyType from '../handlers/admin-post/doDeleteOccupancyType.js';
+import handler_doDeleteOccupancyTypeField from '../handlers/admin-post/doDeleteOccupancyTypeField.js';
+import handler_doDeleteOccupancyTypePrint from '../handlers/admin-post/doDeleteOccupancyTypePrint.js';
+import handler_doDeleteWorkOrderMilestoneType from '../handlers/admin-post/doDeleteWorkOrderMilestoneType.js';
+import handler_doDeleteWorkOrderType from '../handlers/admin-post/doDeleteWorkOrderType.js';
+import handler_doMoveFeeCategoryDown from '../handlers/admin-post/doMoveFeeCategoryDown.js';
+import handler_doMoveFeeCategoryUp from '../handlers/admin-post/doMoveFeeCategoryUp.js';
+import handler_doMoveFeeDown from '../handlers/admin-post/doMoveFeeDown.js';
+import handler_doMoveFeeUp from '../handlers/admin-post/doMoveFeeUp.js';
+import handler_doMoveLotOccupantTypeDown from '../handlers/admin-post/doMoveLotOccupantTypeDown.js';
+import handler_doMoveLotOccupantTypeUp from '../handlers/admin-post/doMoveLotOccupantTypeUp.js';
+import handler_doMoveLotStatusDown from '../handlers/admin-post/doMoveLotStatusDown.js';
+import handler_doMoveLotStatusUp from '../handlers/admin-post/doMoveLotStatusUp.js';
+import handler_doMoveLotTypeDown from '../handlers/admin-post/doMoveLotTypeDown.js';
+import handler_doMoveLotTypeFieldDown from '../handlers/admin-post/doMoveLotTypeFieldDown.js';
+import handler_doMoveLotTypeFieldUp from '../handlers/admin-post/doMoveLotTypeFieldUp.js';
+import handler_doMoveLotTypeUp from '../handlers/admin-post/doMoveLotTypeUp.js';
+import handler_doMoveOccupancyTypeDown from '../handlers/admin-post/doMoveOccupancyTypeDown.js';
+import handler_doMoveOccupancyTypeFieldDown from '../handlers/admin-post/doMoveOccupancyTypeFieldDown.js';
+import handler_doMoveOccupancyTypeFieldUp from '../handlers/admin-post/doMoveOccupancyTypeFieldUp.js';
+import handler_doMoveOccupancyTypePrintDown from '../handlers/admin-post/doMoveOccupancyTypePrintDown.js';
+import handler_doMoveOccupancyTypePrintUp from '../handlers/admin-post/doMoveOccupancyTypePrintUp.js';
+import handler_doMoveOccupancyTypeUp from '../handlers/admin-post/doMoveOccupancyTypeUp.js';
+import handler_doMoveWorkOrderMilestoneTypeDown from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js';
+import handler_doMoveWorkOrderMilestoneTypeUp from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js';
+import handler_doMoveWorkOrderTypeDown from '../handlers/admin-post/doMoveWorkOrderTypeDown.js';
+import handler_doMoveWorkOrderTypeUp from '../handlers/admin-post/doMoveWorkOrderTypeUp.js';
+import handler_doUpdateFee from '../handlers/admin-post/doUpdateFee.js';
+import handler_doUpdateFeeCategory from '../handlers/admin-post/doUpdateFeeCategory.js';
+import handler_doUpdateLotOccupantType from '../handlers/admin-post/doUpdateLotOccupantType.js';
+import handler_doUpdateLotStatus from '../handlers/admin-post/doUpdateLotStatus.js';
+import handler_doUpdateLotType from '../handlers/admin-post/doUpdateLotType.js';
+import handler_doUpdateLotTypeField from '../handlers/admin-post/doUpdateLotTypeField.js';
+import handler_doUpdateOccupancyType from '../handlers/admin-post/doUpdateOccupancyType.js';
+import handler_doUpdateOccupancyTypeField from '../handlers/admin-post/doUpdateOccupancyTypeField.js';
+import handler_doUpdateWorkOrderMilestoneType from '../handlers/admin-post/doUpdateWorkOrderMilestoneType.js';
+import handler_doUpdateWorkOrderType from '../handlers/admin-post/doUpdateWorkOrderType.js';
 export const router = Router();
 router.get('/fees', handler_fees);
 router.post('/doAddFeeCategory', handler_doAddFeeCategory);

routes/admin.ts

@@ -1,96 +1,70 @@
 import { Router, type RequestHandler } from 'express'
 
-// Fee Management
-
-import handler_fees from '../handlers/admin-get/fees.js'
-
-import handler_doAddFeeCategory from '../handlers/admin-post/doAddFeeCategory.js'
-import handler_doUpdateFeeCategory from '../handlers/admin-post/doUpdateFeeCategory.js'
-import handler_doMoveFeeCategoryUp from '../handlers/admin-post/doMoveFeeCategoryUp.js'
-import handler_doMoveFeeCategoryDown from '../handlers/admin-post/doMoveFeeCategoryDown.js'
-import handler_doDeleteFeeCategory from '../handlers/admin-post/doDeleteFeeCategory.js'
-
-import handler_doAddFee from '../handlers/admin-post/doAddFee.js'
-import handler_doUpdateFee from '../handlers/admin-post/doUpdateFee.js'
-import handler_doMoveFeeUp from '../handlers/admin-post/doMoveFeeUp.js'
-import handler_doMoveFeeDown from '../handlers/admin-post/doMoveFeeDown.js'
-import handler_doDeleteFee from '../handlers/admin-post/doDeleteFee.js'
-
-// Occupancy Type Management
-
-import handler_occupancyTypes from '../handlers/admin-get/occupancyTypes.js'
-
-import handler_doAddOccupancyType from '../handlers/admin-post/doAddOccupancyType.js'
-import handler_doUpdateOccupancyType from '../handlers/admin-post/doUpdateOccupancyType.js'
-import handler_doMoveOccupancyTypeUp from '../handlers/admin-post/doMoveOccupancyTypeUp.js'
-import handler_doMoveOccupancyTypeDown from '../handlers/admin-post/doMoveOccupancyTypeDown.js'
-import handler_doDeleteOccupancyType from '../handlers/admin-post/doDeleteOccupancyType.js'
-
-import handler_doAddOccupancyTypeField from '../handlers/admin-post/doAddOccupancyTypeField.js'
-import handler_doUpdateOccupancyTypeField from '../handlers/admin-post/doUpdateOccupancyTypeField.js'
-import handler_doMoveOccupancyTypeFieldUp from '../handlers/admin-post/doMoveOccupancyTypeFieldUp.js'
-import handler_doMoveOccupancyTypeFieldDown from '../handlers/admin-post/doMoveOccupancyTypeFieldDown.js'
-import handler_doDeleteOccupancyTypeField from '../handlers/admin-post/doDeleteOccupancyTypeField.js'
-
-import handler_doAddOccupancyTypePrint from '../handlers/admin-post/doAddOccupancyTypePrint.js'
-import handler_doMoveOccupancyTypePrintUp from '../handlers/admin-post/doMoveOccupancyTypePrintUp.js'
-import handler_doMoveOccupancyTypePrintDown from '../handlers/admin-post/doMoveOccupancyTypePrintDown.js'
-import handler_doDeleteOccupancyTypePrint from '../handlers/admin-post/doDeleteOccupancyTypePrint.js'
-
-// Lot Type Management
-
-import handler_lotTypes from '../handlers/admin-get/lotTypes.js'
-
-import handler_doAddLotType from '../handlers/admin-post/doAddLotType.js'
-import handler_doUpdateLotType from '../handlers/admin-post/doUpdateLotType.js'
-import handler_doMoveLotTypeUp from '../handlers/admin-post/doMoveLotTypeUp.js'
-import handler_doMoveLotTypeDown from '../handlers/admin-post/doMoveLotTypeDown.js'
-import handler_doDeleteLotType from '../handlers/admin-post/doDeleteLotType.js'
-
-import handler_doAddLotTypeField from '../handlers/admin-post/doAddLotTypeField.js'
-import handler_doUpdateLotTypeField from '../handlers/admin-post/doUpdateLotTypeField.js'
-import handler_doMoveLotTypeFieldUp from '../handlers/admin-post/doMoveLotTypeFieldUp.js'
-import handler_doMoveLotTypeFieldDown from '../handlers/admin-post/doMoveLotTypeFieldDown.js'
-import handler_doDeleteLotTypeField from '../handlers/admin-post/doDeleteLotTypeField.js'
-
-// Config Table Management
-
-import handler_tables from '../handlers/admin-get/tables.js'
-
-import handler_doAddWorkOrderType from '../handlers/admin-post/doAddWorkOrderType.js'
-import handler_doUpdateWorkOrderType from '../handlers/admin-post/doUpdateWorkOrderType.js'
-import handler_doMoveWorkOrderTypeUp from '../handlers/admin-post/doMoveWorkOrderTypeUp.js'
-import handler_doMoveWorkOrderTypeDown from '../handlers/admin-post/doMoveWorkOrderTypeDown.js'
-import handler_doDeleteWorkOrderType from '../handlers/admin-post/doDeleteWorkOrderType.js'
-
-import handler_doAddWorkOrderMilestoneType from '../handlers/admin-post/doAddWorkOrderMilestoneType.js'
-import handler_doUpdateWorkOrderMilestoneType from '../handlers/admin-post/doUpdateWorkOrderMilestoneType.js'
-import handler_doMoveWorkOrderMilestoneTypeUp from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js'
-import handler_doMoveWorkOrderMilestoneTypeDown from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js'
-import handler_doDeleteWorkOrderMilestoneType from '../handlers/admin-post/doDeleteWorkOrderMilestoneType.js'
-
-import handler_doAddLotStatus from '../handlers/admin-post/doAddLotStatus.js'
-import handler_doUpdateLotStatus from '../handlers/admin-post/doUpdateLotStatus.js'
-import handler_doMoveLotStatusUp from '../handlers/admin-post/doMoveLotStatusUp.js'
-import handler_doMoveLotStatusDown from '../handlers/admin-post/doMoveLotStatusDown.js'
-import handler_doDeleteLotStatus from '../handlers/admin-post/doDeleteLotStatus.js'
-
-import handler_doAddLotOccupantType from '../handlers/admin-post/doAddLotOccupantType.js'
-import handler_doUpdateLotOccupantType from '../handlers/admin-post/doUpdateLotOccupantType.js'
-import handler_doMoveLotOccupantTypeUp from '../handlers/admin-post/doMoveLotOccupantTypeUp.js'
-import handler_doMoveLotOccupantTypeDown from '../handlers/admin-post/doMoveLotOccupantTypeDown.js'
-import handler_doDeleteLotOccupantType from '../handlers/admin-post/doDeleteLotOccupantType.js'
-
-// Database Maintenance
-
 import handler_database from '../handlers/admin-get/database.js'
+import handler_fees from '../handlers/admin-get/fees.js'
+import handler_lotTypes from '../handlers/admin-get/lotTypes.js'
+import handler_ntfyStartup from '../handlers/admin-get/ntfyStartup.js'
+import handler_occupancyTypes from '../handlers/admin-get/occupancyTypes.js'
+import handler_tables from '../handlers/admin-get/tables.js'
+import handler_doAddFee from '../handlers/admin-post/doAddFee.js'
+import handler_doAddFeeCategory from '../handlers/admin-post/doAddFeeCategory.js'
+import handler_doAddLotOccupantType from '../handlers/admin-post/doAddLotOccupantType.js'
+import handler_doAddLotStatus from '../handlers/admin-post/doAddLotStatus.js'
+import handler_doAddLotType from '../handlers/admin-post/doAddLotType.js'
+import handler_doAddLotTypeField from '../handlers/admin-post/doAddLotTypeField.js'
+import handler_doAddOccupancyType from '../handlers/admin-post/doAddOccupancyType.js'
+import handler_doAddOccupancyTypeField from '../handlers/admin-post/doAddOccupancyTypeField.js'
+import handler_doAddOccupancyTypePrint from '../handlers/admin-post/doAddOccupancyTypePrint.js'
+import handler_doAddWorkOrderMilestoneType from '../handlers/admin-post/doAddWorkOrderMilestoneType.js'
+import handler_doAddWorkOrderType from '../handlers/admin-post/doAddWorkOrderType.js'
 import handler_doBackupDatabase from '../handlers/admin-post/doBackupDatabase.js'
 import handler_doCleanupDatabase from '../handlers/admin-post/doCleanupDatabase.js'
+import handler_doDeleteFee from '../handlers/admin-post/doDeleteFee.js'
+import handler_doDeleteFeeCategory from '../handlers/admin-post/doDeleteFeeCategory.js'
+import handler_doDeleteLotOccupantType from '../handlers/admin-post/doDeleteLotOccupantType.js'
+import handler_doDeleteLotStatus from '../handlers/admin-post/doDeleteLotStatus.js'
+import handler_doDeleteLotType from '../handlers/admin-post/doDeleteLotType.js'
+import handler_doDeleteLotTypeField from '../handlers/admin-post/doDeleteLotTypeField.js'
+import handler_doDeleteOccupancyType from '../handlers/admin-post/doDeleteOccupancyType.js'
+import handler_doDeleteOccupancyTypeField from '../handlers/admin-post/doDeleteOccupancyTypeField.js'
+import handler_doDeleteOccupancyTypePrint from '../handlers/admin-post/doDeleteOccupancyTypePrint.js'
+import handler_doDeleteWorkOrderMilestoneType from '../handlers/admin-post/doDeleteWorkOrderMilestoneType.js'
+import handler_doDeleteWorkOrderType from '../handlers/admin-post/doDeleteWorkOrderType.js'
+import handler_doMoveFeeCategoryDown from '../handlers/admin-post/doMoveFeeCategoryDown.js'
+import handler_doMoveFeeCategoryUp from '../handlers/admin-post/doMoveFeeCategoryUp.js'
+import handler_doMoveFeeDown from '../handlers/admin-post/doMoveFeeDown.js'
+import handler_doMoveFeeUp from '../handlers/admin-post/doMoveFeeUp.js'
+import handler_doMoveLotOccupantTypeDown from '../handlers/admin-post/doMoveLotOccupantTypeDown.js'
+import handler_doMoveLotOccupantTypeUp from '../handlers/admin-post/doMoveLotOccupantTypeUp.js'
+import handler_doMoveLotStatusDown from '../handlers/admin-post/doMoveLotStatusDown.js'
+import handler_doMoveLotStatusUp from '../handlers/admin-post/doMoveLotStatusUp.js'
+import handler_doMoveLotTypeDown from '../handlers/admin-post/doMoveLotTypeDown.js'
+import handler_doMoveLotTypeFieldDown from '../handlers/admin-post/doMoveLotTypeFieldDown.js'
+import handler_doMoveLotTypeFieldUp from '../handlers/admin-post/doMoveLotTypeFieldUp.js'
+import handler_doMoveLotTypeUp from '../handlers/admin-post/doMoveLotTypeUp.js'
+import handler_doMoveOccupancyTypeDown from '../handlers/admin-post/doMoveOccupancyTypeDown.js'
+import handler_doMoveOccupancyTypeFieldDown from '../handlers/admin-post/doMoveOccupancyTypeFieldDown.js'
+import handler_doMoveOccupancyTypeFieldUp from '../handlers/admin-post/doMoveOccupancyTypeFieldUp.js'
+import handler_doMoveOccupancyTypePrintDown from '../handlers/admin-post/doMoveOccupancyTypePrintDown.js'
+import handler_doMoveOccupancyTypePrintUp from '../handlers/admin-post/doMoveOccupancyTypePrintUp.js'
+import handler_doMoveOccupancyTypeUp from '../handlers/admin-post/doMoveOccupancyTypeUp.js'
+import handler_doMoveWorkOrderMilestoneTypeDown from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js'
+import handler_doMoveWorkOrderMilestoneTypeUp from '../handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js'
+import handler_doMoveWorkOrderTypeDown from '../handlers/admin-post/doMoveWorkOrderTypeDown.js'
+import handler_doMoveWorkOrderTypeUp from '../handlers/admin-post/doMoveWorkOrderTypeUp.js'
+import handler_doUpdateFee from '../handlers/admin-post/doUpdateFee.js'
+import handler_doUpdateFeeCategory from '../handlers/admin-post/doUpdateFeeCategory.js'
+import handler_doUpdateLotOccupantType from '../handlers/admin-post/doUpdateLotOccupantType.js'
+import handler_doUpdateLotStatus from '../handlers/admin-post/doUpdateLotStatus.js'
+import handler_doUpdateLotType from '../handlers/admin-post/doUpdateLotType.js'
+import handler_doUpdateLotTypeField from '../handlers/admin-post/doUpdateLotTypeField.js'
+import handler_doUpdateOccupancyType from '../handlers/admin-post/doUpdateOccupancyType.js'
+import handler_doUpdateOccupancyTypeField from '../handlers/admin-post/doUpdateOccupancyTypeField.js'
+import handler_doUpdateWorkOrderMilestoneType from '../handlers/admin-post/doUpdateWorkOrderMilestoneType.js'
+import handler_doUpdateWorkOrderType from '../handlers/admin-post/doUpdateWorkOrderType.js'
 
 // Ntfy Startup
 
-import handler_ntfyStartup from '../handlers/admin-get/ntfyStartup.js'
-
 export const router = Router()
 
 /*

routes/login.js

@@ -28,7 +28,7 @@ async function postHandler(request, response) {
     const unsafeRedirectURL = request.body.redirect;
     const redirectURL = authenticationFunctions.getSafeRedirectURL(typeof unsafeRedirectURL === 'string' ? unsafeRedirectURL : '');
     let isAuthenticated = false;
-    if (userName.charAt(0) === '*') {
+    if (userName.startsWith('*')) {
         if (useTestDatabases && userName === passwordPlain) {
             isAuthenticated = configFunctions
                 .getProperty('users.testing')

routes/login.ts

@@ -57,7 +57,7 @@ async function postHandler(
 
   let isAuthenticated = false
 
-  if (userName.charAt(0) === '*') {
+  if (userName.startsWith('*')) {
     if (useTestDatabases && userName === passwordPlain) {
       isAuthenticated = configFunctions
         .getProperty('users.testing')

routes/lotOccupancies.js

@@ -1,29 +1,29 @@
 import { Router } from 'express';
-import handler_search from '../handlers/lotOccupancies-get/search.js';
-import handler_doSearchLotOccupancies from '../handlers/lotOccupancies-post/doSearchLotOccupancies.js';
-import handler_view from '../handlers/lotOccupancies-get/view.js';
-import handler_new from '../handlers/lotOccupancies-get/new.js';
-import handler_doGetOccupancyTypeFields from '../handlers/lotOccupancies-post/doGetOccupancyTypeFields.js';
-import handler_doCreateLotOccupancy from '../handlers/lotOccupancies-post/doCreateLotOccupancy.js';
 import handler_edit from '../handlers/lotOccupancies-get/edit.js';
-import handler_doUpdateLotOccupancy from '../handlers/lotOccupancies-post/doUpdateLotOccupancy.js';
+import handler_new from '../handlers/lotOccupancies-get/new.js';
-import handler_doCopyLotOccupancy from '../handlers/lotOccupancies-post/doCopyLotOccupancy.js';
+import handler_search from '../handlers/lotOccupancies-get/search.js';
-import handler_doDeleteLotOccupancy from '../handlers/lotOccupancies-post/doDeleteLotOccupancy.js';
+import handler_view from '../handlers/lotOccupancies-get/view.js';
-import handler_doSearchPastOccupants from '../handlers/lotOccupancies-post/doSearchPastOccupants.js';
-import handler_doAddLotOccupancyOccupant from '../handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js';
-import handler_doUpdateLotOccupancyOccupant from '../handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js';
-import handler_doDeleteLotOccupancyOccupant from '../handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js';
 import handler_doAddLotOccupancyComment from '../handlers/lotOccupancies-post/doAddLotOccupancyComment.js';
-import handler_doUpdateLotOccupancyComment from '../handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js';
-import handler_doDeleteLotOccupancyComment from '../handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js';
-import handler_doGetFees from '../handlers/lotOccupancies-post/doGetFees.js';
 import handler_doAddLotOccupancyFee from '../handlers/lotOccupancies-post/doAddLotOccupancyFee.js';
-import handler_doUpdateLotOccupancyFeeQuantity from '../handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js';
+import handler_doAddLotOccupancyOccupant from '../handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js';
-import handler_doDeleteLotOccupancyFee from '../handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js';
-import handler_doGetDynamicsGPDocument from '../handlers/lotOccupancies-post/doGetDynamicsGPDocument.js';
 import handler_doAddLotOccupancyTransaction from '../handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js';
-import handler_doUpdateLotOccupancyTransaction from '../handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js';
+import handler_doCopyLotOccupancy from '../handlers/lotOccupancies-post/doCopyLotOccupancy.js';
+import handler_doCreateLotOccupancy from '../handlers/lotOccupancies-post/doCreateLotOccupancy.js';
+import handler_doDeleteLotOccupancy from '../handlers/lotOccupancies-post/doDeleteLotOccupancy.js';
+import handler_doDeleteLotOccupancyComment from '../handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js';
+import handler_doDeleteLotOccupancyFee from '../handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js';
+import handler_doDeleteLotOccupancyOccupant from '../handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js';
 import handler_doDeleteLotOccupancyTransaction from '../handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js';
+import handler_doGetDynamicsGPDocument from '../handlers/lotOccupancies-post/doGetDynamicsGPDocument.js';
+import handler_doGetFees from '../handlers/lotOccupancies-post/doGetFees.js';
+import handler_doGetOccupancyTypeFields from '../handlers/lotOccupancies-post/doGetOccupancyTypeFields.js';
+import handler_doSearchLotOccupancies from '../handlers/lotOccupancies-post/doSearchLotOccupancies.js';
+import handler_doSearchPastOccupants from '../handlers/lotOccupancies-post/doSearchPastOccupants.js';
+import handler_doUpdateLotOccupancy from '../handlers/lotOccupancies-post/doUpdateLotOccupancy.js';
+import handler_doUpdateLotOccupancyComment from '../handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js';
+import handler_doUpdateLotOccupancyFeeQuantity from '../handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js';
+import handler_doUpdateLotOccupancyOccupant from '../handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js';
+import handler_doUpdateLotOccupancyTransaction from '../handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js';
 import * as permissionHandlers from '../handlers/permissions.js';
 import * as configFunctions from '../helpers/functions.config.js';
 export const router = Router();

routes/lotOccupancies.ts

@@ -1,40 +1,31 @@
 import { type RequestHandler, Router } from 'express'
 
-import handler_search from '../handlers/lotOccupancies-get/search.js'
-import handler_doSearchLotOccupancies from '../handlers/lotOccupancies-post/doSearchLotOccupancies.js'
-
-import handler_view from '../handlers/lotOccupancies-get/view.js'
-
-import handler_new from '../handlers/lotOccupancies-get/new.js'
-import handler_doGetOccupancyTypeFields from '../handlers/lotOccupancies-post/doGetOccupancyTypeFields.js'
-import handler_doCreateLotOccupancy from '../handlers/lotOccupancies-post/doCreateLotOccupancy.js'
-
 import handler_edit from '../handlers/lotOccupancies-get/edit.js'
-import handler_doUpdateLotOccupancy from '../handlers/lotOccupancies-post/doUpdateLotOccupancy.js'
+import handler_new from '../handlers/lotOccupancies-get/new.js'
-import handler_doCopyLotOccupancy from '../handlers/lotOccupancies-post/doCopyLotOccupancy.js'
+import handler_search from '../handlers/lotOccupancies-get/search.js'
-import handler_doDeleteLotOccupancy from '../handlers/lotOccupancies-post/doDeleteLotOccupancy.js'
+import handler_view from '../handlers/lotOccupancies-get/view.js'
-
-import handler_doSearchPastOccupants from '../handlers/lotOccupancies-post/doSearchPastOccupants.js'
-import handler_doAddLotOccupancyOccupant from '../handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js'
-import handler_doUpdateLotOccupancyOccupant from '../handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js'
-import handler_doDeleteLotOccupancyOccupant from '../handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js'
-
 import handler_doAddLotOccupancyComment from '../handlers/lotOccupancies-post/doAddLotOccupancyComment.js'
-import handler_doUpdateLotOccupancyComment from '../handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js'
-import handler_doDeleteLotOccupancyComment from '../handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js'
-
-import handler_doGetFees from '../handlers/lotOccupancies-post/doGetFees.js'
 import handler_doAddLotOccupancyFee from '../handlers/lotOccupancies-post/doAddLotOccupancyFee.js'
-import handler_doUpdateLotOccupancyFeeQuantity from '../handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js'
+import handler_doAddLotOccupancyOccupant from '../handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js'
-import handler_doDeleteLotOccupancyFee from '../handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js'
-
-import handler_doGetDynamicsGPDocument from '../handlers/lotOccupancies-post/doGetDynamicsGPDocument.js'
 import handler_doAddLotOccupancyTransaction from '../handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js'
-import handler_doUpdateLotOccupancyTransaction from '../handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js'
+import handler_doCopyLotOccupancy from '../handlers/lotOccupancies-post/doCopyLotOccupancy.js'
+import handler_doCreateLotOccupancy from '../handlers/lotOccupancies-post/doCreateLotOccupancy.js'
+import handler_doDeleteLotOccupancy from '../handlers/lotOccupancies-post/doDeleteLotOccupancy.js'
+import handler_doDeleteLotOccupancyComment from '../handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js'
+import handler_doDeleteLotOccupancyFee from '../handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js'
+import handler_doDeleteLotOccupancyOccupant from '../handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js'
 import handler_doDeleteLotOccupancyTransaction from '../handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js'
-
+import handler_doGetDynamicsGPDocument from '../handlers/lotOccupancies-post/doGetDynamicsGPDocument.js'
+import handler_doGetFees from '../handlers/lotOccupancies-post/doGetFees.js'
+import handler_doGetOccupancyTypeFields from '../handlers/lotOccupancies-post/doGetOccupancyTypeFields.js'
+import handler_doSearchLotOccupancies from '../handlers/lotOccupancies-post/doSearchLotOccupancies.js'
+import handler_doSearchPastOccupants from '../handlers/lotOccupancies-post/doSearchPastOccupants.js'
+import handler_doUpdateLotOccupancy from '../handlers/lotOccupancies-post/doUpdateLotOccupancy.js'
+import handler_doUpdateLotOccupancyComment from '../handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js'
+import handler_doUpdateLotOccupancyFeeQuantity from '../handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js'
+import handler_doUpdateLotOccupancyOccupant from '../handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js'
+import handler_doUpdateLotOccupancyTransaction from '../handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js'
 import * as permissionHandlers from '../handlers/permissions.js'
-
 import * as configFunctions from '../helpers/functions.config.js'
 
 export const router = Router()

routes/lots.js

@@ -1,19 +1,19 @@
 import { Router } from 'express';
-import * as permissionHandlers from '../handlers/permissions.js';
+import handler_edit from '../handlers/lots-get/edit.js';
-import handler_search from '../handlers/lots-get/search.js';
+import handler_new from '../handlers/lots-get/new.js';
-import handler_doSearchLots from '../handlers/lots-post/doSearchLots.js';
-import handler_view from '../handlers/lots-get/view.js';
 import handler_next from '../handlers/lots-get/next.js';
 import handler_previous from '../handlers/lots-get/previous.js';
-import handler_new from '../handlers/lots-get/new.js';
+import handler_search from '../handlers/lots-get/search.js';
-import handler_edit from '../handlers/lots-get/edit.js';
+import handler_view from '../handlers/lots-get/view.js';
-import handler_doGetLotTypeFields from '../handlers/lots-post/doGetLotTypeFields.js';
-import handler_doCreateLot from '../handlers/lots-post/doCreateLot.js';
-import handler_doUpdateLot from '../handlers/lots-post/doUpdateLot.js';
-import handler_doDeleteLot from '../handlers/lots-post/doDeleteLot.js';
 import handler_doAddLotComment from '../handlers/lots-post/doAddLotComment.js';
-import handler_doUpdateLotComment from '../handlers/lots-post/doUpdateLotComment.js';
+import handler_doCreateLot from '../handlers/lots-post/doCreateLot.js';
+import handler_doDeleteLot from '../handlers/lots-post/doDeleteLot.js';
 import handler_doDeleteLotComment from '../handlers/lots-post/doDeleteLotComment.js';
+import handler_doGetLotTypeFields from '../handlers/lots-post/doGetLotTypeFields.js';
+import handler_doSearchLots from '../handlers/lots-post/doSearchLots.js';
+import handler_doUpdateLot from '../handlers/lots-post/doUpdateLot.js';
+import handler_doUpdateLotComment from '../handlers/lots-post/doUpdateLotComment.js';
+import * as permissionHandlers from '../handlers/permissions.js';
 export const router = Router();
 router.get('/', handler_search);
 router.post('/doSearchLots', handler_doSearchLots);

routes/lots.ts

@@ -1,26 +1,20 @@
 import { type RequestHandler, Router } from 'express'
 
-import * as permissionHandlers from '../handlers/permissions.js'
+import handler_edit from '../handlers/lots-get/edit.js'
-
+import handler_new from '../handlers/lots-get/new.js'
-import handler_search from '../handlers/lots-get/search.js'
-import handler_doSearchLots from '../handlers/lots-post/doSearchLots.js'
-
-import handler_view from '../handlers/lots-get/view.js'
 import handler_next from '../handlers/lots-get/next.js'
 import handler_previous from '../handlers/lots-get/previous.js'
-
+import handler_search from '../handlers/lots-get/search.js'
-import handler_new from '../handlers/lots-get/new.js'
+import handler_view from '../handlers/lots-get/view.js'
-import handler_edit from '../handlers/lots-get/edit.js'
-
-import handler_doGetLotTypeFields from '../handlers/lots-post/doGetLotTypeFields.js'
-
-import handler_doCreateLot from '../handlers/lots-post/doCreateLot.js'
-import handler_doUpdateLot from '../handlers/lots-post/doUpdateLot.js'
-import handler_doDeleteLot from '../handlers/lots-post/doDeleteLot.js'
-
 import handler_doAddLotComment from '../handlers/lots-post/doAddLotComment.js'
-import handler_doUpdateLotComment from '../handlers/lots-post/doUpdateLotComment.js'
+import handler_doCreateLot from '../handlers/lots-post/doCreateLot.js'
+import handler_doDeleteLot from '../handlers/lots-post/doDeleteLot.js'
 import handler_doDeleteLotComment from '../handlers/lots-post/doDeleteLotComment.js'
+import handler_doGetLotTypeFields from '../handlers/lots-post/doGetLotTypeFields.js'
+import handler_doSearchLots from '../handlers/lots-post/doSearchLots.js'
+import handler_doUpdateLot from '../handlers/lots-post/doUpdateLot.js'
+import handler_doUpdateLotComment from '../handlers/lots-post/doUpdateLotComment.js'
+import * as permissionHandlers from '../handlers/permissions.js'
 
 export const router = Router()
 

routes/maps.js

@@ -1,14 +1,14 @@
 import { Router } from 'express';
-import * as permissionHandlers from '../handlers/permissions.js';
+import handler_edit from '../handlers/maps-get/edit.js';
-import handler_search from '../handlers/maps-get/search.js';
+import handler_new from '../handlers/maps-get/new.js';
-import handler_view from '../handlers/maps-get/view.js';
 import handler_next from '../handlers/maps-get/next.js';
 import handler_previous from '../handlers/maps-get/previous.js';
-import handler_new from '../handlers/maps-get/new.js';
+import handler_search from '../handlers/maps-get/search.js';
-import handler_edit from '../handlers/maps-get/edit.js';
+import handler_view from '../handlers/maps-get/view.js';
 import handler_doCreateMap from '../handlers/maps-post/doCreateMap.js';
-import handler_doUpdateMap from '../handlers/maps-post/doUpdateMap.js';
 import handler_doDeleteMap from '../handlers/maps-post/doDeleteMap.js';
+import handler_doUpdateMap from '../handlers/maps-post/doUpdateMap.js';
+import * as permissionHandlers from '../handlers/permissions.js';
 export const router = Router();
 router.get('/', handler_search);
 router.get('/new', permissionHandlers.updateGetHandler, handler_new);

routes/maps.ts

@@ -1,19 +1,15 @@
 import { type RequestHandler, Router } from 'express'
 
-import * as permissionHandlers from '../handlers/permissions.js'
+import handler_edit from '../handlers/maps-get/edit.js'
-
+import handler_new from '../handlers/maps-get/new.js'
-import handler_search from '../handlers/maps-get/search.js'
-
-import handler_view from '../handlers/maps-get/view.js'
 import handler_next from '../handlers/maps-get/next.js'
 import handler_previous from '../handlers/maps-get/previous.js'
-
+import handler_search from '../handlers/maps-get/search.js'
-import handler_new from '../handlers/maps-get/new.js'
+import handler_view from '../handlers/maps-get/view.js'
-import handler_edit from '../handlers/maps-get/edit.js'
-
 import handler_doCreateMap from '../handlers/maps-post/doCreateMap.js'
-import handler_doUpdateMap from '../handlers/maps-post/doUpdateMap.js'
 import handler_doDeleteMap from '../handlers/maps-post/doDeleteMap.js'
+import handler_doUpdateMap from '../handlers/maps-post/doUpdateMap.js'
+import * as permissionHandlers from '../handlers/permissions.js'
 
 export const router = Router()
 

routes/print.js

@@ -1,6 +1,6 @@
 import { Router } from 'express';
-import handler_screen from '../handlers/print-get/screen.js';
 import handler_pdf from '../handlers/print-get/pdf.js';
+import handler_screen from '../handlers/print-get/screen.js';
 export const router = Router();
 router.get('/screen/:printName', handler_screen);
 router.get('/pdf/:printName', handler_pdf);

routes/print.ts

@@ -1,7 +1,7 @@
 import { type RequestHandler, Router } from 'express'
 
-import handler_screen from '../handlers/print-get/screen.js'
 import handler_pdf from '../handlers/print-get/pdf.js'
+import handler_screen from '../handlers/print-get/screen.js'
 
 export const router = Router()
 

routes/reports.js

@@ -1,6 +1,6 @@
 import { Router } from 'express';
-import handler_search from '../handlers/reports-get/search.js';
 import handler_reportName from '../handlers/reports-get/reportName.js';
+import handler_search from '../handlers/reports-get/search.js';
 export const router = Router();
 router.get('/', handler_search);
 router.all('/:reportName', handler_reportName);

routes/reports.ts

@@ -1,7 +1,7 @@
 import { type RequestHandler, Router } from 'express'
 
-import handler_search from '../handlers/reports-get/search.js'
 import handler_reportName from '../handlers/reports-get/reportName.js'
+import handler_search from '../handlers/reports-get/search.js'
 
 export const router = Router()
 

routes/workOrders.js

@@ -1,31 +1,31 @@
 import { Router } from 'express';
 import * as permissionHandlers from '../handlers/permissions.js';
-import handler_search from '../handlers/workOrders-get/search.js';
-import handler_doSearchWorkOrders from '../handlers/workOrders-post/doSearchWorkOrders.js';
-import handler_milestoneCalendar from '../handlers/workOrders-get/milestoneCalendar.js';
-import handler_doGetWorkOrderMilestones from '../handlers/workOrders-post/doGetWorkOrderMilestones.js';
-import handler_outlook from '../handlers/workOrders-get/outlook.js';
-import handler_view from '../handlers/workOrders-get/view.js';
-import handler_doReopenWorkOrder from '../handlers/workOrders-post/doReopenWorkOrder.js';
-import handler_new from '../handlers/workOrders-get/new.js';
-import handler_doCreateWorkOrder from '../handlers/workOrders-post/doCreateWorkOrder.js';
 import handler_edit from '../handlers/workOrders-get/edit.js';
-import handler_doUpdateWorkOrder from '../handlers/workOrders-post/doUpdateWorkOrder.js';
+import handler_milestoneCalendar from '../handlers/workOrders-get/milestoneCalendar.js';
-import handler_doCloseWorkOrder from '../handlers/workOrders-post/doCloseWorkOrder.js';
+import handler_new from '../handlers/workOrders-get/new.js';
-import handler_doDeleteWorkOrder from '../handlers/workOrders-post/doDeleteWorkOrder.js';
+import handler_outlook from '../handlers/workOrders-get/outlook.js';
-import handler_doAddWorkOrderLotOccupancy from '../handlers/workOrders-post/doAddWorkOrderLotOccupancy.js';
+import handler_search from '../handlers/workOrders-get/search.js';
-import handler_doDeleteWorkOrderLotOccupancy from '../handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js';
+import handler_view from '../handlers/workOrders-get/view.js';
-import handler_doAddWorkOrderLot from '../handlers/workOrders-post/doAddWorkOrderLot.js';
-import handler_doUpdateLotStatus from '../handlers/workOrders-post/doUpdateLotStatus.js';
-import handler_doDeleteWorkOrderLot from '../handlers/workOrders-post/doDeleteWorkOrderLot.js';
 import handler_doAddWorkOrderComment from '../handlers/workOrders-post/doAddWorkOrderComment.js';
-import handler_doUpdateWorkOrderComment from '../handlers/workOrders-post/doUpdateWorkOrderComment.js';
+import handler_doAddWorkOrderLot from '../handlers/workOrders-post/doAddWorkOrderLot.js';
-import handler_doDeleteWorkOrderComment from '../handlers/workOrders-post/doDeleteWorkOrderComment.js';
+import handler_doAddWorkOrderLotOccupancy from '../handlers/workOrders-post/doAddWorkOrderLotOccupancy.js';
 import handler_doAddWorkOrderMilestone from '../handlers/workOrders-post/doAddWorkOrderMilestone.js';
-import handler_doUpdateWorkOrderMilestone from '../handlers/workOrders-post/doUpdateWorkOrderMilestone.js';
+import handler_doCloseWorkOrder from '../handlers/workOrders-post/doCloseWorkOrder.js';
 import handler_doCompleteWorkOrderMilestone from '../handlers/workOrders-post/doCompleteWorkOrderMilestone.js';
-import handler_doReopenWorkOrderMilestone from '../handlers/workOrders-post/doReopenWorkOrderMilestone.js';
+import handler_doCreateWorkOrder from '../handlers/workOrders-post/doCreateWorkOrder.js';
+import handler_doDeleteWorkOrder from '../handlers/workOrders-post/doDeleteWorkOrder.js';
+import handler_doDeleteWorkOrderComment from '../handlers/workOrders-post/doDeleteWorkOrderComment.js';
+import handler_doDeleteWorkOrderLot from '../handlers/workOrders-post/doDeleteWorkOrderLot.js';
+import handler_doDeleteWorkOrderLotOccupancy from '../handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.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';
+import handler_doReopenWorkOrderMilestone from '../handlers/workOrders-post/doReopenWorkOrderMilestone.js';
+import handler_doSearchWorkOrders from '../handlers/workOrders-post/doSearchWorkOrders.js';
+import handler_doUpdateLotStatus from '../handlers/workOrders-post/doUpdateLotStatus.js';
+import handler_doUpdateWorkOrder from '../handlers/workOrders-post/doUpdateWorkOrder.js';
+import handler_doUpdateWorkOrderComment from '../handlers/workOrders-post/doUpdateWorkOrderComment.js';
+import handler_doUpdateWorkOrderMilestone from '../handlers/workOrders-post/doUpdateWorkOrderMilestone.js';
 export const router = Router();
 router.get('/', handler_search);
 router.post('/doSearchWorkOrders', handler_doSearchWorkOrders);

routes/workOrders.ts

@@ -1,42 +1,32 @@
 import { type RequestHandler, Router } from 'express'
 
 import * as permissionHandlers from '../handlers/permissions.js'
-
-import handler_search from '../handlers/workOrders-get/search.js'
-import handler_doSearchWorkOrders from '../handlers/workOrders-post/doSearchWorkOrders.js'
-
-import handler_milestoneCalendar from '../handlers/workOrders-get/milestoneCalendar.js'
-import handler_doGetWorkOrderMilestones from '../handlers/workOrders-post/doGetWorkOrderMilestones.js'
-
-import handler_outlook from '../handlers/workOrders-get/outlook.js'
-
-import handler_view from '../handlers/workOrders-get/view.js'
-import handler_doReopenWorkOrder from '../handlers/workOrders-post/doReopenWorkOrder.js'
-
-import handler_new from '../handlers/workOrders-get/new.js'
-import handler_doCreateWorkOrder from '../handlers/workOrders-post/doCreateWorkOrder.js'
-
 import handler_edit from '../handlers/workOrders-get/edit.js'
-import handler_doUpdateWorkOrder from '../handlers/workOrders-post/doUpdateWorkOrder.js'
+import handler_milestoneCalendar from '../handlers/workOrders-get/milestoneCalendar.js'
-import handler_doCloseWorkOrder from '../handlers/workOrders-post/doCloseWorkOrder.js'
+import handler_new from '../handlers/workOrders-get/new.js'
-import handler_doDeleteWorkOrder from '../handlers/workOrders-post/doDeleteWorkOrder.js'
+import handler_outlook from '../handlers/workOrders-get/outlook.js'
-
+import handler_search from '../handlers/workOrders-get/search.js'
-import handler_doAddWorkOrderLotOccupancy from '../handlers/workOrders-post/doAddWorkOrderLotOccupancy.js'
+import handler_view from '../handlers/workOrders-get/view.js'
-import handler_doDeleteWorkOrderLotOccupancy from '../handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js'
-
-import handler_doAddWorkOrderLot from '../handlers/workOrders-post/doAddWorkOrderLot.js'
-import handler_doUpdateLotStatus from '../handlers/workOrders-post/doUpdateLotStatus.js'
-import handler_doDeleteWorkOrderLot from '../handlers/workOrders-post/doDeleteWorkOrderLot.js'
-
 import handler_doAddWorkOrderComment from '../handlers/workOrders-post/doAddWorkOrderComment.js'
-import handler_doUpdateWorkOrderComment from '../handlers/workOrders-post/doUpdateWorkOrderComment.js'
+import handler_doAddWorkOrderLot from '../handlers/workOrders-post/doAddWorkOrderLot.js'
-import handler_doDeleteWorkOrderComment from '../handlers/workOrders-post/doDeleteWorkOrderComment.js'
+import handler_doAddWorkOrderLotOccupancy from '../handlers/workOrders-post/doAddWorkOrderLotOccupancy.js'
-
 import handler_doAddWorkOrderMilestone from '../handlers/workOrders-post/doAddWorkOrderMilestone.js'
-import handler_doUpdateWorkOrderMilestone from '../handlers/workOrders-post/doUpdateWorkOrderMilestone.js'
+import handler_doCloseWorkOrder from '../handlers/workOrders-post/doCloseWorkOrder.js'
 import handler_doCompleteWorkOrderMilestone from '../handlers/workOrders-post/doCompleteWorkOrderMilestone.js'
-import handler_doReopenWorkOrderMilestone from '../handlers/workOrders-post/doReopenWorkOrderMilestone.js'
+import handler_doCreateWorkOrder from '../handlers/workOrders-post/doCreateWorkOrder.js'
+import handler_doDeleteWorkOrder from '../handlers/workOrders-post/doDeleteWorkOrder.js'
+import handler_doDeleteWorkOrderComment from '../handlers/workOrders-post/doDeleteWorkOrderComment.js'
+import handler_doDeleteWorkOrderLot from '../handlers/workOrders-post/doDeleteWorkOrderLot.js'
+import handler_doDeleteWorkOrderLotOccupancy from '../handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.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'
+import handler_doReopenWorkOrderMilestone from '../handlers/workOrders-post/doReopenWorkOrderMilestone.js'
+import handler_doSearchWorkOrders from '../handlers/workOrders-post/doSearchWorkOrders.js'
+import handler_doUpdateLotStatus from '../handlers/workOrders-post/doUpdateLotStatus.js'
+import handler_doUpdateWorkOrder from '../handlers/workOrders-post/doUpdateWorkOrder.js'
+import handler_doUpdateWorkOrderComment from '../handlers/workOrders-post/doUpdateWorkOrderComment.js'
+import handler_doUpdateWorkOrderMilestone from '../handlers/workOrders-post/doUpdateWorkOrderMilestone.js'
 
 export const router = Router()
 

temp/legacy.importFromCSV.js

@@ -25,13 +25,11 @@ import { updateLotStatus } from '../helpers/lotOccupancyDB/updateLot.js';
 import * as importData from './legacy.importFromCsv.data.js';
 import * as importIds from './legacy.importFromCsv.ids.js';
 const user = {
-    user: {
+    userName: 'import.unix',
-        userName: 'import.unix',
+    userProperties: {
-        userProperties: {
+        canUpdate: true,
-            canUpdate: true,
+        isAdmin: false,
-            isAdmin: false,
+        apiKey: ''
-            apiKey: ''
-        }
     }
 };
 function purgeTables() {
@@ -876,7 +874,7 @@ async function importFromWorkOrderCSV() {
                         workOrderId: workOrder.workOrderId,
                         workOrderMilestoneTypeId: importIds.deathWorkOrderMilestoneTypeId,
                         workOrderMilestoneDateString,
-                        workOrderMilestoneDescription: 'Death Place: ' + workOrderRow.WO_DEATH_PLACE,
+                        workOrderMilestoneDescription: `Death Place: ${workOrderRow.WO_DEATH_PLACE}`,
                         workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
                             ? workOrderMilestoneDateString
                             : undefined,
@@ -905,7 +903,7 @@ async function importFromWorkOrderCSV() {
                         workOrderMilestoneTypeId: importIds.funeralWorkOrderMilestoneTypeId,
                         workOrderMilestoneDateString,
                         workOrderMilestoneTimeString,
-                        workOrderMilestoneDescription: 'Funeral Home: ' + workOrderRow.WO_FUNERAL_HOME,
+                        workOrderMilestoneDescription: `Funeral Home: ${workOrderRow.WO_FUNERAL_HOME}`,
                         workOrderMilestoneCompletionDateString: workOrderMilestoneDateString < currentDateString
                             ? workOrderMilestoneDateString
                             : undefined,
@@ -973,11 +971,11 @@ async function importFromWorkOrderCSV() {
     }
     console.timeEnd('importFromWorkOrderCSV');
 }
-console.log('Started ' + new Date().toLocaleString());
+console.log(`Started ${new Date().toLocaleString()}`);
 console.time('importFromCsv');
 purgeTables();
 await importFromMasterCSV();
 await importFromPrepaidCSV();
 await importFromWorkOrderCSV();
 console.timeEnd('importFromCsv');
-console.log('Finished ' + new Date().toLocaleString());
+console.log(`Finished ${new Date().toLocaleString()}`);

temp/legacy.importFromCSV.ts

@@ -176,14 +176,12 @@ interface WorkOrderRecord {
   WO_DEATH_PLACE: string
 }
 
-const user: recordTypes.PartialSession = {
+const user: User = {
-  user: {
+  userName: 'import.unix',
-    userName: 'import.unix',
+  userProperties: {
-    userProperties: {
+    canUpdate: true,
-      canUpdate: true,
+    isAdmin: false,
-      isAdmin: false,
+    apiKey: ''
-      apiKey: ''
-    }
   }
 }
 
@@ -276,7 +274,9 @@ const cemeteryToMapName = {
 
 const mapCache = new Map<string, recordTypes.MapRecord>()
 
-async function getMap(dataRow: { cemetery: string }): Promise<recordTypes.MapRecord> {
+async function getMap(dataRow: {
+  cemetery: string
+}): Promise<recordTypes.MapRecord> {
   const mapCacheKey = dataRow.cemetery
 
   /*
@@ -1511,7 +1511,7 @@ async function importFromWorkOrderCSV(): Promise<void> {
               workOrderMilestoneTypeId: importIds.deathWorkOrderMilestoneTypeId,
               workOrderMilestoneDateString,
               workOrderMilestoneDescription:
-                'Death Place: ' + workOrderRow.WO_DEATH_PLACE,
+                `Death Place: ${workOrderRow.WO_DEATH_PLACE}`,
               workOrderMilestoneCompletionDateString:
                 workOrderMilestoneDateString < currentDateString
                   ? workOrderMilestoneDateString
@@ -1559,8 +1559,7 @@ async function importFromWorkOrderCSV(): Promise<void> {
                 importIds.funeralWorkOrderMilestoneTypeId,
               workOrderMilestoneDateString,
               workOrderMilestoneTimeString,
-              workOrderMilestoneDescription:
+              workOrderMilestoneDescription: `Funeral Home: ${workOrderRow.WO_FUNERAL_HOME}`,
-                'Funeral Home: ' + workOrderRow.WO_FUNERAL_HOME,
               workOrderMilestoneCompletionDateString:
                 workOrderMilestoneDateString < currentDateString
                   ? workOrderMilestoneDateString
@@ -1662,7 +1661,7 @@ async function importFromWorkOrderCSV(): Promise<void> {
   console.timeEnd('importFromWorkOrderCSV')
 }
 
-console.log('Started ' + new Date().toLocaleString())
+console.log(`Started ${new Date().toLocaleString()}`)
 console.time('importFromCsv')
 
 purgeTables()
@@ -1672,4 +1671,4 @@ await importFromPrepaidCSV()
 await importFromWorkOrderCSV()
 
 console.timeEnd('importFromCsv')
-console.log('Finished ' + new Date().toLocaleString())
+console.log(`Finished ${new Date().toLocaleString()}`)

temp/legacy.importFromCsv.data.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from '../types/recordTypes';
+import type { LotOccupancyOccupant } from '../types/recordTypes.js';
 export declare function buildLotName(lotNamePieces: {
     cemetery: string;
     block: string;
@@ -10,5 +10,5 @@ export declare function buildLotName(lotNamePieces: {
     grave2: string;
     interment: string;
 }): string;
-export declare function getFuneralHomeLotOccupancyOccupantData(funeralHomeKey: string): recordTypes.LotOccupancyOccupant;
+export declare function getFuneralHomeLotOccupancyOccupantData(funeralHomeKey: string): LotOccupancyOccupant;
 export declare function getDeathAgePeriod(legacyDeathAgePeriod: string): string;

temp/legacy.importFromCsv.data.ts

@@ -1,6 +1,6 @@
-import * as importIds from './legacy.importFromCsv.ids.js'
+import type { LotOccupancyOccupant } from '../types/recordTypes.js'
 
-import type * as recordTypes from '../types/recordTypes'
+import * as importIds from './legacy.importFromCsv.ids.js'
 
 export function buildLotName(lotNamePieces: {
   cemetery: string
@@ -34,7 +34,7 @@ export function buildLotName(lotNamePieces: {
 
 export function getFuneralHomeLotOccupancyOccupantData(
   funeralHomeKey: string
-): recordTypes.LotOccupancyOccupant {
+): LotOccupancyOccupant {
   switch (funeralHomeKey) {
     case 'AR': {
       return {

test/0_initializeDatabase.js

@@ -1,7 +1,7 @@
 import * as assert from 'node:assert';
 import fs from 'node:fs/promises';
-import { initializeCemeteryDatabase } from '../helpers/initializer.database.cemetery.js';
 import { lotOccupancyDB as databasePath, useTestDatabases } from '../data/databasePaths.js';
+import { initializeCemeteryDatabase } from '../helpers/initializer.database.cemetery.js';
 describe('Initialize Database', () => {
     it('initializes a cemetery database', async () => {
         if (!useTestDatabases) {

test/0_initializeDatabase.ts

@@ -1,14 +1,13 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn/filename-case, eslint-comments/disable-enable-pair */
 
 import * as assert from 'node:assert'
-
 import fs from 'node:fs/promises'
 
-import { initializeCemeteryDatabase } from '../helpers/initializer.database.cemetery.js'
 import {
   lotOccupancyDB as databasePath,
   useTestDatabases
 } from '../data/databasePaths.js'
+import { initializeCemeteryDatabase } from '../helpers/initializer.database.cemetery.js'
 
 describe('Initialize Database', () => {
   it('initializes a cemetery database', async () => {

test/1_serverCypress.js

@@ -1,8 +1,8 @@
 import * as assert from 'node:assert';
-import { portNumber } from './_globals.js';
 import { exec } from 'node:child_process';
 import * as http from 'node:http';
 import { app } from '../app.js';
+import { portNumber } from './_globals.js';
 function runCypress(browser, done) {
     let cypressCommand = `cypress run --config-file cypress.config.js --browser ${browser}`;
     if ((process.env.CYPRESS_RECORD_KEY ?? '') !== '') {

test/1_serverCypress.ts

@@ -1,14 +1,13 @@
-/* eslint-disable unicorn/filename-case */
+/* eslint-disable unicorn/filename-case, eslint-comments/disable-enable-pair */
 
 import * as assert from 'node:assert'
+import { exec } from 'node:child_process'
+import * as http from 'node:http'
+
+import { app } from '../app.js'
 
 import { portNumber } from './_globals.js'
 
-import { exec } from 'node:child_process'
-
-import * as http from 'node:http'
-import { app } from '../app.js'
-
 function runCypress(browser: 'chrome' | 'firefox', done: () => void): void {
   let cypressCommand = `cypress run --config-file cypress.config.js --browser ${browser}`
 

test/version.js

@@ -1,4 +1,4 @@
-import * as assert from 'node:assert';
+import assert from 'node:assert';
 import fs from 'node:fs';
 import { version } from '../version.js';
 describe('version', () => {

test/version.ts

@@ -1,5 +1,4 @@
-import * as assert from 'node:assert'
+import assert from 'node:assert'
-
 import fs from 'node:fs'
 
 import { version } from '../version.js'

types/configTypes.ts

@@ -1,4 +1,4 @@
-// eslint-disable-next-line node/no-extraneous-import
+// eslint-disable-next-line n/no-extraneous-import
 import type { config as MSSQLConfig } from 'mssql'
 
 export interface Config {

windowsService-install.ts

@@ -1,4 +1,5 @@
 import { Service } from 'node-windows'
+
 import { serviceConfig } from './windowsService.js'
 
 // Create a new service object

windowsService-uninstall.js

@@ -1,7 +1,7 @@
 import { Service } from 'node-windows';
 import { serviceConfig } from './windowsService.js';
 const svc = new Service(serviceConfig);
-svc.on('uninstall', function () {
+svc.on('uninstall', () => {
     console.log('Uninstall complete.');
     console.log('The service exists:', svc.exists);
 });

windowsService-uninstall.ts

@@ -1,11 +1,12 @@
 import { Service } from 'node-windows'
+
 import { serviceConfig } from './windowsService.js'
 
 // Create a new service object
 const svc = new Service(serviceConfig)
 
 // Listen for the "uninstall" event so we know when it's done.
-svc.on('uninstall', function () {
+svc.on('uninstall', () => {
   console.log('Uninstall complete.')
   console.log('The service exists:', svc.exists)
 })

windowsService.ts

@@ -1,4 +1,5 @@
 import path from 'node:path'
+
 import type { ServiceConfig } from 'node-windows'
 
 const _dirname = '.'