From ab6ee7a9e282e4ca91aadba2076f77b67c828241 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Tue, 15 Apr 2025 13:20:06 -0400 Subject: [PATCH] linting --- handlers/admin-post/doCleanupDatabase.ts | 1 + handlers/admin-post/doDeleteBurialSiteStatus.ts | 1 + handlers/admin-post/doDeleteBurialSiteType.ts | 1 + .../admin-post/doDeleteBurialSiteTypeField.ts | 1 + handlers/admin-post/doDeleteContractType.js | 4 ++-- handlers/admin-post/doDeleteContractType.ts | 7 ++++--- handlers/admin-post/doDeleteContractTypeField.js | 4 ++-- handlers/admin-post/doDeleteContractTypeField.ts | 5 +++-- handlers/admin-post/doDeleteContractTypePrint.js | 4 ++-- handlers/admin-post/doDeleteContractTypePrint.ts | 5 +++-- handlers/admin-post/doDeleteFee.ts | 1 + handlers/admin-post/doDeleteFeeCategory.ts | 1 + .../admin-post/doDeleteWorkOrderMilestoneType.ts | 1 + handlers/admin-post/doDeleteWorkOrderType.ts | 1 + handlers/admin-post/doMoveBurialSiteStatusDown.ts | 1 + .../workOrders-post/doAddWorkOrderContract.d.ts | 2 +- .../workOrders-post/doAddWorkOrderContract.js | 4 ++-- .../workOrders-post/doAddWorkOrderContract.ts | 6 +++--- public/javascripts/contract.search.ts | 1 + public/javascripts/funeralHome.search.js | 3 ++- public/javascripts/funeralHome.search.ts | 3 ++- public/javascripts/main.js | 13 ++++++++++--- public/javascripts/main.ts | 15 ++++++++++++--- 23 files changed, 58 insertions(+), 27 deletions(-) diff --git a/handlers/admin-post/doCleanupDatabase.ts b/handlers/admin-post/doCleanupDatabase.ts index 4bca68e2..4a6b517b 100644 --- a/handlers/admin-post/doCleanupDatabase.ts +++ b/handlers/admin-post/doCleanupDatabase.ts @@ -10,6 +10,7 @@ export default async function handler( response.json({ success: true, + inactivatedRecordCount: recordCounts.inactivatedRecordCount, purgedRecordCount: recordCounts.purgedRecordCount }) diff --git a/handlers/admin-post/doDeleteBurialSiteStatus.ts b/handlers/admin-post/doDeleteBurialSiteStatus.ts index 82802e4e..e97d33ed 100644 --- a/handlers/admin-post/doDeleteBurialSiteStatus.ts +++ b/handlers/admin-post/doDeleteBurialSiteStatus.ts @@ -17,6 +17,7 @@ export default async function handler( response.json({ success, + burialSiteStatuses }) } diff --git a/handlers/admin-post/doDeleteBurialSiteType.ts b/handlers/admin-post/doDeleteBurialSiteType.ts index 9116c6b5..1c19782e 100644 --- a/handlers/admin-post/doDeleteBurialSiteType.ts +++ b/handlers/admin-post/doDeleteBurialSiteType.ts @@ -17,6 +17,7 @@ export default async function handler( response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doDeleteBurialSiteTypeField.ts b/handlers/admin-post/doDeleteBurialSiteTypeField.ts index 9634e573..069ea8a6 100644 --- a/handlers/admin-post/doDeleteBurialSiteTypeField.ts +++ b/handlers/admin-post/doDeleteBurialSiteTypeField.ts @@ -17,6 +17,7 @@ export default async function handler( response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doDeleteContractType.js b/handlers/admin-post/doDeleteContractType.js index effa16bb..fc27f805 100644 --- a/handlers/admin-post/doDeleteContractType.js +++ b/handlers/admin-post/doDeleteContractType.js @@ -6,7 +6,7 @@ export default async function handler(request, response) { const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doDeleteContractType.ts b/handlers/admin-post/doDeleteContractType.ts index 6bf41699..ff95a1ba 100644 --- a/handlers/admin-post/doDeleteContractType.ts +++ b/handlers/admin-post/doDeleteContractType.ts @@ -12,7 +12,7 @@ export default async function handler( ): Promise { const success = await deleteRecord( 'ContractTypes', - request.body.contractTypeId as string, + request.body.contractTypeId, request.session.user as User ) @@ -21,7 +21,8 @@ export default async function handler( response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doDeleteContractTypeField.js b/handlers/admin-post/doDeleteContractTypeField.js index e2e4e743..0eddd97a 100644 --- a/handlers/admin-post/doDeleteContractTypeField.js +++ b/handlers/admin-post/doDeleteContractTypeField.js @@ -6,7 +6,7 @@ export default async function handler(request, response) { const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doDeleteContractTypeField.ts b/handlers/admin-post/doDeleteContractTypeField.ts index 20445508..2b5bdf3d 100644 --- a/handlers/admin-post/doDeleteContractTypeField.ts +++ b/handlers/admin-post/doDeleteContractTypeField.ts @@ -21,7 +21,8 @@ export default async function handler( response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doDeleteContractTypePrint.js b/handlers/admin-post/doDeleteContractTypePrint.js index f0b41e52..3f0812b5 100644 --- a/handlers/admin-post/doDeleteContractTypePrint.js +++ b/handlers/admin-post/doDeleteContractTypePrint.js @@ -6,7 +6,7 @@ export default async function handler(request, response) { const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doDeleteContractTypePrint.ts b/handlers/admin-post/doDeleteContractTypePrint.ts index 8bd75c04..de8d2731 100644 --- a/handlers/admin-post/doDeleteContractTypePrint.ts +++ b/handlers/admin-post/doDeleteContractTypePrint.ts @@ -25,7 +25,8 @@ export default async function handler( response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doDeleteFee.ts b/handlers/admin-post/doDeleteFee.ts index e00d48ad..d3127132 100644 --- a/handlers/admin-post/doDeleteFee.ts +++ b/handlers/admin-post/doDeleteFee.ts @@ -22,6 +22,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doDeleteFeeCategory.ts b/handlers/admin-post/doDeleteFeeCategory.ts index 21b29915..21bd4cd7 100644 --- a/handlers/admin-post/doDeleteFeeCategory.ts +++ b/handlers/admin-post/doDeleteFeeCategory.ts @@ -22,6 +22,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts b/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts index 838a0bca..d701b00e 100644 --- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts @@ -17,6 +17,7 @@ export default async function handler( response.json({ success, + workOrderMilestoneTypes }) } diff --git a/handlers/admin-post/doDeleteWorkOrderType.ts b/handlers/admin-post/doDeleteWorkOrderType.ts index 82e891cc..018c260c 100644 --- a/handlers/admin-post/doDeleteWorkOrderType.ts +++ b/handlers/admin-post/doDeleteWorkOrderType.ts @@ -17,6 +17,7 @@ export default async function handler( response.json({ success, + workOrderTypes }) } diff --git a/handlers/admin-post/doMoveBurialSiteStatusDown.ts b/handlers/admin-post/doMoveBurialSiteStatusDown.ts index 4272a0b3..11afa3d1 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusDown.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusDown.ts @@ -29,6 +29,7 @@ export default async function handler( response.json({ success, + burialSiteStatuses }) } diff --git a/handlers/workOrders-post/doAddWorkOrderContract.d.ts b/handlers/workOrders-post/doAddWorkOrderContract.d.ts index d4427103..e885d37e 100644 --- a/handlers/workOrders-post/doAddWorkOrderContract.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderContract.d.ts @@ -1,5 +1,5 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doAddWorkOrderContract.js b/handlers/workOrders-post/doAddWorkOrderContract.js index becd0334..4978fea6 100644 --- a/handlers/workOrders-post/doAddWorkOrderContract.js +++ b/handlers/workOrders-post/doAddWorkOrderContract.js @@ -2,8 +2,8 @@ import addWorkOrderContract from '../../database/addWorkOrderContract.js'; import getContracts from '../../database/getContracts.js'; export default async function handler(request, response) { const success = await addWorkOrderContract({ - workOrderId: request.body.workOrderId, - contractId: request.body.contractId + contractId: request.body.contractId, + workOrderId: request.body.workOrderId }, request.session.user); const results = await getContracts({ workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doAddWorkOrderContract.ts b/handlers/workOrders-post/doAddWorkOrderContract.ts index 6acfe7f8..a87bacc3 100644 --- a/handlers/workOrders-post/doAddWorkOrderContract.ts +++ b/handlers/workOrders-post/doAddWorkOrderContract.ts @@ -7,14 +7,14 @@ export default async function handler( request: Request< unknown, unknown, - { workOrderId: string; contractId: string } + { contractId: string; workOrderId: string; } >, response: Response ): Promise { const success = await addWorkOrderContract( { - workOrderId: request.body.workOrderId, - contractId: request.body.contractId + contractId: request.body.contractId, + workOrderId: request.body.workOrderId }, request.session.user as User ) diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts index bcaa6b22..698b48a6 100644 --- a/public/javascripts/contract.search.ts +++ b/public/javascripts/contract.search.ts @@ -1,6 +1,7 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { Contract } from '../../types/recordTypes.js' + import type { Sunrise } from './types.js' declare const cityssm: cityssmGlobal diff --git a/public/javascripts/funeralHome.search.js b/public/javascripts/funeralHome.search.js index 5ac76f88..16194629 100644 --- a/public/javascripts/funeralHome.search.js +++ b/public/javascripts/funeralHome.search.js @@ -42,7 +42,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); ? '' : `${cityssm.escapeHTML(funeralHome.funeralHomeAddress2 ?? '')}
`} ${funeralHome.funeralHomeCity || funeralHome.funeralHomeProvince - ? `${cityssm.escapeHTML(funeralHome.funeralHomeCity ?? '')}, ${cityssm.escapeHTML(funeralHome.funeralHomeProvince ?? '')}
` + ? `${cityssm.escapeHTML(funeralHome.funeralHomeCity ?? '')}, + ${cityssm.escapeHTML(funeralHome.funeralHomeProvince ?? '')}
` : ''} ${(funeralHome.funeralHomePostalCode ?? '') === '' ? '' diff --git a/public/javascripts/funeralHome.search.ts b/public/javascripts/funeralHome.search.ts index 51dba4b0..1f141d94 100644 --- a/public/javascripts/funeralHome.search.ts +++ b/public/javascripts/funeralHome.search.ts @@ -76,7 +76,8 @@ declare const exports: Record } ${ funeralHome.funeralHomeCity || funeralHome.funeralHomeProvince - ? `${cityssm.escapeHTML(funeralHome.funeralHomeCity ?? '')}, ${cityssm.escapeHTML(funeralHome.funeralHomeProvince ?? '')}
` + ? `${cityssm.escapeHTML(funeralHome.funeralHomeCity ?? '')}, + ${cityssm.escapeHTML(funeralHome.funeralHomeProvince ?? '')}
` : '' } ${ diff --git a/public/javascripts/main.js b/public/javascripts/main.js index b915c3b9..314a80a1 100644 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -73,9 +73,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); currentMarker = L.marker(mapCoordinates).addTo(map); } else { - const middleLatitude = (Number.parseFloat(options.latitudeElement.min) + Number.parseFloat(options.latitudeElement.max)) / 2; - const middleLongitude = (Number.parseFloat(options.longitudeElement.min) + Number.parseFloat(options.longitudeElement.max)) / 2; - const mapCoordinates = [middleLatitude, middleLongitude]; + const middleLatitude = (Number.parseFloat(options.latitudeElement.min) + + Number.parseFloat(options.latitudeElement.max)) / + 2; + const middleLongitude = (Number.parseFloat(options.longitudeElement.min) + + Number.parseFloat(options.longitudeElement.max)) / + 2; + const mapCoordinates = [ + middleLatitude, + middleLongitude + ]; map.setView(mapCoordinates, 5); } map.on('click', (clickEvent) => { diff --git a/public/javascripts/main.ts b/public/javascripts/main.ts index ada6c439..381c44ab 100644 --- a/public/javascripts/main.ts +++ b/public/javascripts/main.ts @@ -137,10 +137,19 @@ declare const exports: Record & { map.setView(mapCoordinates, sunrise.leafletConstants.defaultZoom) currentMarker = L.marker(mapCoordinates).addTo(map) } else { - const middleLatitude = (Number.parseFloat(options.latitudeElement.min) + Number.parseFloat(options.latitudeElement.max)) / 2 - const middleLongitude = (Number.parseFloat(options.longitudeElement.min) + Number.parseFloat(options.longitudeElement.max)) / 2 + const middleLatitude = + (Number.parseFloat(options.latitudeElement.min) + + Number.parseFloat(options.latitudeElement.max)) / + 2 + const middleLongitude = + (Number.parseFloat(options.longitudeElement.min) + + Number.parseFloat(options.longitudeElement.max)) / + 2 - const mapCoordinates: Leaflet.LatLngTuple = [middleLatitude, middleLongitude] + const mapCoordinates: Leaflet.LatLngTuple = [ + middleLatitude, + middleLongitude + ] map.setView(mapCoordinates, 5) }