From 92a77c1d3e98829737a9448f43fee6dde15b219d Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 28 Oct 2024 13:04:12 -0400 Subject: [PATCH] add fieldType to lot and occ types --- database/addLotTypeField.d.ts | 5 +- database/addLotTypeField.js | 6 +- database/addLotTypeField.ts | 10 +- database/addOccupancyTypeField.d.ts | 5 +- database/addOccupancyTypeField.js | 6 +- database/addOccupancyTypeField.ts | 10 +- database/getLotFields.js | 4 +- database/getLotFields.ts | 4 +- database/getLotOccupancyFields.js | 4 +- database/getLotOccupancyFields.ts | 4 +- database/getLotTypeFields.js | 2 +- database/getLotTypeFields.ts | 2 +- database/getOccupancyTypeFields.js | 2 +- database/getOccupancyTypeFields.ts | 2 +- database/updateLotTypeField.d.ts | 1 + database/updateLotTypeField.js | 3 +- database/updateLotTypeField.ts | 3 + database/updateOccupancyTypeField.d.ts | 1 + database/updateOccupancyTypeField.js | 3 +- database/updateOccupancyTypeField.ts | 3 + eslint.config.js | 3 +- eslint.config.ts | 3 +- handlers/admin-get/database.d.ts | 1 - handlers/admin-get/fees.d.ts | 1 - handlers/admin-get/lotTypes.d.ts | 1 - handlers/admin-get/ntfyStartup.d.ts | 1 - handlers/admin-get/occupancyTypes.d.ts | 1 - handlers/admin-get/tables.d.ts | 1 - handlers/admin-post/doAddFee.d.ts | 1 - handlers/admin-post/doAddFeeCategory.d.ts | 1 - handlers/admin-post/doAddLotOccupantType.d.ts | 1 - handlers/admin-post/doAddLotStatus.d.ts | 1 - handlers/admin-post/doAddLotType.d.ts | 1 - handlers/admin-post/doAddLotTypeField.d.ts | 1 - handlers/admin-post/doAddOccupancyType.d.ts | 1 - .../admin-post/doAddOccupancyTypeField.d.ts | 1 - .../admin-post/doAddOccupancyTypePrint.d.ts | 1 - .../doAddWorkOrderMilestoneType.d.ts | 1 - handlers/admin-post/doAddWorkOrderType.d.ts | 1 - handlers/admin-post/doBackupDatabase.d.ts | 1 - handlers/admin-post/doCleanupDatabase.d.ts | 1 - handlers/admin-post/doDeleteFee.d.ts | 1 - handlers/admin-post/doDeleteFeeCategory.d.ts | 1 - .../admin-post/doDeleteLotOccupantType.d.ts | 1 - handlers/admin-post/doDeleteLotStatus.d.ts | 1 - handlers/admin-post/doDeleteLotType.d.ts | 1 - handlers/admin-post/doDeleteLotTypeField.d.ts | 1 - .../admin-post/doDeleteOccupancyType.d.ts | 1 - .../doDeleteOccupancyTypeField.d.ts | 1 - .../doDeleteOccupancyTypePrint.d.ts | 1 - .../doDeleteWorkOrderMilestoneType.d.ts | 1 - .../admin-post/doDeleteWorkOrderType.d.ts | 1 - .../admin-post/doMoveFeeCategoryDown.d.ts | 1 - handlers/admin-post/doMoveFeeCategoryUp.d.ts | 1 - handlers/admin-post/doMoveFeeDown.d.ts | 1 - handlers/admin-post/doMoveFeeUp.d.ts | 1 - .../admin-post/doMoveLotOccupantTypeDown.d.ts | 1 - .../admin-post/doMoveLotOccupantTypeUp.d.ts | 1 - handlers/admin-post/doMoveLotStatusDown.d.ts | 1 - handlers/admin-post/doMoveLotStatusUp.d.ts | 1 - handlers/admin-post/doMoveLotTypeDown.d.ts | 1 - .../admin-post/doMoveLotTypeFieldDown.d.ts | 1 - handlers/admin-post/doMoveLotTypeFieldUp.d.ts | 1 - handlers/admin-post/doMoveLotTypeUp.d.ts | 1 - .../admin-post/doMoveOccupancyTypeDown.d.ts | 1 - .../doMoveOccupancyTypeFieldDown.d.ts | 1 - .../doMoveOccupancyTypeFieldUp.d.ts | 1 - .../doMoveOccupancyTypePrintDown.d.ts | 1 - .../doMoveOccupancyTypePrintUp.d.ts | 1 - .../admin-post/doMoveOccupancyTypeUp.d.ts | 1 - .../doMoveWorkOrderMilestoneTypeDown.d.ts | 1 - .../doMoveWorkOrderMilestoneTypeUp.d.ts | 1 - .../admin-post/doMoveWorkOrderTypeDown.d.ts | 1 - .../admin-post/doMoveWorkOrderTypeUp.d.ts | 1 - handlers/admin-post/doUpdateFee.d.ts | 1 - handlers/admin-post/doUpdateFeeAmount.d.ts | 1 - handlers/admin-post/doUpdateFeeCategory.d.ts | 1 - .../admin-post/doUpdateLotOccupantType.d.ts | 1 - handlers/admin-post/doUpdateLotStatus.d.ts | 1 - handlers/admin-post/doUpdateLotType.d.ts | 1 - handlers/admin-post/doUpdateLotTypeField.d.ts | 1 - .../admin-post/doUpdateOccupancyType.d.ts | 1 - .../doUpdateOccupancyTypeField.d.ts | 1 - .../doUpdateWorkOrderMilestoneType.d.ts | 1 - .../admin-post/doUpdateWorkOrderType.d.ts | 1 - handlers/api-get/milestoneICS.d.ts | 1 - handlers/dashboard-get/dashboard.d.ts | 1 - handlers/lotOccupancies-get/edit.d.ts | 1 - handlers/lotOccupancies-get/new.d.ts | 1 - handlers/lotOccupancies-get/search.d.ts | 1 - handlers/lotOccupancies-get/view.d.ts | 1 - .../doAddLotOccupancyComment.d.ts | 1 - .../doAddLotOccupancyFee.d.ts | 1 - .../doAddLotOccupancyFeeCategory.d.ts | 1 - .../doAddLotOccupancyOccupant.d.ts | 1 - .../doAddLotOccupancyTransaction.d.ts | 1 - .../doCopyLotOccupancy.d.ts | 1 - .../doCreateLotOccupancy.d.ts | 1 - .../doDeleteLotOccupancy.d.ts | 1 - .../doDeleteLotOccupancyComment.d.ts | 1 - .../doDeleteLotOccupancyFee.d.ts | 1 - .../doDeleteLotOccupancyOccupant.d.ts | 1 - .../doDeleteLotOccupancyTransaction.d.ts | 1 - .../doGetDynamicsGPDocument.d.ts | 1 - handlers/lotOccupancies-post/doGetFees.d.ts | 1 - .../doGetOccupancyTypeFields.d.ts | 1 - .../doSearchLotOccupancies.d.ts | 1 - .../doSearchPastOccupants.d.ts | 1 - .../doUpdateLotOccupancy.d.ts | 1 - .../doUpdateLotOccupancyComment.d.ts | 1 - .../doUpdateLotOccupancyFeeQuantity.d.ts | 1 - .../doUpdateLotOccupancyOccupant.d.ts | 1 - .../doUpdateLotOccupancyTransaction.d.ts | 1 - handlers/lots-get/edit.d.ts | 1 - handlers/lots-get/new.d.ts | 1 - handlers/lots-get/next.d.ts | 1 - handlers/lots-get/previous.d.ts | 1 - handlers/lots-get/search.d.ts | 1 - handlers/lots-get/view.d.ts | 1 - handlers/lots-post/doAddLotComment.d.ts | 1 - handlers/lots-post/doCreateLot.d.ts | 1 - handlers/lots-post/doDeleteLot.d.ts | 1 - handlers/lots-post/doDeleteLotComment.d.ts | 1 - handlers/lots-post/doGetLotTypeFields.d.ts | 1 - handlers/lots-post/doSearchLots.d.ts | 1 - handlers/lots-post/doUpdateLot.d.ts | 1 - handlers/lots-post/doUpdateLotComment.d.ts | 1 - handlers/maps-get/edit.d.ts | 1 - handlers/maps-get/new.d.ts | 1 - handlers/maps-get/next.d.ts | 1 - handlers/maps-get/previous.d.ts | 1 - handlers/maps-get/search.d.ts | 1 - handlers/maps-get/view.d.ts | 1 - handlers/maps-post/doCreateMap.d.ts | 1 - handlers/maps-post/doDeleteMap.d.ts | 1 - handlers/maps-post/doUpdateMap.d.ts | 1 - handlers/permissions.d.ts | 1 - handlers/print-get/screen.d.ts | 1 - handlers/reports-get/reportName.d.ts | 1 - handlers/reports-get/search.d.ts | 1 - handlers/workOrders-get/edit.d.ts | 1 - .../workOrders-get/milestoneCalendar.d.ts | 1 - handlers/workOrders-get/new.d.ts | 1 - handlers/workOrders-get/outlook.d.ts | 1 - handlers/workOrders-get/search.d.ts | 1 - handlers/workOrders-get/view.d.ts | 1 - .../doAddWorkOrderComment.d.ts | 1 - .../workOrders-post/doAddWorkOrderLot.d.ts | 1 - .../doAddWorkOrderLotOccupancy.d.ts | 1 - .../doAddWorkOrderMilestone.d.ts | 1 - .../workOrders-post/doCloseWorkOrder.d.ts | 1 - .../doCompleteWorkOrderMilestone.d.ts | 1 - .../workOrders-post/doCreateWorkOrder.d.ts | 1 - .../workOrders-post/doDeleteWorkOrder.d.ts | 1 - .../doDeleteWorkOrderComment.d.ts | 1 - .../workOrders-post/doDeleteWorkOrderLot.d.ts | 1 - .../doDeleteWorkOrderLotOccupancy.d.ts | 1 - .../doDeleteWorkOrderMilestone.d.ts | 1 - .../doGetWorkOrderMilestones.d.ts | 1 - .../workOrders-post/doReopenWorkOrder.d.ts | 1 - .../doReopenWorkOrderMilestone.d.ts | 1 - .../workOrders-post/doSearchWorkOrders.d.ts | 1 - .../workOrders-post/doUpdateLotStatus.d.ts | 1 - .../workOrders-post/doUpdateWorkOrder.d.ts | 1 - .../doUpdateWorkOrderComment.d.ts | 1 - .../doUpdateWorkOrderMilestone.d.ts | 1 - helpers/initializer.database.cemetery.js | 1 + helpers/initializer.database.cemetery.ts | 1 + package-lock.json | 38 ++--- package.json | 2 +- .../html/adminLotTypes-editLotTypeField.html | 17 ++ ...OccupancyTypes-editOccupancyTypeField.html | 17 ++ public/javascripts/adminLotTypes.js | 48 +++--- public/javascripts/adminLotTypes.ts | 60 ++++--- public/javascripts/adminOccupancyTypes.js | 36 ++-- public/javascripts/adminOccupancyTypes.ts | 51 ++++-- public/javascripts/lotOccupancyEdit.js | 39 +++-- public/javascripts/lotOccupancyEdit.ts | 58 +++---- .../javascripts/tsconfig.json | 14 +- views/lot-edit.ejs | 155 +++++++++--------- views/lotOccupancy-edit.ejs | 114 ++++++------- 181 files changed, 426 insertions(+), 455 deletions(-) rename tsconfig.client.json => public/javascripts/tsconfig.json (60%) diff --git a/database/addLotTypeField.d.ts b/database/addLotTypeField.d.ts index 25cd44a0..a596b9dd 100644 --- a/database/addLotTypeField.d.ts +++ b/database/addLotTypeField.d.ts @@ -1,11 +1,12 @@ export interface AddLotTypeFieldForm { lotTypeId: string | number; lotTypeField: string; + fieldType?: string; lotTypeFieldValues?: string; isRequired?: string; pattern?: string; - minimumLength: string | number; - maximumLength: string | number; + minimumLength?: string | number; + maximumLength?: string | number; orderNumber?: number; } export default function addLotTypeField(lotTypeFieldForm: AddLotTypeFieldForm, user: User): Promise; diff --git a/database/addLotTypeField.js b/database/addLotTypeField.js index 170de4c5..3d2cc17f 100644 --- a/database/addLotTypeField.js +++ b/database/addLotTypeField.js @@ -5,14 +5,14 @@ export default async function addLotTypeField(lotTypeFieldForm, user) { const rightNowMillis = Date.now(); const result = database .prepare(`insert into LotTypeFields ( - lotTypeId, lotTypeField, lotTypeFieldValues, + lotTypeId, lotTypeField, fieldType, lotTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber, recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) - .run(lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, lotTypeFieldForm.lotTypeFieldValues ?? '', lotTypeFieldForm.isRequired === '' ? 0 : 1, lotTypeFieldForm.pattern ?? '', lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) + .run(lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, lotTypeFieldForm.fieldType ?? 'text', lotTypeFieldForm.lotTypeFieldValues ?? '', lotTypeFieldForm.isRequired === '' ? 0 : 1, lotTypeFieldForm.pattern ?? '', lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); database.release(); clearCacheByTableName('LotTypeFields'); return result.lastInsertRowid; diff --git a/database/addLotTypeField.ts b/database/addLotTypeField.ts index 47d8480d..d6926c9f 100644 --- a/database/addLotTypeField.ts +++ b/database/addLotTypeField.ts @@ -5,11 +5,12 @@ import { acquireConnection } from './pool.js' export interface AddLotTypeFieldForm { lotTypeId: string | number lotTypeField: string + fieldType?: string lotTypeFieldValues?: string isRequired?: string pattern?: string - minimumLength: string | number - maximumLength: string | number + minimumLength?: string | number + maximumLength?: string | number orderNumber?: number } @@ -24,17 +25,18 @@ export default async function addLotTypeField( const result = database .prepare( `insert into LotTypeFields ( - lotTypeId, lotTypeField, lotTypeFieldValues, + lotTypeId, lotTypeField, fieldType, lotTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber, recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, + lotTypeFieldForm.fieldType ?? 'text', lotTypeFieldForm.lotTypeFieldValues ?? '', lotTypeFieldForm.isRequired === '' ? 0 : 1, lotTypeFieldForm.pattern ?? '', diff --git a/database/addOccupancyTypeField.d.ts b/database/addOccupancyTypeField.d.ts index 69970279..e619da02 100644 --- a/database/addOccupancyTypeField.d.ts +++ b/database/addOccupancyTypeField.d.ts @@ -2,10 +2,11 @@ export interface AddOccupancyTypeFieldForm { occupancyTypeId?: string | number; occupancyTypeField: string; occupancyTypeFieldValues?: string; + fieldType?: string; isRequired?: string; pattern?: string; - minimumLength: string | number; - maximumLength: string | number; + minimumLength?: string | number; + maximumLength?: string | number; orderNumber?: number; } export default function addOccupancyTypeField(occupancyTypeFieldForm: AddOccupancyTypeFieldForm, user: User): Promise; diff --git a/database/addOccupancyTypeField.js b/database/addOccupancyTypeField.js index 826a3ab7..93fd2718 100644 --- a/database/addOccupancyTypeField.js +++ b/database/addOccupancyTypeField.js @@ -5,14 +5,14 @@ export default async function addOccupancyTypeField(occupancyTypeFieldForm, user const rightNowMillis = Date.now(); const result = database .prepare(`insert into OccupancyTypeFields ( - occupancyTypeId, occupancyTypeField, + occupancyTypeId, occupancyTypeField, fieldType, occupancyTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber, recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) - .run(occupancyTypeFieldForm.occupancyTypeId ?? undefined, occupancyTypeFieldForm.occupancyTypeField, occupancyTypeFieldForm.occupancyTypeFieldValues ?? '', occupancyTypeFieldForm.isRequired === '' ? 0 : 1, occupancyTypeFieldForm.pattern ?? '', occupancyTypeFieldForm.minimumLength ?? 0, occupancyTypeFieldForm.maximumLength ?? 100, occupancyTypeFieldForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) + .run(occupancyTypeFieldForm.occupancyTypeId ?? undefined, occupancyTypeFieldForm.occupancyTypeField, occupancyTypeFieldForm.fieldType ?? 'text', occupancyTypeFieldForm.occupancyTypeFieldValues ?? '', occupancyTypeFieldForm.isRequired === '' ? 0 : 1, occupancyTypeFieldForm.pattern ?? '', occupancyTypeFieldForm.minimumLength ?? 0, occupancyTypeFieldForm.maximumLength ?? 100, occupancyTypeFieldForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); database.release(); clearCacheByTableName('OccupancyTypeFields'); return result.lastInsertRowid; diff --git a/database/addOccupancyTypeField.ts b/database/addOccupancyTypeField.ts index 85003a85..c46e009c 100644 --- a/database/addOccupancyTypeField.ts +++ b/database/addOccupancyTypeField.ts @@ -6,10 +6,11 @@ export interface AddOccupancyTypeFieldForm { occupancyTypeId?: string | number occupancyTypeField: string occupancyTypeFieldValues?: string + fieldType?: string isRequired?: string pattern?: string - minimumLength: string | number - maximumLength: string | number + minimumLength?: string | number + maximumLength?: string | number orderNumber?: number } @@ -24,17 +25,18 @@ export default async function addOccupancyTypeField( const result = database .prepare( `insert into OccupancyTypeFields ( - occupancyTypeId, occupancyTypeField, + occupancyTypeId, occupancyTypeField, fieldType, occupancyTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber, recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( occupancyTypeFieldForm.occupancyTypeId ?? undefined, occupancyTypeFieldForm.occupancyTypeField, + occupancyTypeFieldForm.fieldType ?? 'text', occupancyTypeFieldForm.occupancyTypeFieldValues ?? '', occupancyTypeFieldForm.isRequired === '' ? 0 : 1, occupancyTypeFieldForm.pattern ?? '', diff --git a/database/getLotFields.js b/database/getLotFields.js index 3421a8f1..5bbe3b06 100644 --- a/database/getLotFields.js +++ b/database/getLotFields.js @@ -4,7 +4,7 @@ export default async function getLotFields(lotId, connectedDatabase) { const lotFields = database .prepare(`select l.lotId, l.lotTypeFieldId, l.lotFieldValue, - f.lotTypeField, f.lotTypeFieldValues, + f.lotTypeField, f.fieldType, f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as lotTypeOrderNumber from LotFields l @@ -17,7 +17,7 @@ export default async function getLotFields(lotId, connectedDatabase) { select ? as lotId, f.lotTypeFieldId, '' as lotFieldValue, - f.lotTypeField, f.lotTypeFieldValues, + f.lotTypeField, f.fieldType, f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as lotTypeOrderNumber from LotTypeFields f diff --git a/database/getLotFields.ts b/database/getLotFields.ts index fd53e074..584ed37e 100644 --- a/database/getLotFields.ts +++ b/database/getLotFields.ts @@ -14,7 +14,7 @@ export default async function getLotFields( .prepare( `select l.lotId, l.lotTypeFieldId, l.lotFieldValue, - f.lotTypeField, f.lotTypeFieldValues, + f.lotTypeField, f.fieldType, f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as lotTypeOrderNumber from LotFields l @@ -27,7 +27,7 @@ export default async function getLotFields( select ? as lotId, f.lotTypeFieldId, '' as lotFieldValue, - f.lotTypeField, f.lotTypeFieldValues, + f.lotTypeField, f.fieldType, f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as lotTypeOrderNumber from LotTypeFields f diff --git a/database/getLotOccupancyFields.js b/database/getLotOccupancyFields.js index 3d2bd2f1..0ade2ce2 100644 --- a/database/getLotOccupancyFields.js +++ b/database/getLotOccupancyFields.js @@ -3,7 +3,7 @@ export default async function getLotOccupancyFields(lotOccupancyId, connectedDat const database = connectedDatabase ?? (await acquireConnection()); const lotOccupancyFields = database .prepare(`select o.lotOccupancyId, o.occupancyTypeFieldId, - o.lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + o.lotOccupancyFieldValue, f.occupancyTypeField, f.fieldType, f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as occupancyTypeOrderNumber from LotOccupancyFields o @@ -15,7 +15,7 @@ export default async function getLotOccupancyFields(lotOccupancyId, connectedDat union select ? as lotOccupancyId, f.occupancyTypeFieldId, - '' as lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + '' as lotOccupancyFieldValue, f.occupancyTypeField, f.fieldType, f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as occupancyTypeOrderNumber from OccupancyTypeFields f diff --git a/database/getLotOccupancyFields.ts b/database/getLotOccupancyFields.ts index 5a16c4ec..2685d615 100644 --- a/database/getLotOccupancyFields.ts +++ b/database/getLotOccupancyFields.ts @@ -13,7 +13,7 @@ export default async function getLotOccupancyFields( const lotOccupancyFields = database .prepare( `select o.lotOccupancyId, o.occupancyTypeFieldId, - o.lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + o.lotOccupancyFieldValue, f.occupancyTypeField, f.fieldType, f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as occupancyTypeOrderNumber from LotOccupancyFields o @@ -25,7 +25,7 @@ export default async function getLotOccupancyFields( union select ? as lotOccupancyId, f.occupancyTypeFieldId, - '' as lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + '' as lotOccupancyFieldValue, f.occupancyTypeField, f.fieldType, f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength, f.orderNumber, t.orderNumber as occupancyTypeOrderNumber from OccupancyTypeFields f diff --git a/database/getLotTypeFields.js b/database/getLotTypeFields.js index a2d4724d..f47d0751 100644 --- a/database/getLotTypeFields.js +++ b/database/getLotTypeFields.js @@ -4,7 +4,7 @@ export default async function getLotTypeFields(lotTypeId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const lotTypeFields = database .prepare(`select lotTypeFieldId, - lotTypeField, lotTypeFieldValues, + lotTypeField, fieldType, lotTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber from LotTypeFields where recordDelete_timeMillis is null diff --git a/database/getLotTypeFields.ts b/database/getLotTypeFields.ts index 7878ef00..3794721b 100644 --- a/database/getLotTypeFields.ts +++ b/database/getLotTypeFields.ts @@ -14,7 +14,7 @@ export default async function getLotTypeFields( const lotTypeFields = database .prepare( `select lotTypeFieldId, - lotTypeField, lotTypeFieldValues, + lotTypeField, fieldType, lotTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber from LotTypeFields where recordDelete_timeMillis is null diff --git a/database/getOccupancyTypeFields.js b/database/getOccupancyTypeFields.js index 904661ac..84bac38a 100644 --- a/database/getOccupancyTypeFields.js +++ b/database/getOccupancyTypeFields.js @@ -7,7 +7,7 @@ export default async function getOccupancyTypeFields(occupancyTypeId, connectedD sqlParameters.push(occupancyTypeId); } const occupancyTypeFields = database - .prepare(`select occupancyTypeFieldId, occupancyTypeField, + .prepare(`select occupancyTypeFieldId, occupancyTypeField, fieldType, occupancyTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber from OccupancyTypeFields where recordDelete_timeMillis is null diff --git a/database/getOccupancyTypeFields.ts b/database/getOccupancyTypeFields.ts index f93aae54..4a03a54d 100644 --- a/database/getOccupancyTypeFields.ts +++ b/database/getOccupancyTypeFields.ts @@ -19,7 +19,7 @@ export default async function getOccupancyTypeFields( const occupancyTypeFields = database .prepare( - `select occupancyTypeFieldId, occupancyTypeField, + `select occupancyTypeFieldId, occupancyTypeField, fieldType, occupancyTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber from OccupancyTypeFields where recordDelete_timeMillis is null diff --git a/database/updateLotTypeField.d.ts b/database/updateLotTypeField.d.ts index cf84113f..063f14b5 100644 --- a/database/updateLotTypeField.d.ts +++ b/database/updateLotTypeField.d.ts @@ -2,6 +2,7 @@ export interface UpdateLotTypeFieldForm { lotTypeFieldId: number | string; lotTypeField: string; isRequired: '0' | '1'; + fieldType?: string; minimumLength?: string; maximumLength?: string; pattern?: string; diff --git a/database/updateLotTypeField.js b/database/updateLotTypeField.js index 39583499..7a14c2e6 100644 --- a/database/updateLotTypeField.js +++ b/database/updateLotTypeField.js @@ -6,6 +6,7 @@ export default async function updateLotTypeField(lotTypeFieldForm, user) { .prepare(`update LotTypeFields set lotTypeField = ?, isRequired = ?, + fieldType = ?, minimumLength = ?, maximumLength = ?, pattern = ?, @@ -14,7 +15,7 @@ export default async function updateLotTypeField(lotTypeFieldForm, user) { recordUpdate_timeMillis = ? where lotTypeFieldId = ? and recordDelete_timeMillis is null`) - .run(lotTypeFieldForm.lotTypeField, Number.parseInt(lotTypeFieldForm.isRequired, 10), lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.pattern ?? '', lotTypeFieldForm.lotTypeFieldValues, user.userName, Date.now(), lotTypeFieldForm.lotTypeFieldId); + .run(lotTypeFieldForm.lotTypeField, Number.parseInt(lotTypeFieldForm.isRequired, 10), lotTypeFieldForm.fieldType ?? 'text', lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.pattern ?? '', lotTypeFieldForm.lotTypeFieldValues, user.userName, Date.now(), lotTypeFieldForm.lotTypeFieldId); database.release(); clearCacheByTableName('LotTypeFields'); return result.changes > 0; diff --git a/database/updateLotTypeField.ts b/database/updateLotTypeField.ts index a249717d..18ac1509 100644 --- a/database/updateLotTypeField.ts +++ b/database/updateLotTypeField.ts @@ -6,6 +6,7 @@ export interface UpdateLotTypeFieldForm { lotTypeFieldId: number | string lotTypeField: string isRequired: '0' | '1' + fieldType?: string minimumLength?: string maximumLength?: string pattern?: string @@ -23,6 +24,7 @@ export default async function updateLotTypeField( `update LotTypeFields set lotTypeField = ?, isRequired = ?, + fieldType = ?, minimumLength = ?, maximumLength = ?, pattern = ?, @@ -35,6 +37,7 @@ export default async function updateLotTypeField( .run( lotTypeFieldForm.lotTypeField, Number.parseInt(lotTypeFieldForm.isRequired, 10), + lotTypeFieldForm.fieldType ?? 'text', lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.pattern ?? '', diff --git a/database/updateOccupancyTypeField.d.ts b/database/updateOccupancyTypeField.d.ts index 5eac9ba0..4a980626 100644 --- a/database/updateOccupancyTypeField.d.ts +++ b/database/updateOccupancyTypeField.d.ts @@ -2,6 +2,7 @@ export interface UpdateOccupancyTypeFieldForm { occupancyTypeFieldId: number | string; occupancyTypeField: string; isRequired: '0' | '1'; + fieldType?: string; minimumLength?: string; maximumLength?: string; pattern?: string; diff --git a/database/updateOccupancyTypeField.js b/database/updateOccupancyTypeField.js index 90515744..fa46d408 100644 --- a/database/updateOccupancyTypeField.js +++ b/database/updateOccupancyTypeField.js @@ -6,6 +6,7 @@ export default async function updateOccupancyTypeField(occupancyTypeFieldForm, u .prepare(`update OccupancyTypeFields set occupancyTypeField = ?, isRequired = ?, + fieldType = ?, minimumLength = ?, maximumLength = ?, pattern = ?, @@ -14,7 +15,7 @@ export default async function updateOccupancyTypeField(occupancyTypeFieldForm, u recordUpdate_timeMillis = ? where occupancyTypeFieldId = ? and recordDelete_timeMillis is null`) - .run(occupancyTypeFieldForm.occupancyTypeField, Number.parseInt(occupancyTypeFieldForm.isRequired, 10), occupancyTypeFieldForm.minimumLength ?? 0, occupancyTypeFieldForm.maximumLength ?? 100, occupancyTypeFieldForm.pattern ?? '', occupancyTypeFieldForm.occupancyTypeFieldValues, user.userName, Date.now(), occupancyTypeFieldForm.occupancyTypeFieldId); + .run(occupancyTypeFieldForm.occupancyTypeField, Number.parseInt(occupancyTypeFieldForm.isRequired, 10), occupancyTypeFieldForm.fieldType ?? 'text', occupancyTypeFieldForm.minimumLength ?? 0, occupancyTypeFieldForm.maximumLength ?? 100, occupancyTypeFieldForm.pattern ?? '', occupancyTypeFieldForm.occupancyTypeFieldValues, user.userName, Date.now(), occupancyTypeFieldForm.occupancyTypeFieldId); database.release(); clearCacheByTableName('OccupancyTypeFields'); return result.changes > 0; diff --git a/database/updateOccupancyTypeField.ts b/database/updateOccupancyTypeField.ts index 5298d836..818b12a4 100644 --- a/database/updateOccupancyTypeField.ts +++ b/database/updateOccupancyTypeField.ts @@ -6,6 +6,7 @@ export interface UpdateOccupancyTypeFieldForm { occupancyTypeFieldId: number | string occupancyTypeField: string isRequired: '0' | '1' + fieldType?: string minimumLength?: string maximumLength?: string pattern?: string @@ -23,6 +24,7 @@ export default async function updateOccupancyTypeField( `update OccupancyTypeFields set occupancyTypeField = ?, isRequired = ?, + fieldType = ?, minimumLength = ?, maximumLength = ?, pattern = ?, @@ -35,6 +37,7 @@ export default async function updateOccupancyTypeField( .run( occupancyTypeFieldForm.occupancyTypeField, Number.parseInt(occupancyTypeFieldForm.isRequired, 10), + occupancyTypeFieldForm.fieldType ?? 'text', occupancyTypeFieldForm.minimumLength ?? 0, occupancyTypeFieldForm.maximumLength ?? 100, occupancyTypeFieldForm.pattern ?? '', diff --git a/eslint.config.js b/eslint.config.js index 34ce519e..7808669c 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -2,7 +2,8 @@ import { configWebApp, tseslint } from 'eslint-config-cityssm'; export const config = tseslint.config(...configWebApp, { languageOptions: { parserOptions: { - project: ['./tsconfig.json', './tsconfig.client.json'] + // eslint-disable-next-line @cspell/spellchecker + project: ['./tsconfig.json', './public/javascripts/tsconfig.json'] } } }); diff --git a/eslint.config.ts b/eslint.config.ts index 77970206..a7c6394a 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -3,7 +3,8 @@ import { configWebApp, tseslint } from 'eslint-config-cityssm' export const config = tseslint.config(...configWebApp, { languageOptions: { parserOptions: { - project: ['./tsconfig.json', './tsconfig.client.json'] + // eslint-disable-next-line @cspell/spellchecker + project: ['./tsconfig.json', './public/javascripts/tsconfig.json'] } } }) diff --git a/handlers/admin-get/database.d.ts b/handlers/admin-get/database.d.ts index 32c1ea1c..f4584afd 100644 --- a/handlers/admin-get/database.d.ts +++ b/handlers/admin-get/database.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): void; diff --git a/handlers/admin-get/fees.d.ts b/handlers/admin-get/fees.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/admin-get/fees.d.ts +++ b/handlers/admin-get/fees.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/admin-get/lotTypes.d.ts b/handlers/admin-get/lotTypes.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/admin-get/lotTypes.d.ts +++ b/handlers/admin-get/lotTypes.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/admin-get/ntfyStartup.d.ts b/handlers/admin-get/ntfyStartup.d.ts index 32c1ea1c..f4584afd 100644 --- a/handlers/admin-get/ntfyStartup.d.ts +++ b/handlers/admin-get/ntfyStartup.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): void; diff --git a/handlers/admin-get/occupancyTypes.d.ts b/handlers/admin-get/occupancyTypes.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/admin-get/occupancyTypes.d.ts +++ b/handlers/admin-get/occupancyTypes.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/admin-get/tables.d.ts b/handlers/admin-get/tables.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/admin-get/tables.d.ts +++ b/handlers/admin-get/tables.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddFee.d.ts b/handlers/admin-post/doAddFee.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddFee.d.ts +++ b/handlers/admin-post/doAddFee.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddFeeCategory.d.ts b/handlers/admin-post/doAddFeeCategory.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddFeeCategory.d.ts +++ b/handlers/admin-post/doAddFeeCategory.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotOccupantType.d.ts b/handlers/admin-post/doAddLotOccupantType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddLotOccupantType.d.ts +++ b/handlers/admin-post/doAddLotOccupantType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotStatus.d.ts b/handlers/admin-post/doAddLotStatus.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddLotStatus.d.ts +++ b/handlers/admin-post/doAddLotStatus.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotType.d.ts b/handlers/admin-post/doAddLotType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddLotType.d.ts +++ b/handlers/admin-post/doAddLotType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotTypeField.d.ts b/handlers/admin-post/doAddLotTypeField.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddLotTypeField.d.ts +++ b/handlers/admin-post/doAddLotTypeField.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddOccupancyType.d.ts b/handlers/admin-post/doAddOccupancyType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddOccupancyType.d.ts +++ b/handlers/admin-post/doAddOccupancyType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddOccupancyTypeField.d.ts b/handlers/admin-post/doAddOccupancyTypeField.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddOccupancyTypeField.d.ts +++ b/handlers/admin-post/doAddOccupancyTypeField.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddOccupancyTypePrint.d.ts b/handlers/admin-post/doAddOccupancyTypePrint.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddOccupancyTypePrint.d.ts +++ b/handlers/admin-post/doAddOccupancyTypePrint.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts b/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddWorkOrderType.d.ts b/handlers/admin-post/doAddWorkOrderType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doAddWorkOrderType.d.ts +++ b/handlers/admin-post/doAddWorkOrderType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doBackupDatabase.d.ts b/handlers/admin-post/doBackupDatabase.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/admin-post/doBackupDatabase.d.ts +++ b/handlers/admin-post/doBackupDatabase.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doCleanupDatabase.d.ts b/handlers/admin-post/doCleanupDatabase.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doCleanupDatabase.d.ts +++ b/handlers/admin-post/doCleanupDatabase.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteFee.d.ts b/handlers/admin-post/doDeleteFee.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteFee.d.ts +++ b/handlers/admin-post/doDeleteFee.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteFeeCategory.d.ts b/handlers/admin-post/doDeleteFeeCategory.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteFeeCategory.d.ts +++ b/handlers/admin-post/doDeleteFeeCategory.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteLotOccupantType.d.ts b/handlers/admin-post/doDeleteLotOccupantType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteLotOccupantType.d.ts +++ b/handlers/admin-post/doDeleteLotOccupantType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteLotStatus.d.ts b/handlers/admin-post/doDeleteLotStatus.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteLotStatus.d.ts +++ b/handlers/admin-post/doDeleteLotStatus.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteLotType.d.ts b/handlers/admin-post/doDeleteLotType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteLotType.d.ts +++ b/handlers/admin-post/doDeleteLotType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteLotTypeField.d.ts b/handlers/admin-post/doDeleteLotTypeField.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteLotTypeField.d.ts +++ b/handlers/admin-post/doDeleteLotTypeField.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteOccupancyType.d.ts b/handlers/admin-post/doDeleteOccupancyType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteOccupancyType.d.ts +++ b/handlers/admin-post/doDeleteOccupancyType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteOccupancyTypeField.d.ts b/handlers/admin-post/doDeleteOccupancyTypeField.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteOccupancyTypeField.d.ts +++ b/handlers/admin-post/doDeleteOccupancyTypeField.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteOccupancyTypePrint.d.ts b/handlers/admin-post/doDeleteOccupancyTypePrint.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteOccupancyTypePrint.d.ts +++ b/handlers/admin-post/doDeleteOccupancyTypePrint.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts b/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doDeleteWorkOrderType.d.ts b/handlers/admin-post/doDeleteWorkOrderType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doDeleteWorkOrderType.d.ts +++ b/handlers/admin-post/doDeleteWorkOrderType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveFeeCategoryDown.d.ts b/handlers/admin-post/doMoveFeeCategoryDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveFeeCategoryDown.d.ts +++ b/handlers/admin-post/doMoveFeeCategoryDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveFeeCategoryUp.d.ts b/handlers/admin-post/doMoveFeeCategoryUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveFeeCategoryUp.d.ts +++ b/handlers/admin-post/doMoveFeeCategoryUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveFeeDown.d.ts b/handlers/admin-post/doMoveFeeDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveFeeDown.d.ts +++ b/handlers/admin-post/doMoveFeeDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveFeeUp.d.ts b/handlers/admin-post/doMoveFeeUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveFeeUp.d.ts +++ b/handlers/admin-post/doMoveFeeUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotOccupantTypeDown.d.ts b/handlers/admin-post/doMoveLotOccupantTypeDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotOccupantTypeDown.d.ts +++ b/handlers/admin-post/doMoveLotOccupantTypeDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotOccupantTypeUp.d.ts b/handlers/admin-post/doMoveLotOccupantTypeUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotOccupantTypeUp.d.ts +++ b/handlers/admin-post/doMoveLotOccupantTypeUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotStatusDown.d.ts b/handlers/admin-post/doMoveLotStatusDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotStatusDown.d.ts +++ b/handlers/admin-post/doMoveLotStatusDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotStatusUp.d.ts b/handlers/admin-post/doMoveLotStatusUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotStatusUp.d.ts +++ b/handlers/admin-post/doMoveLotStatusUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotTypeDown.d.ts b/handlers/admin-post/doMoveLotTypeDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotTypeDown.d.ts +++ b/handlers/admin-post/doMoveLotTypeDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotTypeFieldDown.d.ts b/handlers/admin-post/doMoveLotTypeFieldDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotTypeFieldDown.d.ts +++ b/handlers/admin-post/doMoveLotTypeFieldDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotTypeFieldUp.d.ts b/handlers/admin-post/doMoveLotTypeFieldUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotTypeFieldUp.d.ts +++ b/handlers/admin-post/doMoveLotTypeFieldUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveLotTypeUp.d.ts b/handlers/admin-post/doMoveLotTypeUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveLotTypeUp.d.ts +++ b/handlers/admin-post/doMoveLotTypeUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveOccupancyTypeDown.d.ts b/handlers/admin-post/doMoveOccupancyTypeDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveOccupancyTypeDown.d.ts +++ b/handlers/admin-post/doMoveOccupancyTypeDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldDown.d.ts b/handlers/admin-post/doMoveOccupancyTypeFieldDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveOccupancyTypeFieldDown.d.ts +++ b/handlers/admin-post/doMoveOccupancyTypeFieldDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldUp.d.ts b/handlers/admin-post/doMoveOccupancyTypeFieldUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveOccupancyTypeFieldUp.d.ts +++ b/handlers/admin-post/doMoveOccupancyTypeFieldUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveOccupancyTypePrintDown.d.ts b/handlers/admin-post/doMoveOccupancyTypePrintDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveOccupancyTypePrintDown.d.ts +++ b/handlers/admin-post/doMoveOccupancyTypePrintDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveOccupancyTypePrintUp.d.ts b/handlers/admin-post/doMoveOccupancyTypePrintUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveOccupancyTypePrintUp.d.ts +++ b/handlers/admin-post/doMoveOccupancyTypePrintUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveOccupancyTypeUp.d.ts b/handlers/admin-post/doMoveOccupancyTypeUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveOccupancyTypeUp.d.ts +++ b/handlers/admin-post/doMoveOccupancyTypeUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts b/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts +++ b/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts b/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts +++ b/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateFee.d.ts b/handlers/admin-post/doUpdateFee.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateFee.d.ts +++ b/handlers/admin-post/doUpdateFee.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateFeeAmount.d.ts b/handlers/admin-post/doUpdateFeeAmount.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateFeeAmount.d.ts +++ b/handlers/admin-post/doUpdateFeeAmount.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateFeeCategory.d.ts b/handlers/admin-post/doUpdateFeeCategory.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateFeeCategory.d.ts +++ b/handlers/admin-post/doUpdateFeeCategory.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateLotOccupantType.d.ts b/handlers/admin-post/doUpdateLotOccupantType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateLotOccupantType.d.ts +++ b/handlers/admin-post/doUpdateLotOccupantType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateLotStatus.d.ts b/handlers/admin-post/doUpdateLotStatus.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateLotStatus.d.ts +++ b/handlers/admin-post/doUpdateLotStatus.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateLotType.d.ts b/handlers/admin-post/doUpdateLotType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateLotType.d.ts +++ b/handlers/admin-post/doUpdateLotType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateLotTypeField.d.ts b/handlers/admin-post/doUpdateLotTypeField.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateLotTypeField.d.ts +++ b/handlers/admin-post/doUpdateLotTypeField.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateOccupancyType.d.ts b/handlers/admin-post/doUpdateOccupancyType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateOccupancyType.d.ts +++ b/handlers/admin-post/doUpdateOccupancyType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateOccupancyTypeField.d.ts b/handlers/admin-post/doUpdateOccupancyTypeField.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateOccupancyTypeField.d.ts +++ b/handlers/admin-post/doUpdateOccupancyTypeField.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts b/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateWorkOrderType.d.ts b/handlers/admin-post/doUpdateWorkOrderType.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/admin-post/doUpdateWorkOrderType.d.ts +++ b/handlers/admin-post/doUpdateWorkOrderType.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/api-get/milestoneICS.d.ts b/handlers/api-get/milestoneICS.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/api-get/milestoneICS.d.ts +++ b/handlers/api-get/milestoneICS.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/dashboard-get/dashboard.d.ts b/handlers/dashboard-get/dashboard.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/dashboard-get/dashboard.d.ts +++ b/handlers/dashboard-get/dashboard.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-get/edit.d.ts b/handlers/lotOccupancies-get/edit.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-get/edit.d.ts +++ b/handlers/lotOccupancies-get/edit.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-get/new.d.ts b/handlers/lotOccupancies-get/new.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-get/new.d.ts +++ b/handlers/lotOccupancies-get/new.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-get/search.d.ts b/handlers/lotOccupancies-get/search.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-get/search.d.ts +++ b/handlers/lotOccupancies-get/search.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-get/view.d.ts b/handlers/lotOccupancies-get/view.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-get/view.d.ts +++ b/handlers/lotOccupancies-get/view.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyComment.d.ts b/handlers/lotOccupancies-post/doAddLotOccupancyComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyComment.d.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyFee.d.ts b/handlers/lotOccupancies-post/doAddLotOccupancyFee.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyFee.d.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyFee.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyFeeCategory.d.ts b/handlers/lotOccupancies-post/doAddLotOccupancyFeeCategory.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyFeeCategory.d.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyFeeCategory.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.d.ts b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.d.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.d.ts b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.d.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doCopyLotOccupancy.d.ts b/handlers/lotOccupancies-post/doCopyLotOccupancy.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doCopyLotOccupancy.d.ts +++ b/handlers/lotOccupancies-post/doCopyLotOccupancy.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doCreateLotOccupancy.d.ts b/handlers/lotOccupancies-post/doCreateLotOccupancy.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doCreateLotOccupancy.d.ts +++ b/handlers/lotOccupancies-post/doCreateLotOccupancy.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancy.d.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancy.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancy.d.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancy.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.d.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.d.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.d.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.d.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.d.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.d.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.d.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.d.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doGetDynamicsGPDocument.d.ts b/handlers/lotOccupancies-post/doGetDynamicsGPDocument.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doGetDynamicsGPDocument.d.ts +++ b/handlers/lotOccupancies-post/doGetDynamicsGPDocument.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doGetFees.d.ts b/handlers/lotOccupancies-post/doGetFees.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doGetFees.d.ts +++ b/handlers/lotOccupancies-post/doGetFees.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doGetOccupancyTypeFields.d.ts b/handlers/lotOccupancies-post/doGetOccupancyTypeFields.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doGetOccupancyTypeFields.d.ts +++ b/handlers/lotOccupancies-post/doGetOccupancyTypeFields.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doSearchLotOccupancies.d.ts b/handlers/lotOccupancies-post/doSearchLotOccupancies.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doSearchLotOccupancies.d.ts +++ b/handlers/lotOccupancies-post/doSearchLotOccupancies.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doSearchPastOccupants.d.ts b/handlers/lotOccupancies-post/doSearchPastOccupants.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doSearchPastOccupants.d.ts +++ b/handlers/lotOccupancies-post/doSearchPastOccupants.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancy.d.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancy.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancy.d.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancy.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.d.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.d.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.d.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.d.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.d.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.d.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.d.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.d.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-get/edit.d.ts b/handlers/lots-get/edit.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-get/edit.d.ts +++ b/handlers/lots-get/edit.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-get/new.d.ts b/handlers/lots-get/new.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-get/new.d.ts +++ b/handlers/lots-get/new.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-get/next.d.ts b/handlers/lots-get/next.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-get/next.d.ts +++ b/handlers/lots-get/next.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-get/previous.d.ts b/handlers/lots-get/previous.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-get/previous.d.ts +++ b/handlers/lots-get/previous.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-get/search.d.ts b/handlers/lots-get/search.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-get/search.d.ts +++ b/handlers/lots-get/search.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-get/view.d.ts b/handlers/lots-get/view.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-get/view.d.ts +++ b/handlers/lots-get/view.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doAddLotComment.d.ts b/handlers/lots-post/doAddLotComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doAddLotComment.d.ts +++ b/handlers/lots-post/doAddLotComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doCreateLot.d.ts b/handlers/lots-post/doCreateLot.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doCreateLot.d.ts +++ b/handlers/lots-post/doCreateLot.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doDeleteLot.d.ts b/handlers/lots-post/doDeleteLot.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doDeleteLot.d.ts +++ b/handlers/lots-post/doDeleteLot.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doDeleteLotComment.d.ts b/handlers/lots-post/doDeleteLotComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doDeleteLotComment.d.ts +++ b/handlers/lots-post/doDeleteLotComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doGetLotTypeFields.d.ts b/handlers/lots-post/doGetLotTypeFields.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doGetLotTypeFields.d.ts +++ b/handlers/lots-post/doGetLotTypeFields.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doSearchLots.d.ts b/handlers/lots-post/doSearchLots.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doSearchLots.d.ts +++ b/handlers/lots-post/doSearchLots.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doUpdateLot.d.ts b/handlers/lots-post/doUpdateLot.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doUpdateLot.d.ts +++ b/handlers/lots-post/doUpdateLot.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/lots-post/doUpdateLotComment.d.ts b/handlers/lots-post/doUpdateLotComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/lots-post/doUpdateLotComment.d.ts +++ b/handlers/lots-post/doUpdateLotComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-get/edit.d.ts b/handlers/maps-get/edit.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-get/edit.d.ts +++ b/handlers/maps-get/edit.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-get/new.d.ts b/handlers/maps-get/new.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/maps-get/new.d.ts +++ b/handlers/maps-get/new.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/maps-get/next.d.ts b/handlers/maps-get/next.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-get/next.d.ts +++ b/handlers/maps-get/next.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-get/previous.d.ts b/handlers/maps-get/previous.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-get/previous.d.ts +++ b/handlers/maps-get/previous.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-get/search.d.ts b/handlers/maps-get/search.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/maps-get/search.d.ts +++ b/handlers/maps-get/search.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/maps-get/view.d.ts b/handlers/maps-get/view.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-get/view.d.ts +++ b/handlers/maps-get/view.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-post/doCreateMap.d.ts b/handlers/maps-post/doCreateMap.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-post/doCreateMap.d.ts +++ b/handlers/maps-post/doCreateMap.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-post/doDeleteMap.d.ts b/handlers/maps-post/doDeleteMap.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-post/doDeleteMap.d.ts +++ b/handlers/maps-post/doDeleteMap.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/maps-post/doUpdateMap.d.ts b/handlers/maps-post/doUpdateMap.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/maps-post/doUpdateMap.d.ts +++ b/handlers/maps-post/doUpdateMap.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/permissions.d.ts b/handlers/permissions.d.ts index 7f3dc715..ada22b9c 100644 --- a/handlers/permissions.d.ts +++ b/handlers/permissions.d.ts @@ -1,4 +1,3 @@ -/// import type { NextFunction, Request, Response } from 'express'; export declare function adminGetHandler(request: Request, response: Response, next: NextFunction): void; export declare function adminPostHandler(request: Request, response: Response, next: NextFunction): void; diff --git a/handlers/print-get/screen.d.ts b/handlers/print-get/screen.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/print-get/screen.d.ts +++ b/handlers/print-get/screen.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/reports-get/reportName.d.ts b/handlers/reports-get/reportName.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/reports-get/reportName.d.ts +++ b/handlers/reports-get/reportName.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/reports-get/search.d.ts b/handlers/reports-get/search.d.ts index b2102352..4bcb65f6 100644 --- a/handlers/reports-get/search.d.ts +++ b/handlers/reports-get/search.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/workOrders-get/edit.d.ts b/handlers/workOrders-get/edit.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-get/edit.d.ts +++ b/handlers/workOrders-get/edit.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-get/milestoneCalendar.d.ts b/handlers/workOrders-get/milestoneCalendar.d.ts index 18345a7d..d5e48cba 100644 --- a/handlers/workOrders-get/milestoneCalendar.d.ts +++ b/handlers/workOrders-get/milestoneCalendar.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-get/new.d.ts b/handlers/workOrders-get/new.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-get/new.d.ts +++ b/handlers/workOrders-get/new.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-get/outlook.d.ts b/handlers/workOrders-get/outlook.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-get/outlook.d.ts +++ b/handlers/workOrders-get/outlook.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-get/search.d.ts b/handlers/workOrders-get/search.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-get/search.d.ts +++ b/handlers/workOrders-get/search.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-get/view.d.ts b/handlers/workOrders-get/view.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-get/view.d.ts +++ b/handlers/workOrders-get/view.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doAddWorkOrderComment.d.ts b/handlers/workOrders-post/doAddWorkOrderComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doAddWorkOrderLot.d.ts b/handlers/workOrders-post/doAddWorkOrderLot.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doAddWorkOrderLot.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderLot.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts b/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doCloseWorkOrder.d.ts b/handlers/workOrders-post/doCloseWorkOrder.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.d.ts +++ b/handlers/workOrders-post/doCloseWorkOrder.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts b/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doCreateWorkOrder.d.ts b/handlers/workOrders-post/doCreateWorkOrder.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.d.ts +++ b/handlers/workOrders-post/doCreateWorkOrder.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doDeleteWorkOrder.d.ts b/handlers/workOrders-post/doDeleteWorkOrder.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrder.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts b/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts b/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts +++ b/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doReopenWorkOrder.d.ts b/handlers/workOrders-post/doReopenWorkOrder.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.d.ts +++ b/handlers/workOrders-post/doReopenWorkOrder.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doSearchWorkOrders.d.ts b/handlers/workOrders-post/doSearchWorkOrders.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.d.ts +++ b/handlers/workOrders-post/doSearchWorkOrders.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doUpdateLotStatus.d.ts b/handlers/workOrders-post/doUpdateLotStatus.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doUpdateLotStatus.d.ts +++ b/handlers/workOrders-post/doUpdateLotStatus.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doUpdateWorkOrder.d.ts b/handlers/workOrders-post/doUpdateWorkOrder.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrder.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts b/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts index 536d445f..19d32e4d 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts @@ -1,3 +1,2 @@ -/// import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/helpers/initializer.database.cemetery.js b/helpers/initializer.database.cemetery.js index ae024482..c1ebca28 100644 --- a/helpers/initializer.database.cemetery.js +++ b/helpers/initializer.database.cemetery.js @@ -131,6 +131,7 @@ export async function initializeCemeteryDatabase() { const deathAgePeriod = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: 'Death Age Period', + fieldType: 'select', occupancyTypeFieldValues: 'Years\nMonths\nDays\nStillborn', pattern: '', isRequired: '', diff --git a/helpers/initializer.database.cemetery.ts b/helpers/initializer.database.cemetery.ts index 32d60eba..a302a671 100644 --- a/helpers/initializer.database.cemetery.ts +++ b/helpers/initializer.database.cemetery.ts @@ -205,6 +205,7 @@ export async function initializeCemeteryDatabase(): Promise { const deathAgePeriod = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: 'Death Age Period', + fieldType: 'select', occupancyTypeFieldValues: 'Years\nMonths\nDays\nStillborn', pattern: '', isRequired: '', diff --git a/package-lock.json b/package-lock.json index 93102e11..9f33407d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,7 +80,7 @@ "bulma-tooltip": "^3.0.2", "cypress": "^13.15.1", "cypress-axe": "^1.5.0", - "eslint-config-cityssm": "^13.2.0", + "eslint-config-cityssm": "^14.0.0", "gulp": "^5.0.0", "gulp-sass": "^5.1.0", "nodemon": "^3.1.7", @@ -3202,9 +3202,9 @@ } }, "node_modules/@eslint-community/eslint-plugin-eslint-comments": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.0.tgz", - "integrity": "sha512-yljsWl5Qv3IkIRmJ38h3NrHXFCm4EUl55M8doGTF6hvzvFF8kRpextgSrg2dwHev9lzBZyafCr9RelGIyQm6fw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.1.tgz", + "integrity": "sha512-lb/Z/MzbTf7CaVYM9WCFNQZ4L1yi3ev2fsFPF99h31ljhSEyUoyEsKsNWiU+qD1glbYTDJdqgyaLKtyTkkqtuQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3438,9 +3438,9 @@ } }, "node_modules/@humanfs/core": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz", - "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -3448,13 +3448,13 @@ } }, "node_modules/@humanfs/node": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz", - "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==", + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanfs/core": "^0.19.0", + "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" }, "engines": { @@ -8120,17 +8120,17 @@ } }, "node_modules/eslint-config-cityssm": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/eslint-config-cityssm/-/eslint-config-cityssm-13.2.0.tgz", - "integrity": "sha512-gczN2gKf0E/kW3R9P3MqcAl2c/VAnZSffAB2KyFXb+yThgH51G0omCvBg58pHjuDU6cF38Z2tAESVeOgDaIqeg==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-cityssm/-/eslint-config-cityssm-14.0.0.tgz", + "integrity": "sha512-RLS0mniIK2r5evcqpcYq41SdVxRAy1h37Y3nr1OnqAVc3TWPlcB+HNj/nad9ovfm9NsXWCWKINYO63/BVNjgfg==", "dev": true, "license": "Unlicense", "dependencies": { "@cspell/eslint-plugin": "^8.15.4", - "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0", + "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1", "@eslint/js": "^9.13.0", "eslint": "^9.13.0", - "eslint-config-love": "^89.0.1", + "eslint-config-love": "^96.0.0", "eslint-plugin-import": "^2.31.0", "eslint-plugin-jsdoc": "^50.4.3", "eslint-plugin-n": "^17.11.1", @@ -8232,9 +8232,9 @@ } }, "node_modules/eslint-config-cityssm/node_modules/eslint-config-love": { - "version": "89.0.1", - "resolved": "https://registry.npmjs.org/eslint-config-love/-/eslint-config-love-89.0.1.tgz", - "integrity": "sha512-rtZOoxrdWpIBRlQGH9E3E6ACwAHMxznfImaR0zbgh/ESHLQFaa8w4Akx5JOqJsyA6KmtsrgWzhDY5KxjopSFew==", + "version": "96.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-love/-/eslint-config-love-96.0.0.tgz", + "integrity": "sha512-IoXpOWvPL8Me8zACmldwjknRfZ2HhA7HJ563mTaT4hEd5aPvecdOsvwTdGTJTYfeJPcZApIloMCyUJS1OjA1dA==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index f541e097..53bf5373 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "bulma-tooltip": "^3.0.2", "cypress": "^13.15.1", "cypress-axe": "^1.5.0", - "eslint-config-cityssm": "^13.2.0", + "eslint-config-cityssm": "^14.0.0", "gulp": "^5.0.0", "gulp-sass": "^5.1.0", "nodemon": "^3.1.7", diff --git a/public/html/adminLotTypes-editLotTypeField.html b/public/html/adminLotTypes-editLotTypeField.html index eadfba83..563630d1 100644 --- a/public/html/adminLotTypes-editLotTypeField.html +++ b/public/html/adminLotTypes-editLotTypeField.html @@ -56,6 +56,23 @@
+
+ +
+
+ +
+
+
diff --git a/public/html/adminOccupancyTypes-editOccupancyTypeField.html b/public/html/adminOccupancyTypes-editOccupancyTypeField.html index bdd5853a..65b4f8f5 100644 --- a/public/html/adminOccupancyTypes-editOccupancyTypeField.html +++ b/public/html/adminOccupancyTypes-editOccupancyTypeField.html @@ -61,6 +61,23 @@
+
+ +
+
+ +
+
+
diff --git a/public/javascripts/adminLotTypes.js b/public/javascripts/adminLotTypes.js index 5e15f5b7..8b96abc4 100644 --- a/public/javascripts/adminLotTypes.js +++ b/public/javascripts/adminLotTypes.js @@ -60,9 +60,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } function openEditLotType(clickEvent) { const lotTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--lotType').dataset.lotTypeId ?? '', 10); - const lotType = lotTypes.find((currentLotType) => { - return lotTypeId === currentLotType.lotTypeId; - }); + const lotType = lotTypes.find((currentLotType) => lotTypeId === currentLotType.lotTypeId); let editCloseModalFunction; function doEdit(submitEvent) { submitEvent.preventDefault(); @@ -136,12 +134,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); }, lotTypeResponseHandler); } function openEditLotTypeField(lotTypeId, lotTypeFieldId) { - const lotType = lotTypes.find((currentLotType) => { - return currentLotType.lotTypeId === lotTypeId; - }); - const lotTypeField = (lotType.lotTypeFields ?? []).find((currentLotTypeField) => { - return currentLotTypeField.lotTypeFieldId === lotTypeFieldId; - }); + const lotType = lotTypes.find((currentLotType) => currentLotType.lotTypeId === lotTypeId); + const lotTypeField = (lotType.lotTypeFields ?? []).find((currentLotTypeField) => currentLotTypeField.lotTypeFieldId === lotTypeFieldId); + let fieldTypeElement; let minimumLengthElement; let maximumLengthElement; let patternElement; @@ -151,15 +146,28 @@ Object.defineProperty(exports, "__esModule", { value: true }); maximumLengthElement.min = minimumLengthElement.value; } function toggleInputFields() { - if (lotTypeFieldValuesElement.value === '') { - minimumLengthElement.disabled = false; - maximumLengthElement.disabled = false; - patternElement.disabled = false; - } - else { - minimumLengthElement.disabled = true; - maximumLengthElement.disabled = true; - patternElement.disabled = true; + switch (fieldTypeElement.value) { + case 'date': { + minimumLengthElement.disabled = true; + maximumLengthElement.disabled = true; + patternElement.disabled = true; + lotTypeFieldValuesElement.disabled = true; + break; + } + case 'select': { + minimumLengthElement.disabled = true; + maximumLengthElement.disabled = true; + patternElement.disabled = true; + lotTypeFieldValuesElement.disabled = false; + break; + } + default: { + minimumLengthElement.disabled = false; + maximumLengthElement.disabled = false; + patternElement.disabled = false; + lotTypeFieldValuesElement.disabled = true; + break; + } } } function doUpdate(submitEvent) { @@ -200,6 +208,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); modalElement.querySelector('#lotTypeFieldEdit--lotTypeFieldId').value = lotTypeField.lotTypeFieldId.toString(); modalElement.querySelector('#lotTypeFieldEdit--lotTypeField').value = lotTypeField.lotTypeField ?? ''; modalElement.querySelector('#lotTypeFieldEdit--isRequired').value = lotTypeField.isRequired ? '1' : '0'; + fieldTypeElement = modalElement.querySelector('#lotTypeFieldEdit--fieldType'); + fieldTypeElement.value = lotTypeField.fieldType; minimumLengthElement = modalElement.querySelector('#lotTypeFieldEdit--minimumLength'); minimumLengthElement.value = lotTypeField.minimumLength?.toString() ?? ''; @@ -220,7 +230,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); modalElement.querySelector('form')?.addEventListener('submit', doUpdate); minimumLengthElement.addEventListener('keyup', updateMaximumLengthMin); updateMaximumLengthMin(); - lotTypeFieldValuesElement.addEventListener('keyup', toggleInputFields); + fieldTypeElement.addEventListener('change', toggleInputFields); modalElement .querySelector('#button--deleteLotTypeField') ?.addEventListener('click', confirmDoDelete); diff --git a/public/javascripts/adminLotTypes.ts b/public/javascripts/adminLotTypes.ts index fa10978d..1818a752 100644 --- a/public/javascripts/adminLotTypes.ts +++ b/public/javascripts/adminLotTypes.ts @@ -57,7 +57,9 @@ type ResponseJSON = ? '' : '' - const panelBlockElements = lotTypeElement.querySelectorAll('.panel-block') as NodeListOf + const panelBlockElements = lotTypeElement.querySelectorAll( + '.panel-block' + ) as NodeListOf for (const panelBlockElement of panelBlockElements) { panelBlockElement.classList.toggle('is-hidden') @@ -119,9 +121,9 @@ type ResponseJSON = 10 ) - const lotType = lotTypes.find((currentLotType) => { - return lotTypeId === currentLotType.lotTypeId - }) as LotType + const lotType = lotTypes.find( + (currentLotType) => lotTypeId === currentLotType.lotTypeId + ) as LotType let editCloseModalFunction: () => void @@ -264,16 +266,16 @@ type ResponseJSON = lotTypeId: number, lotTypeFieldId: number ): void { - const lotType = lotTypes.find((currentLotType) => { - return currentLotType.lotTypeId === lotTypeId - }) as LotType + const lotType = lotTypes.find( + (currentLotType) => currentLotType.lotTypeId === lotTypeId + ) as LotType const lotTypeField = (lotType.lotTypeFields ?? []).find( - (currentLotTypeField) => { - return currentLotTypeField.lotTypeFieldId === lotTypeFieldId - } + (currentLotTypeField) => + currentLotTypeField.lotTypeFieldId === lotTypeFieldId ) as LotTypeField + let fieldTypeElement: HTMLSelectElement let minimumLengthElement: HTMLInputElement let maximumLengthElement: HTMLInputElement let patternElement: HTMLInputElement @@ -286,14 +288,28 @@ type ResponseJSON = } function toggleInputFields(): void { - if (lotTypeFieldValuesElement.value === '') { - minimumLengthElement.disabled = false - maximumLengthElement.disabled = false - patternElement.disabled = false - } else { - minimumLengthElement.disabled = true - maximumLengthElement.disabled = true - patternElement.disabled = true + switch (fieldTypeElement.value) { + case 'date': { + minimumLengthElement.disabled = true + maximumLengthElement.disabled = true + patternElement.disabled = true + lotTypeFieldValuesElement.disabled = true + break + } + case 'select': { + minimumLengthElement.disabled = true + maximumLengthElement.disabled = true + patternElement.disabled = true + lotTypeFieldValuesElement.disabled = false + break + } + default: { + minimumLengthElement.disabled = false + maximumLengthElement.disabled = false + patternElement.disabled = false + lotTypeFieldValuesElement.disabled = true + break + } } } @@ -363,6 +379,12 @@ type ResponseJSON = ) as HTMLSelectElement ).value = lotTypeField.isRequired ? '1' : '0' + fieldTypeElement = modalElement.querySelector( + '#lotTypeFieldEdit--fieldType' + ) as HTMLSelectElement + + fieldTypeElement.value = lotTypeField.fieldType + minimumLengthElement = modalElement.querySelector( '#lotTypeFieldEdit--minimumLength' ) as HTMLInputElement @@ -403,7 +425,7 @@ type ResponseJSON = minimumLengthElement.addEventListener('keyup', updateMaximumLengthMin) updateMaximumLengthMin() - lotTypeFieldValuesElement.addEventListener('keyup', toggleInputFields) + fieldTypeElement.addEventListener('change', toggleInputFields) modalElement .querySelector('#button--deleteLotTypeField') diff --git a/public/javascripts/adminOccupancyTypes.js b/public/javascripts/adminOccupancyTypes.js index 452739c6..4ae3cc7a 100644 --- a/public/javascripts/adminOccupancyTypes.js +++ b/public/javascripts/adminOccupancyTypes.js @@ -151,6 +151,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); : allOccupancyTypeFields).find((currentOccupancyTypeField) => { return (currentOccupancyTypeField.occupancyTypeFieldId === occupancyTypeFieldId); }); + let fieldTypeElement; let minimumLengthElement; let maximumLengthElement; let patternElement; @@ -160,15 +161,28 @@ Object.defineProperty(exports, "__esModule", { value: true }); maximumLengthElement.min = minimumLengthElement.value; } function toggleInputFields() { - if (occupancyTypeFieldValuesElement.value === '') { - minimumLengthElement.disabled = false; - maximumLengthElement.disabled = false; - patternElement.disabled = false; - } - else { - minimumLengthElement.disabled = true; - maximumLengthElement.disabled = true; - patternElement.disabled = true; + switch (fieldTypeElement.value) { + case 'date': { + minimumLengthElement.disabled = true; + maximumLengthElement.disabled = true; + patternElement.disabled = true; + occupancyTypeFieldValuesElement.disabled = true; + break; + } + case 'select': { + minimumLengthElement.disabled = true; + maximumLengthElement.disabled = true; + patternElement.disabled = true; + occupancyTypeFieldValuesElement.disabled = false; + break; + } + default: { + minimumLengthElement.disabled = false; + maximumLengthElement.disabled = false; + patternElement.disabled = false; + occupancyTypeFieldValuesElement.disabled = true; + break; + } } } function doUpdate(submitEvent) { @@ -209,6 +223,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); modalElement.querySelector('#occupancyTypeFieldEdit--occupancyTypeFieldId').value = occupancyTypeField.occupancyTypeFieldId.toString(); modalElement.querySelector('#occupancyTypeFieldEdit--occupancyTypeField').value = occupancyTypeField.occupancyTypeField ?? ''; modalElement.querySelector('#occupancyTypeFieldEdit--isRequired').value = occupancyTypeField.isRequired ?? false ? '1' : '0'; + fieldTypeElement = modalElement.querySelector('#occupancyTypeFieldEdit--fieldType'); + fieldTypeElement.value = occupancyTypeField.fieldType; minimumLengthElement = modalElement.querySelector('#occupancyTypeFieldEdit--minimumLength'); minimumLengthElement.value = occupancyTypeField.minimumLength?.toString() ?? ''; @@ -230,7 +246,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); modalElement.querySelector('form')?.addEventListener('submit', doUpdate); minimumLengthElement.addEventListener('keyup', updateMaximumLengthMin); updateMaximumLengthMin(); - occupancyTypeFieldValuesElement.addEventListener('keyup', toggleInputFields); + fieldTypeElement.addEventListener('change', toggleInputFields); modalElement .querySelector('#button--deleteOccupancyTypeField') ?.addEventListener('click', confirmDoDelete); diff --git a/public/javascripts/adminOccupancyTypes.ts b/public/javascripts/adminOccupancyTypes.ts index 2866fedd..791d1023 100644 --- a/public/javascripts/adminOccupancyTypes.ts +++ b/public/javascripts/adminOccupancyTypes.ts @@ -5,7 +5,10 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { LOS } from '../../types/globalTypes.js' -import type { OccupancyType, OccupancyTypeField } from '../../types/recordTypes.js' +import type { + OccupancyType, + OccupancyTypeField +} from '../../types/recordTypes.js' declare const cityssm: cityssmGlobal declare const bulmaJS: BulmaJS @@ -301,6 +304,7 @@ type ResponseJSON = ) }) as OccupancyTypeField + let fieldTypeElement: HTMLSelectElement let minimumLengthElement: HTMLInputElement let maximumLengthElement: HTMLInputElement let patternElement: HTMLInputElement @@ -313,14 +317,28 @@ type ResponseJSON = } function toggleInputFields(): void { - if (occupancyTypeFieldValuesElement.value === '') { - minimumLengthElement.disabled = false - maximumLengthElement.disabled = false - patternElement.disabled = false - } else { - minimumLengthElement.disabled = true - maximumLengthElement.disabled = true - patternElement.disabled = true + switch (fieldTypeElement.value) { + case 'date': { + minimumLengthElement.disabled = true + maximumLengthElement.disabled = true + patternElement.disabled = true + occupancyTypeFieldValuesElement.disabled = true + break + } + case 'select': { + minimumLengthElement.disabled = true + maximumLengthElement.disabled = true + patternElement.disabled = true + occupancyTypeFieldValuesElement.disabled = false + break + } + default: { + minimumLengthElement.disabled = false + maximumLengthElement.disabled = false + patternElement.disabled = false + occupancyTypeFieldValuesElement.disabled = true + break + } } } @@ -390,6 +408,12 @@ type ResponseJSON = ) as HTMLSelectElement ).value = occupancyTypeField.isRequired ?? false ? '1' : '0' + fieldTypeElement = modalElement.querySelector( + '#occupancyTypeFieldEdit--fieldType' + ) as HTMLSelectElement + + fieldTypeElement.value = occupancyTypeField.fieldType + minimumLengthElement = modalElement.querySelector( '#occupancyTypeFieldEdit--minimumLength' ) as HTMLInputElement @@ -431,10 +455,7 @@ type ResponseJSON = minimumLengthElement.addEventListener('keyup', updateMaximumLengthMin) updateMaximumLengthMin() - occupancyTypeFieldValuesElement.addEventListener( - 'keyup', - toggleInputFields - ) + fieldTypeElement.addEventListener('change', toggleInputFields) modalElement .querySelector('#button--deleteOccupancyTypeField') @@ -711,7 +732,9 @@ type ResponseJSON = const printTitle = printEJS === '*' ? '(All Available Prints)' - : ((exports.occupancyTypePrintTitles as string[])[printEJS] as string) + : ((exports.occupancyTypePrintTitles as string[])[ + printEJS + ] as string) let printIconClass = 'fa-star' diff --git a/public/javascripts/lotOccupancyEdit.js b/public/javascripts/lotOccupancyEdit.js index 375b4164..b092db78 100644 --- a/public/javascripts/lotOccupancyEdit.js +++ b/public/javascripts/lotOccupancyEdit.js @@ -1,6 +1,4 @@ "use strict"; -/* eslint-disable @eslint-community/eslint-comments/disable-enable-pair */ -/* eslint-disable unicorn/prefer-module */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { const los = exports.los; @@ -222,24 +220,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); fieldElement.className = 'field'; fieldElement.innerHTML = `
`; fieldElement.querySelector('label').textContent = occupancyTypeField.occupancyTypeField; - if ((occupancyTypeField.occupancyTypeFieldValues ?? '') === '') { - const inputElement = document.createElement('input'); - inputElement.className = 'input'; - inputElement.id = fieldId; - inputElement.name = fieldName; - inputElement.type = 'text'; - inputElement.required = occupancyTypeField.isRequired; - inputElement.minLength = - occupancyTypeField.minimumLength; - inputElement.maxLength = - occupancyTypeField.maximumLength; - if ((occupancyTypeField.pattern ?? '') !== '') { - inputElement.pattern = occupancyTypeField.pattern; - } - ; - fieldElement.querySelector('.control').append(inputElement); - } - else { + if (occupancyTypeField.fieldType === 'select' || + (occupancyTypeField.occupancyTypeFieldValues ?? '') !== '') { ; fieldElement.querySelector('.control').innerHTML = `
- - <% let statusIsFound = false; %> - <% for (const lotStatus of lotStatuses) { %> - <% - if (lot.lotStatusId === lotStatus.lotStatusId) { - statusIsFound = true; - } - %> - - <% } %> - <% if (lot.lotStatusId && !statusIsFound) { %> - - <% } %> - -
+
+
+
+
@@ -201,60 +201,61 @@

<% } else { %> - <% let lotTypeFieldIds = ""; %> - <% for (const lotField of lot.lotFields) { %> - <% lotTypeFieldIds += "," + lotField.lotTypeFieldId; %> -
- -
- <% if (!lotField.lotTypeFieldValues || lotField.lotTypeFieldValues === "") { %> - - pattern="<%= lotField.pattern %>" - <% } %> - minlength="<%= lotField.minimumLength %>" - maxlength="<%= lotField.maximumLength %>" - <%= lotField.isRequired ? " required" : "" %> /> - <% } else { %> - <% - const fieldValues = lotField.lotTypeFieldValues.split("\n"); - let valueFound = false; - %> -
- -
- <% } %> -
-
- <% } %> - + <% let lotTypeFieldIds = ""; %> + <% for (const lotField of lot.lotFields) { %> + <% lotTypeFieldIds += "," + lotField.lotTypeFieldId; %> +
+ +
+ <% if (lotField.fieldType === 'select' || (lotField.lotTypeFieldValues ?? '') !== "") { %> + + <% + const fieldValues = lotField.lotTypeFieldValues.split("\n"); + let valueFound = false; + %> +
+ +
+ <% } else { %> + + pattern="<%= lotField.pattern %>" + <% } %> + minlength="<%= lotField.minimumLength %>" + maxlength="<%= lotField.maximumLength %>" + <%= lotField.isRequired ? " required" : "" %> /> + <% } %> +
+
+ <% } %> + <% } %>
diff --git a/views/lotOccupancy-edit.ejs b/views/lotOccupancy-edit.ejs index ac55bfd4..567f77fb 100644 --- a/views/lotOccupancy-edit.ejs +++ b/views/lotOccupancy-edit.ejs @@ -242,70 +242,70 @@
<% if (isCreate) { %> -
-

- Select the <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> type to load the available fields. -

-
+
+

+ Select the <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> type to load the available fields. +

+
<% } else if (lotOccupancy.lotOccupancyFields.length === 0) { %> -
-

- The current <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> type has no additional fields. -

-
+
+

+ The current <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> type has no additional fields. +

+
<% } else { %> <% let occupancyTypeFieldIds = ""; %> <% for (const lotOccupancyField of lotOccupancy.lotOccupancyFields) { %> - <% occupancyTypeFieldIds += "," + lotOccupancyField.occupancyTypeFieldId; %> -
- -
- <% if (!lotOccupancyField.occupancyTypeFieldValues || lotOccupancyField.occupancyTypeFieldValues === "") { %> - - pattern="<%= lotOccupancyField.pattern %>" - <% } %> - minlength="<%= lotOccupancyField.minimumLength %>" - maxlength="<%= lotOccupancyField.maximumLength %>" - <%= lotOccupancyField.isRequired ? " required" : "" %> /> - <% } else { %> - <% - const fieldValues = lotOccupancyField.occupancyTypeFieldValues.split("\n"); - let valueFound = false; - %> -
- -
+ <% occupancyTypeFieldIds += "," + lotOccupancyField.occupancyTypeFieldId; %> +
+ +
+ <% if (lotOccupancyField.fieldType === 'select' || (lotOccupancyField.occupancyTypeFieldValues ?? '') !== "") { %> + <% + const fieldValues = lotOccupancyField.occupancyTypeFieldValues.split("\n"); + let valueFound = false; + %> +
+
+ <% } else { %> + + pattern="<%= lotOccupancyField.pattern %>" + <% } %> + minlength="<%= lotOccupancyField.minimumLength %>" + maxlength="<%= lotOccupancyField.maximumLength %>" + <%= lotOccupancyField.isRequired ? " required" : "" %> /> + <% } %>
+
<% } %> <% } %>