diff --git a/database/moveContractTypePrintDown.d.ts b/database/moveContractTypePrintDown.d.ts new file mode 100644 index 00000000..9865d200 --- /dev/null +++ b/database/moveContractTypePrintDown.d.ts @@ -0,0 +1,3 @@ +export declare function moveContractTypePrintDown(contractTypeId: number | string, printEJS: string): Promise; +export declare function moveContractTypePrintDownToBottom(contractTypeId: number | string, printEJS: string): Promise; +export default moveContractTypePrintDown; diff --git a/database/moveOccupancyTypePrintDown.js b/database/moveContractTypePrintDown.js similarity index 88% rename from database/moveOccupancyTypePrintDown.js rename to database/moveContractTypePrintDown.js index 03e3109d..496049ab 100644 --- a/database/moveOccupancyTypePrintDown.js +++ b/database/moveContractTypePrintDown.js @@ -1,6 +1,6 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'; import { acquireConnection } from './pool.js'; -export async function moveOccupancyTypePrintDown(contractTypeId, printEJS) { +export async function moveContractTypePrintDown(contractTypeId, printEJS) { const database = await acquireConnection(); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') @@ -19,7 +19,7 @@ export async function moveOccupancyTypePrintDown(contractTypeId, printEJS) { clearCacheByTableName('ContractTypePrints'); return result.changes > 0; } -export async function moveOccupancyTypePrintDownToBottom(contractTypeId, printEJS) { +export async function moveContractTypePrintDownToBottom(contractTypeId, printEJS) { const database = await acquireConnection(); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') @@ -38,7 +38,7 @@ export async function moveOccupancyTypePrintDownToBottom(contractTypeId, printEJ and printEJS = ?`) .run(maxOrderNumber, contractTypeId, printEJS); database - .prepare(`update ContractTypeFields + .prepare(`update ContractTypePrints set orderNumber = orderNumber - 1 where recordDelete_timeMillis is null and contractTypeId = ? @@ -49,4 +49,4 @@ export async function moveOccupancyTypePrintDownToBottom(contractTypeId, printEJ clearCacheByTableName('ContractTypePrints'); return true; } -export default moveOccupancyTypePrintDown; +export default moveContractTypePrintDown; diff --git a/database/moveOccupancyTypePrintDown.ts b/database/moveContractTypePrintDown.ts similarity index 92% rename from database/moveOccupancyTypePrintDown.ts rename to database/moveContractTypePrintDown.ts index 8e1609c6..662b9b7c 100644 --- a/database/moveOccupancyTypePrintDown.ts +++ b/database/moveContractTypePrintDown.ts @@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js' import { acquireConnection } from './pool.js' -export async function moveOccupancyTypePrintDown( +export async function moveContractTypePrintDown( contractTypeId: number | string, printEJS: string ): Promise { @@ -39,7 +39,7 @@ export async function moveOccupancyTypePrintDown( return result.changes > 0 } -export async function moveOccupancyTypePrintDownToBottom( +export async function moveContractTypePrintDownToBottom( contractTypeId: number | string, printEJS: string ): Promise { @@ -76,7 +76,7 @@ export async function moveOccupancyTypePrintDownToBottom( database .prepare( - `update ContractTypeFields + `update ContractTypePrints set orderNumber = orderNumber - 1 where recordDelete_timeMillis is null and contractTypeId = ? @@ -92,4 +92,4 @@ export async function moveOccupancyTypePrintDownToBottom( return true } -export default moveOccupancyTypePrintDown +export default moveContractTypePrintDown diff --git a/database/moveContractTypePrintUp.d.ts b/database/moveContractTypePrintUp.d.ts new file mode 100644 index 00000000..704ac512 --- /dev/null +++ b/database/moveContractTypePrintUp.d.ts @@ -0,0 +1,3 @@ +export declare function moveContractTypePrintUp(contractTypeId: number | string, printEJS: string): Promise; +export declare function moveContractTypePrintUpToTop(contractTypeId: number | string, printEJS: string): Promise; +export default moveContractTypePrintUp; diff --git a/database/moveOccupancyTypePrintUp.js b/database/moveContractTypePrintUp.js similarity index 90% rename from database/moveOccupancyTypePrintUp.js rename to database/moveContractTypePrintUp.js index 98d1d17b..907cf331 100644 --- a/database/moveOccupancyTypePrintUp.js +++ b/database/moveContractTypePrintUp.js @@ -1,6 +1,6 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'; import { acquireConnection } from './pool.js'; -export async function moveOccupancyTypePrintUp(contractTypeId, printEJS) { +export async function moveContractTypePrintUp(contractTypeId, printEJS) { const database = await acquireConnection(); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') @@ -23,7 +23,7 @@ export async function moveOccupancyTypePrintUp(contractTypeId, printEJS) { clearCacheByTableName('ContractTypePrints'); return result.changes > 0; } -export async function moveOccupancyTypePrintUpToTop(contractTypeId, printEJS) { +export async function moveContractTypePrintUpToTop(contractTypeId, printEJS) { const database = await acquireConnection(); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') @@ -47,4 +47,4 @@ export async function moveOccupancyTypePrintUpToTop(contractTypeId, printEJS) { clearCacheByTableName('ContractTypePrints'); return true; } -export default moveOccupancyTypePrintUp; +export default moveContractTypePrintUp; diff --git a/database/moveOccupancyTypePrintUp.ts b/database/moveContractTypePrintUp.ts similarity index 93% rename from database/moveOccupancyTypePrintUp.ts rename to database/moveContractTypePrintUp.ts index 30abea1b..f97e1b21 100644 --- a/database/moveOccupancyTypePrintUp.ts +++ b/database/moveContractTypePrintUp.ts @@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js' import { acquireConnection } from './pool.js' -export async function moveOccupancyTypePrintUp( +export async function moveContractTypePrintUp( contractTypeId: number | string, printEJS: string ): Promise { @@ -44,7 +44,7 @@ export async function moveOccupancyTypePrintUp( return result.changes > 0 } -export async function moveOccupancyTypePrintUpToTop( +export async function moveContractTypePrintUpToTop( contractTypeId: number | string, printEJS: string ): Promise { @@ -86,4 +86,4 @@ export async function moveOccupancyTypePrintUpToTop( return true } -export default moveOccupancyTypePrintUp +export default moveContractTypePrintUp diff --git a/database/moveOccupancyTypePrintDown.d.ts b/database/moveOccupancyTypePrintDown.d.ts deleted file mode 100644 index 1f2bbbc2..00000000 --- a/database/moveOccupancyTypePrintDown.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare function moveOccupancyTypePrintDown(contractTypeId: number | string, printEJS: string): Promise; -export declare function moveOccupancyTypePrintDownToBottom(contractTypeId: number | string, printEJS: string): Promise; -export default moveOccupancyTypePrintDown; diff --git a/database/moveOccupancyTypePrintUp.d.ts b/database/moveOccupancyTypePrintUp.d.ts deleted file mode 100644 index 44878f13..00000000 --- a/database/moveOccupancyTypePrintUp.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare function moveOccupancyTypePrintUp(contractTypeId: number | string, printEJS: string): Promise; -export declare function moveOccupancyTypePrintUpToTop(contractTypeId: number | string, printEJS: string): Promise; -export default moveOccupancyTypePrintUp; diff --git a/handlers/admin-get/burialSiteTypes.js b/handlers/admin-get/burialSiteTypes.js index 17e30b03..4822da12 100644 --- a/handlers/admin-get/burialSiteTypes.js +++ b/handlers/admin-get/burialSiteTypes.js @@ -1,9 +1,8 @@ import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -import { getConfigProperty } from '../../helpers/config.helpers.js'; export default async function handler(_request, response) { const lotTypes = await getBurialSiteTypes(); - response.render('admin-lotTypes', { - headTitle: `${getConfigProperty('aliases.lot')} Type Management`, + response.render('admin-burialSiteTypes', { + headTitle: `Burial Site Type Management`, lotTypes }); } diff --git a/handlers/admin-get/burialSiteTypes.ts b/handlers/admin-get/burialSiteTypes.ts index 363f3629..a951f838 100644 --- a/handlers/admin-get/burialSiteTypes.ts +++ b/handlers/admin-get/burialSiteTypes.ts @@ -1,7 +1,6 @@ import type { Request, Response } from 'express' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -import { getConfigProperty } from '../../helpers/config.helpers.js' export default async function handler( _request: Request, @@ -9,8 +8,8 @@ export default async function handler( ): Promise { const lotTypes = await getBurialSiteTypes() - response.render('admin-lotTypes', { - headTitle: `${getConfigProperty('aliases.lot')} Type Management`, + response.render('admin-burialSiteTypes', { + headTitle: `Burial Site Type Management`, lotTypes }) } diff --git a/handlers/admin-get/occupancyTypes.d.ts b/handlers/admin-get/contractTypes.d.ts similarity index 100% rename from handlers/admin-get/occupancyTypes.d.ts rename to handlers/admin-get/contractTypes.d.ts diff --git a/handlers/admin-get/occupancyTypes.js b/handlers/admin-get/contractTypes.js similarity index 66% rename from handlers/admin-get/occupancyTypes.js rename to handlers/admin-get/contractTypes.js index 369886d9..38db0afb 100644 --- a/handlers/admin-get/occupancyTypes.js +++ b/handlers/admin-get/contractTypes.js @@ -1,20 +1,20 @@ -import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; +import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; import { getPrintConfig } from '../../helpers/functions.print.js'; export default async function handler(_request, response) { - const occupancyTypes = await getContractTypes(); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); - const ContractTypePrints = getConfigProperty('settings.lotOccupancy.prints'); + const contractTypePrints = getConfigProperty('settings.contracts.prints'); const occupancyTypePrintTitles = {}; - for (const printEJS of ContractTypePrints) { + for (const printEJS of contractTypePrints) { const printConfig = getPrintConfig(printEJS); if (printConfig !== undefined) { occupancyTypePrintTitles[printEJS] = printConfig.title; } } - response.render('admin-occupancyTypes', { - headTitle: `${getConfigProperty('aliases.occupancy')} Type Management`, - occupancyTypes, + response.render('admin-contractTypes', { + headTitle: `Contract Type Management`, + occupancyTypes: contractTypes, allContractTypeFields, occupancyTypePrintTitles }); diff --git a/handlers/admin-get/occupancyTypes.ts b/handlers/admin-get/contractTypes.ts similarity index 69% rename from handlers/admin-get/occupancyTypes.ts rename to handlers/admin-get/contractTypes.ts index 185f65fa..edefed91 100644 --- a/handlers/admin-get/occupancyTypes.ts +++ b/handlers/admin-get/contractTypes.ts @@ -1,24 +1,24 @@ import type { Request, Response } from 'express' +import { getConfigProperty } from '../../helpers/config.helpers.js' import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js' -import { getConfigProperty } from '../../helpers/config.helpers.js' import { getPrintConfig } from '../../helpers/functions.print.js' export default async function handler( _request: Request, response: Response ): Promise { - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() - const ContractTypePrints = getConfigProperty('settings.lotOccupancy.prints') + const contractTypePrints = getConfigProperty('settings.contracts.prints') const occupancyTypePrintTitles = {} - for (const printEJS of ContractTypePrints) { + for (const printEJS of contractTypePrints) { const printConfig = getPrintConfig(printEJS) if (printConfig !== undefined) { @@ -26,9 +26,9 @@ export default async function handler( } } - response.render('admin-occupancyTypes', { - headTitle: `${getConfigProperty('aliases.occupancy')} Type Management`, - occupancyTypes, + response.render('admin-contractTypes', { + headTitle: `Contract Type Management`, + occupancyTypes: contractTypes, allContractTypeFields, occupancyTypePrintTitles }) diff --git a/handlers/admin-get/fees.js b/handlers/admin-get/fees.js index 77c50247..c77d6d24 100644 --- a/handlers/admin-get/fees.js +++ b/handlers/admin-get/fees.js @@ -4,12 +4,12 @@ export default async function handler(_request, response) { const feeCategories = await getFeeCategories({}, { includeFees: true }); - const occupancyTypes = await getContractTypes(); - const lotTypes = await getBurialSiteTypes(); + const contractTypes = await getContractTypes(); + const burialSiteTypes = await getBurialSiteTypes(); response.render('admin-fees', { headTitle: 'Fee Management', feeCategories, - occupancyTypes, - lotTypes + contractTypes, + burialSiteTypes }); } diff --git a/handlers/admin-get/fees.ts b/handlers/admin-get/fees.ts index f50d1dcc..5cf07c94 100644 --- a/handlers/admin-get/fees.ts +++ b/handlers/admin-get/fees.ts @@ -17,13 +17,13 @@ export default async function handler( } ) - const occupancyTypes = await getContractTypes() - const lotTypes = await getBurialSiteTypes() + const contractTypes = await getContractTypes() + const burialSiteTypes = await getBurialSiteTypes() response.render('admin-fees', { headTitle: 'Fee Management', feeCategories, - occupancyTypes, - lotTypes + contractTypes, + burialSiteTypes }) } diff --git a/handlers/admin-get/tables.js b/handlers/admin-get/tables.js index 4de9df04..9caed8fd 100644 --- a/handlers/admin-get/tables.js +++ b/handlers/admin-get/tables.js @@ -1,17 +1,15 @@ import { getSolidIconClasses } from '@cityssm/font-awesome-v5-iconclasses'; -import { getLotOccupantTypes, getLotStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; +import { getBurialSiteStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; export default async function handler(_request, response) { const workOrderTypes = await getWorkOrderTypes(); const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); - const lotStatuses = await getLotStatuses(); - const lotOccupantTypes = await getLotOccupantTypes(); + const burialSiteStatuses = await getBurialSiteStatuses(); const fontAwesomeIconClasses = await getSolidIconClasses(); response.render('admin-tables', { headTitle: 'Config Table Management', workOrderTypes, workOrderMilestoneTypes, - lotStatuses, - lotOccupantTypes, + burialSiteStatuses, fontAwesomeIconClasses }); } diff --git a/handlers/admin-get/tables.ts b/handlers/admin-get/tables.ts index 65cbf19d..47f786f7 100644 --- a/handlers/admin-get/tables.ts +++ b/handlers/admin-get/tables.ts @@ -2,8 +2,7 @@ import { getSolidIconClasses } from '@cityssm/font-awesome-v5-iconclasses' import type { Request, Response } from 'express' import { - getLotOccupantTypes, - getLotStatuses, + getBurialSiteStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js' @@ -14,8 +13,7 @@ export default async function handler( ): Promise { const workOrderTypes = await getWorkOrderTypes() const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() - const lotStatuses = await getLotStatuses() - const lotOccupantTypes = await getLotOccupantTypes() + const burialSiteStatuses = await getBurialSiteStatuses() const fontAwesomeIconClasses = await getSolidIconClasses() @@ -23,8 +21,7 @@ export default async function handler( headTitle: 'Config Table Management', workOrderTypes, workOrderMilestoneTypes, - lotStatuses, - lotOccupantTypes, + burialSiteStatuses, fontAwesomeIconClasses }) } diff --git a/handlers/admin-post/doMoveLotOccupantTypeUp.d.ts b/handlers/admin-post/doAddBurialSiteStatus.d.ts similarity index 70% rename from handlers/admin-post/doMoveLotOccupantTypeUp.d.ts rename to handlers/admin-post/doAddBurialSiteStatus.d.ts index 1913fc80..c7c5d6a5 100644 --- a/handlers/admin-post/doMoveLotOccupantTypeUp.d.ts +++ b/handlers/admin-post/doAddBurialSiteStatus.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/admin-post/doAddBurialSiteStatus.js b/handlers/admin-post/doAddBurialSiteStatus.js new file mode 100644 index 00000000..dc6a0b45 --- /dev/null +++ b/handlers/admin-post/doAddBurialSiteStatus.js @@ -0,0 +1,11 @@ +import addRecord from '../../database/addRecord.js'; +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const burialSiteStatusId = await addRecord('BurialSiteStatuses', request.body.burialSiteStatus, request.body.orderNumber ?? -1, request.session.user); + const burialSiteStatuses = await getBurialSiteStatuses(); + response.json({ + success: true, + burialSiteStatusId, + burialSiteStatuses + }); +} diff --git a/handlers/admin-post/doAddBurialSiteStatus.ts b/handlers/admin-post/doAddBurialSiteStatus.ts new file mode 100644 index 00000000..ab0fb337 --- /dev/null +++ b/handlers/admin-post/doAddBurialSiteStatus.ts @@ -0,0 +1,28 @@ +import type { Request, Response } from 'express' + +import addRecord from '../../database/addRecord.js' +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' + +export default async function handler( + request: Request< + unknown, + unknown, + { burialSiteStatus: string; orderNumber?: string | number } + >, + response: Response +): Promise { + const burialSiteStatusId = await addRecord( + 'BurialSiteStatuses', + request.body.burialSiteStatus, + request.body.orderNumber ?? -1, + request.session.user as User + ) + + const burialSiteStatuses = await getBurialSiteStatuses() + + response.json({ + success: true, + burialSiteStatusId, + burialSiteStatuses + }) +} diff --git a/handlers/admin-post/doDeleteLotOccupantType.d.ts b/handlers/admin-post/doAddBurialSiteType.d.ts similarity index 73% rename from handlers/admin-post/doDeleteLotOccupantType.d.ts rename to handlers/admin-post/doAddBurialSiteType.d.ts index 0ab4d4a1..f36610e2 100644 --- a/handlers/admin-post/doDeleteLotOccupantType.d.ts +++ b/handlers/admin-post/doAddBurialSiteType.d.ts @@ -1,4 +1,5 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddBurialSiteType.js b/handlers/admin-post/doAddBurialSiteType.js new file mode 100644 index 00000000..fa3ea47b --- /dev/null +++ b/handlers/admin-post/doAddBurialSiteType.js @@ -0,0 +1,11 @@ +import addRecord from '../../database/addRecord.js'; +import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const burialSiteTypeId = await addRecord('BurialSiteTypes', request.body.lotType, request.body.orderNumber ?? -1, request.session.user); + const burialSiteTypes = await getBurialSiteTypes(); + response.json({ + success: true, + burialSiteTypeId, + burialSiteTypes + }); +} diff --git a/handlers/admin-post/doAddLotType.ts b/handlers/admin-post/doAddBurialSiteType.ts similarity index 61% rename from handlers/admin-post/doAddLotType.ts rename to handlers/admin-post/doAddBurialSiteType.ts index 3689bc5d..c5d4d11b 100644 --- a/handlers/admin-post/doAddLotType.ts +++ b/handlers/admin-post/doAddBurialSiteType.ts @@ -1,24 +1,28 @@ import type { Request, Response } from 'express' -import { addRecord } from '../../database/addRecord.js' +import addRecord from '../../database/addRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request< + unknown, + unknown, + { lotType: string; orderNumber?: string | number } + >, response: Response ): Promise { const burialSiteTypeId = await addRecord( - 'LotTypes', + 'BurialSiteTypes', request.body.lotType, request.body.orderNumber ?? -1, request.session.user as User ) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success: true, burialSiteTypeId, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doAddBurialSiteTypeField.d.ts b/handlers/admin-post/doAddBurialSiteTypeField.d.ts new file mode 100644 index 00000000..ec48ed71 --- /dev/null +++ b/handlers/admin-post/doAddBurialSiteTypeField.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type AddBurialSiteTypeFieldForm } from '../../database/addBurialSiteTypeField.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddBurialSiteTypeField.js b/handlers/admin-post/doAddBurialSiteTypeField.js new file mode 100644 index 00000000..8c7d189f --- /dev/null +++ b/handlers/admin-post/doAddBurialSiteTypeField.js @@ -0,0 +1,11 @@ +import addBurialSiteTypeField from '../../database/addBurialSiteTypeField.js'; +import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const burialSiteTypeFieldId = await addBurialSiteTypeField(request.body, request.session.user); + const burialSiteTypes = await getBurialSiteTypes(); + response.json({ + success: true, + burialSiteTypeFieldId, + burialSiteTypes + }); +} diff --git a/handlers/admin-post/doAddBurialSiteTypeField.ts b/handlers/admin-post/doAddBurialSiteTypeField.ts new file mode 100644 index 00000000..62a0dc5b --- /dev/null +++ b/handlers/admin-post/doAddBurialSiteTypeField.ts @@ -0,0 +1,24 @@ +import type { Request, Response } from 'express' + +import addBurialSiteTypeField, { + type AddBurialSiteTypeFieldForm +} from '../../database/addBurialSiteTypeField.js' +import { getBurialSiteTypes } from '../../helpers/functions.cache.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const burialSiteTypeFieldId = await addBurialSiteTypeField( + request.body, + request.session.user as User + ) + + const burialSiteTypes = await getBurialSiteTypes() + + response.json({ + success: true, + burialSiteTypeFieldId, + burialSiteTypes + }) +} diff --git a/handlers/admin-post/doMoveLotOccupantTypeDown.d.ts b/handlers/admin-post/doAddContractType.d.ts similarity index 72% rename from handlers/admin-post/doMoveLotOccupantTypeDown.d.ts rename to handlers/admin-post/doAddContractType.d.ts index 1913fc80..285a30a9 100644 --- a/handlers/admin-post/doMoveLotOccupantTypeDown.d.ts +++ b/handlers/admin-post/doAddContractType.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/admin-post/doAddOccupancyType.js b/handlers/admin-post/doAddContractType.js similarity index 54% rename from handlers/admin-post/doAddOccupancyType.js rename to handlers/admin-post/doAddContractType.js index a48b9b2f..824e6890 100644 --- a/handlers/admin-post/doAddOccupancyType.js +++ b/handlers/admin-post/doAddContractType.js @@ -1,13 +1,13 @@ -import { addRecord } from '../../database/addRecord.js'; +import addRecord from '../../database/addRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const contractTypeId = await addRecord('OccupancyTypes', request.body.occupancyType, request.body.orderNumber ?? -1, request.session.user); - const occupancyTypes = await getContractTypes(); + const contractTypeId = await addRecord('ContractTypes', request.body.contractType, request.body.orderNumber ?? -1, request.session.user); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success: true, contractTypeId, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doAddOccupancyType.ts b/handlers/admin-post/doAddContractType.ts similarity index 63% rename from handlers/admin-post/doAddOccupancyType.ts rename to handlers/admin-post/doAddContractType.ts index f8ed46af..12a798f2 100644 --- a/handlers/admin-post/doAddOccupancyType.ts +++ b/handlers/admin-post/doAddContractType.ts @@ -1,29 +1,33 @@ import type { Request, Response } from 'express' -import { addRecord } from '../../database/addRecord.js' +import addRecord from '../../database/addRecord.js' import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request< + unknown, + unknown, + { contractType: string; orderNumber?: number | string } + >, response: Response ): Promise { const contractTypeId = await addRecord( - 'OccupancyTypes', - request.body.occupancyType, + 'ContractTypes', + request.body.contractType, request.body.orderNumber ?? -1, request.session.user as User ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success: true, contractTypeId, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doAddContractTypeField.d.ts b/handlers/admin-post/doAddContractTypeField.d.ts new file mode 100644 index 00000000..36ac8a03 --- /dev/null +++ b/handlers/admin-post/doAddContractTypeField.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type AddContractTypeFieldForm } from '../../database/addContractTypeField.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddOccupancyTypeField.js b/handlers/admin-post/doAddContractTypeField.js similarity index 57% rename from handlers/admin-post/doAddOccupancyTypeField.js rename to handlers/admin-post/doAddContractTypeField.js index fadf8084..129c6d84 100644 --- a/handlers/admin-post/doAddOccupancyTypeField.js +++ b/handlers/admin-post/doAddContractTypeField.js @@ -1,13 +1,13 @@ -import addOccupancyTypeField from '../../database/addOccupancyTypeField.js'; +import addContractTypeField from '../../database/addContractTypeField.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const contractTypeFieldId = await addOccupancyTypeField(request.body, request.session.user); - const occupancyTypes = await getContractTypes(); + const contractTypeFieldId = await addContractTypeField(request.body, request.session.user); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success: true, contractTypeFieldId, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doAddOccupancyTypeField.ts b/handlers/admin-post/doAddContractTypeField.ts similarity index 57% rename from handlers/admin-post/doAddOccupancyTypeField.ts rename to handlers/admin-post/doAddContractTypeField.ts index 53c7c5ad..b6e4f053 100644 --- a/handlers/admin-post/doAddOccupancyTypeField.ts +++ b/handlers/admin-post/doAddContractTypeField.ts @@ -1,29 +1,29 @@ import type { Request, Response } from 'express' -import addOccupancyTypeField, { - type AddOccupancyTypeFieldForm -} from '../../database/addOccupancyTypeField.js' +import addContractTypeField, { + type AddContractTypeFieldForm +} from '../../database/addContractTypeField.js' import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request, response: Response ): Promise { - const contractTypeFieldId = await addOccupancyTypeField( - request.body as AddOccupancyTypeFieldForm, + const contractTypeFieldId = await addContractTypeField( + request.body, request.session.user as User ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success: true, contractTypeFieldId, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doAddContractTypePrint.d.ts b/handlers/admin-post/doAddContractTypePrint.d.ts new file mode 100644 index 00000000..5997eac0 --- /dev/null +++ b/handlers/admin-post/doAddContractTypePrint.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type AddContractTypePrintForm } from '../../database/addContractTypePrint.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddOccupancyTypePrint.js b/handlers/admin-post/doAddContractTypePrint.js similarity index 55% rename from handlers/admin-post/doAddOccupancyTypePrint.js rename to handlers/admin-post/doAddContractTypePrint.js index 8b2af43f..99ad96aa 100644 --- a/handlers/admin-post/doAddOccupancyTypePrint.js +++ b/handlers/admin-post/doAddContractTypePrint.js @@ -1,12 +1,12 @@ -import addOccupancyTypePrint from '../../database/addOccupancyTypePrint.js'; +import addContractTypePrint from '../../database/addContractTypePrint.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const success = await addOccupancyTypePrint(request.body, request.session.user); - const occupancyTypes = await getContractTypes(); + const success = await addContractTypePrint(request.body, request.session.user); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doAddOccupancyTypePrint.ts b/handlers/admin-post/doAddContractTypePrint.ts similarity index 56% rename from handlers/admin-post/doAddOccupancyTypePrint.ts rename to handlers/admin-post/doAddContractTypePrint.ts index 1da31a34..7f4684c6 100644 --- a/handlers/admin-post/doAddOccupancyTypePrint.ts +++ b/handlers/admin-post/doAddContractTypePrint.ts @@ -1,28 +1,28 @@ import type { Request, Response } from 'express' -import addOccupancyTypePrint, { - type AddOccupancyTypePrintForm -} from '../../database/addOccupancyTypePrint.js' +import addContractTypePrint, { + type AddContractTypePrintForm +} from '../../database/addContractTypePrint.js' import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request, response: Response ): Promise { - const success = await addOccupancyTypePrint( - request.body as AddOccupancyTypePrintForm, + const success = await addContractTypePrint( + request.body, request.session.user as User ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doAddLotOccupantType.d.ts b/handlers/admin-post/doAddLotOccupantType.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddLotOccupantType.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotOccupantType.js b/handlers/admin-post/doAddLotOccupantType.js deleted file mode 100644 index 4f2bcaec..00000000 --- a/handlers/admin-post/doAddLotOccupantType.js +++ /dev/null @@ -1,11 +0,0 @@ -import addLotOccupantType from '../../database/addLotOccupantType.js'; -import { getLotOccupantTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const lotOccupantTypeId = await addLotOccupantType(request.body, request.session.user); - const lotOccupantTypes = await getLotOccupantTypes(); - response.json({ - success: true, - lotOccupantTypeId, - lotOccupantTypes - }); -} diff --git a/handlers/admin-post/doAddLotOccupantType.ts b/handlers/admin-post/doAddLotOccupantType.ts deleted file mode 100644 index ffc92b57..00000000 --- a/handlers/admin-post/doAddLotOccupantType.ts +++ /dev/null @@ -1,24 +0,0 @@ -import type { Request, Response } from 'express' - -import addLotOccupantType, { - type AddLotOccupantTypeForm -} from '../../database/addLotOccupantType.js' -import { getLotOccupantTypes } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request, - response: Response -): Promise { - const lotOccupantTypeId = await addLotOccupantType( - request.body as AddLotOccupantTypeForm, - request.session.user as User - ) - - const lotOccupantTypes = await getLotOccupantTypes() - - response.json({ - success: true, - lotOccupantTypeId, - lotOccupantTypes - }) -} diff --git a/handlers/admin-post/doAddLotStatus.d.ts b/handlers/admin-post/doAddLotStatus.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddLotStatus.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotStatus.js b/handlers/admin-post/doAddLotStatus.js deleted file mode 100644 index 7073f7ba..00000000 --- a/handlers/admin-post/doAddLotStatus.js +++ /dev/null @@ -1,11 +0,0 @@ -import { addRecord } from '../../database/addRecord.js'; -import { getLotStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const burialSiteStatusId = await addRecord('LotStatuses', request.body.lotStatus, request.body.orderNumber ?? -1, request.session.user); - const lotStatuses = await getLotStatuses(); - response.json({ - success: true, - burialSiteStatusId, - lotStatuses - }); -} diff --git a/handlers/admin-post/doAddLotStatus.ts b/handlers/admin-post/doAddLotStatus.ts deleted file mode 100644 index 8e39ab62..00000000 --- a/handlers/admin-post/doAddLotStatus.ts +++ /dev/null @@ -1,24 +0,0 @@ -import type { Request, Response } from 'express' - -import { addRecord } from '../../database/addRecord.js' -import { getLotStatuses } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request, - response: Response -): Promise { - const burialSiteStatusId = await addRecord( - 'LotStatuses', - request.body.lotStatus, - request.body.orderNumber ?? -1, - request.session.user as User - ) - - const lotStatuses = await getLotStatuses() - - response.json({ - success: true, - burialSiteStatusId, - lotStatuses - }) -} diff --git a/handlers/admin-post/doAddLotType.d.ts b/handlers/admin-post/doAddLotType.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddLotType.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotType.js b/handlers/admin-post/doAddLotType.js deleted file mode 100644 index e5f4c48e..00000000 --- a/handlers/admin-post/doAddLotType.js +++ /dev/null @@ -1,11 +0,0 @@ -import { addRecord } from '../../database/addRecord.js'; -import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const burialSiteTypeId = await addRecord('LotTypes', request.body.lotType, request.body.orderNumber ?? -1, request.session.user); - const lotTypes = await getBurialSiteTypes(); - response.json({ - success: true, - burialSiteTypeId, - lotTypes - }); -} diff --git a/handlers/admin-post/doAddLotTypeField.d.ts b/handlers/admin-post/doAddLotTypeField.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddLotTypeField.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddLotTypeField.js b/handlers/admin-post/doAddLotTypeField.js deleted file mode 100644 index 50dcf0a6..00000000 --- a/handlers/admin-post/doAddLotTypeField.js +++ /dev/null @@ -1,11 +0,0 @@ -import addLotTypeField from '../../database/addLotTypeField.js'; -import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const lotTypeFieldId = await addLotTypeField(request.body, request.session.user); - const lotTypes = await getBurialSiteTypes(); - response.json({ - success: true, - lotTypeFieldId, - lotTypes - }); -} diff --git a/handlers/admin-post/doAddLotTypeField.ts b/handlers/admin-post/doAddLotTypeField.ts deleted file mode 100644 index ecd96355..00000000 --- a/handlers/admin-post/doAddLotTypeField.ts +++ /dev/null @@ -1,24 +0,0 @@ -import type { Request, Response } from 'express' - -import addLotTypeField, { - type AddLotTypeFieldForm -} from '../../database/addLotTypeField.js' -import { getBurialSiteTypes } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request, - response: Response -): Promise { - const lotTypeFieldId = await addLotTypeField( - request.body as AddLotTypeFieldForm, - request.session.user as User - ) - - const lotTypes = await getBurialSiteTypes() - - response.json({ - success: true, - lotTypeFieldId, - lotTypes - }) -} diff --git a/handlers/admin-post/doAddOccupancyType.d.ts b/handlers/admin-post/doAddOccupancyType.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddOccupancyType.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddOccupancyTypeField.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doAddOccupancyTypePrint.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -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 19d32e4d..365f0847 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts @@ -1,2 +1,5 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.js b/handlers/admin-post/doAddWorkOrderMilestoneType.js index fcfff204..34aa7a26 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.js +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.js @@ -1,4 +1,4 @@ -import { addRecord } from '../../database/addRecord.js'; +import addRecord from '../../database/addRecord.js'; import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const workOrderMilestoneTypeId = await addRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneType, request.body.orderNumber ?? -1, request.session.user); diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.ts b/handlers/admin-post/doAddWorkOrderMilestoneType.ts index 535360e9..7e589be3 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.ts @@ -1,10 +1,14 @@ import type { Request, Response } from 'express' -import { addRecord } from '../../database/addRecord.js' +import addRecord from '../../database/addRecord.js' import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request< + unknown, + unknown, + { workOrderMilestoneType: string; orderNumber?: number | string } + >, response: Response ): Promise { const workOrderMilestoneTypeId = await addRecord( diff --git a/handlers/admin-post/doAddWorkOrderType.d.ts b/handlers/admin-post/doAddWorkOrderType.d.ts index 19d32e4d..413de996 100644 --- a/handlers/admin-post/doAddWorkOrderType.d.ts +++ b/handlers/admin-post/doAddWorkOrderType.d.ts @@ -1,2 +1,5 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddWorkOrderType.js b/handlers/admin-post/doAddWorkOrderType.js index 14f61c49..c483bee4 100644 --- a/handlers/admin-post/doAddWorkOrderType.js +++ b/handlers/admin-post/doAddWorkOrderType.js @@ -1,4 +1,4 @@ -import { addRecord } from '../../database/addRecord.js'; +import addRecord from '../../database/addRecord.js'; import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const workOrderTypeId = await addRecord('WorkOrderTypes', request.body.workOrderType, request.body.orderNumber ?? -1, request.session.user); diff --git a/handlers/admin-post/doAddWorkOrderType.ts b/handlers/admin-post/doAddWorkOrderType.ts index 82a705c2..c6a4aa50 100644 --- a/handlers/admin-post/doAddWorkOrderType.ts +++ b/handlers/admin-post/doAddWorkOrderType.ts @@ -1,10 +1,14 @@ import type { Request, Response } from 'express' -import { addRecord } from '../../database/addRecord.js' +import addRecord from '../../database/addRecord.js' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request< + unknown, + unknown, + { workOrderType: string; orderNumber?: number | string } + >, response: Response ): Promise { const workOrderTypeId = await addRecord( diff --git a/handlers/admin-post/doDeleteLotStatus.d.ts b/handlers/admin-post/doDeleteBurialSiteStatus.d.ts similarity index 100% rename from handlers/admin-post/doDeleteLotStatus.d.ts rename to handlers/admin-post/doDeleteBurialSiteStatus.d.ts diff --git a/handlers/admin-post/doDeleteBurialSiteStatus.js b/handlers/admin-post/doDeleteBurialSiteStatus.js new file mode 100644 index 00000000..85de2a40 --- /dev/null +++ b/handlers/admin-post/doDeleteBurialSiteStatus.js @@ -0,0 +1,10 @@ +import { deleteRecord } from '../../database/deleteRecord.js'; +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = await deleteRecord('BurialSiteStatuses', request.body.burialSiteStatusId, request.session.user); + const burialSiteStatuses = await getBurialSiteStatuses(); + response.json({ + success, + burialSiteStatuses + }); +} diff --git a/handlers/admin-post/doDeleteLotStatus.ts b/handlers/admin-post/doDeleteBurialSiteStatus.ts similarity index 69% rename from handlers/admin-post/doDeleteLotStatus.ts rename to handlers/admin-post/doDeleteBurialSiteStatus.ts index 3c145548..82802e4e 100644 --- a/handlers/admin-post/doDeleteLotStatus.ts +++ b/handlers/admin-post/doDeleteBurialSiteStatus.ts @@ -1,22 +1,22 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getLotStatuses } from '../../helpers/functions.cache.js' +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' export default async function handler( request: Request, response: Response ): Promise { const success = await deleteRecord( - 'LotStatuses', + 'BurialSiteStatuses', request.body.burialSiteStatusId, request.session.user as User ) - const lotStatuses = await getLotStatuses() + const burialSiteStatuses = await getBurialSiteStatuses() response.json({ success, - lotStatuses + burialSiteStatuses }) } diff --git a/handlers/admin-post/doDeleteLotType.d.ts b/handlers/admin-post/doDeleteBurialSiteType.d.ts similarity index 100% rename from handlers/admin-post/doDeleteLotType.d.ts rename to handlers/admin-post/doDeleteBurialSiteType.d.ts diff --git a/handlers/admin-post/doDeleteLotType.js b/handlers/admin-post/doDeleteBurialSiteType.js similarity index 55% rename from handlers/admin-post/doDeleteLotType.js rename to handlers/admin-post/doDeleteBurialSiteType.js index f1731f6a..5c76db93 100644 --- a/handlers/admin-post/doDeleteLotType.js +++ b/handlers/admin-post/doDeleteBurialSiteType.js @@ -1,10 +1,10 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const success = await deleteRecord('LotTypes', request.body.burialSiteTypeId, request.session.user); - const lotTypes = await getBurialSiteTypes(); + const success = await deleteRecord('BurialSiteTypes', request.body.burialSiteTypeId, request.session.user); + const burialSiteTypes = await getBurialSiteTypes(); response.json({ success, - lotTypes + burialSiteTypes }); } diff --git a/handlers/admin-post/doDeleteLotType.ts b/handlers/admin-post/doDeleteBurialSiteType.ts similarity index 83% rename from handlers/admin-post/doDeleteLotType.ts rename to handlers/admin-post/doDeleteBurialSiteType.ts index 13af9ef9..9116c6b5 100644 --- a/handlers/admin-post/doDeleteLotType.ts +++ b/handlers/admin-post/doDeleteBurialSiteType.ts @@ -8,15 +8,15 @@ export default async function handler( response: Response ): Promise { const success = await deleteRecord( - 'LotTypes', + 'BurialSiteTypes', request.body.burialSiteTypeId as string, request.session.user as User ) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doDeleteLotTypeField.d.ts b/handlers/admin-post/doDeleteBurialSiteTypeField.d.ts similarity index 100% rename from handlers/admin-post/doDeleteLotTypeField.d.ts rename to handlers/admin-post/doDeleteBurialSiteTypeField.d.ts diff --git a/handlers/admin-post/doDeleteLotTypeField.js b/handlers/admin-post/doDeleteBurialSiteTypeField.js similarity index 81% rename from handlers/admin-post/doDeleteLotTypeField.js rename to handlers/admin-post/doDeleteBurialSiteTypeField.js index f6eb1540..bdff7750 100644 --- a/handlers/admin-post/doDeleteLotTypeField.js +++ b/handlers/admin-post/doDeleteBurialSiteTypeField.js @@ -2,9 +2,9 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = await deleteRecord('BurialSiteTypeFields', request.body.lotTypeFieldId, request.session.user); - const lotTypes = await getBurialSiteTypes(); + const burialSiteTypes = await getBurialSiteTypes(); response.json({ success, - lotTypes + burialSiteTypes }); } diff --git a/handlers/admin-post/doDeleteLotTypeField.ts b/handlers/admin-post/doDeleteBurialSiteTypeField.ts similarity index 87% rename from handlers/admin-post/doDeleteLotTypeField.ts rename to handlers/admin-post/doDeleteBurialSiteTypeField.ts index cadfccff..abf6d206 100644 --- a/handlers/admin-post/doDeleteLotTypeField.ts +++ b/handlers/admin-post/doDeleteBurialSiteTypeField.ts @@ -13,10 +13,10 @@ export default async function handler( request.session.user as User ) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doDeleteOccupancyType.d.ts b/handlers/admin-post/doDeleteContractType.d.ts similarity index 100% rename from handlers/admin-post/doDeleteOccupancyType.d.ts rename to handlers/admin-post/doDeleteContractType.d.ts diff --git a/handlers/admin-post/doDeleteOccupancyType.js b/handlers/admin-post/doDeleteContractType.js similarity index 66% rename from handlers/admin-post/doDeleteOccupancyType.js rename to handlers/admin-post/doDeleteContractType.js index 1533719f..effa16bb 100644 --- a/handlers/admin-post/doDeleteOccupancyType.js +++ b/handlers/admin-post/doDeleteContractType.js @@ -1,12 +1,12 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const success = await deleteRecord('OccupancyTypes', request.body.contractTypeId, request.session.user); - const occupancyTypes = await getContractTypes(); + const success = await deleteRecord('ContractTypes', request.body.contractTypeId, request.session.user); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doDeleteOccupancyType.ts b/handlers/admin-post/doDeleteContractType.ts similarity index 86% rename from handlers/admin-post/doDeleteOccupancyType.ts rename to handlers/admin-post/doDeleteContractType.ts index d4249f0a..6bf41699 100644 --- a/handlers/admin-post/doDeleteOccupancyType.ts +++ b/handlers/admin-post/doDeleteContractType.ts @@ -11,17 +11,17 @@ export default async function handler( response: Response ): Promise { const success = await deleteRecord( - 'OccupancyTypes', + 'ContractTypes', request.body.contractTypeId as string, request.session.user as User ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doDeleteOccupancyTypeField.d.ts b/handlers/admin-post/doDeleteContractTypeField.d.ts similarity index 100% rename from handlers/admin-post/doDeleteOccupancyTypeField.d.ts rename to handlers/admin-post/doDeleteContractTypeField.d.ts diff --git a/handlers/admin-post/doDeleteOccupancyTypeField.js b/handlers/admin-post/doDeleteContractTypeField.js similarity index 86% rename from handlers/admin-post/doDeleteOccupancyTypeField.js rename to handlers/admin-post/doDeleteContractTypeField.js index 05ba5d48..e2e4e743 100644 --- a/handlers/admin-post/doDeleteOccupancyTypeField.js +++ b/handlers/admin-post/doDeleteContractTypeField.js @@ -2,11 +2,11 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = await deleteRecord('ContractTypeFields', request.body.contractTypeFieldId, request.session.user); - const occupancyTypes = await getContractTypes(); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doDeleteOccupancyTypeField.ts b/handlers/admin-post/doDeleteContractTypeField.ts similarity index 90% rename from handlers/admin-post/doDeleteOccupancyTypeField.ts rename to handlers/admin-post/doDeleteContractTypeField.ts index 11449a3e..20445508 100644 --- a/handlers/admin-post/doDeleteOccupancyTypeField.ts +++ b/handlers/admin-post/doDeleteContractTypeField.ts @@ -16,12 +16,12 @@ export default async function handler( request.session.user as User ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doDeleteOccupancyTypePrint.d.ts b/handlers/admin-post/doDeleteContractTypePrint.d.ts similarity index 100% rename from handlers/admin-post/doDeleteOccupancyTypePrint.d.ts rename to handlers/admin-post/doDeleteContractTypePrint.d.ts diff --git a/handlers/admin-post/doDeleteOccupancyTypePrint.js b/handlers/admin-post/doDeleteContractTypePrint.js similarity index 51% rename from handlers/admin-post/doDeleteOccupancyTypePrint.js rename to handlers/admin-post/doDeleteContractTypePrint.js index be6c1ea6..f0b41e52 100644 --- a/handlers/admin-post/doDeleteOccupancyTypePrint.js +++ b/handlers/admin-post/doDeleteContractTypePrint.js @@ -1,12 +1,12 @@ -import deleteOccupancyTypePrint from '../../database/deleteOccupancyTypePrint.js'; +import deleteContractTypePrint from '../../database/deleteContractTypePrint.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const success = await deleteOccupancyTypePrint(request.body.contractTypeId, request.body.printEJS, request.session.user); - const occupancyTypes = await getContractTypes(); + const success = await deleteContractTypePrint(request.body.contractTypeId, request.body.printEJS, request.session.user); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doDeleteOccupancyTypePrint.ts b/handlers/admin-post/doDeleteContractTypePrint.ts similarity index 73% rename from handlers/admin-post/doDeleteOccupancyTypePrint.ts rename to handlers/admin-post/doDeleteContractTypePrint.ts index ebd6153c..8bd75c04 100644 --- a/handlers/admin-post/doDeleteOccupancyTypePrint.ts +++ b/handlers/admin-post/doDeleteContractTypePrint.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import deleteOccupancyTypePrint from '../../database/deleteOccupancyTypePrint.js' +import deleteContractTypePrint from '../../database/deleteContractTypePrint.js' import { getAllContractTypeFields, getContractTypes @@ -14,18 +14,18 @@ export default async function handler( >, response: Response ): Promise { - const success = await deleteOccupancyTypePrint( + const success = await deleteContractTypePrint( request.body.contractTypeId, request.body.printEJS, request.session.user as User ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doDeleteLotOccupantType.js b/handlers/admin-post/doDeleteLotOccupantType.js deleted file mode 100644 index cf60a524..00000000 --- a/handlers/admin-post/doDeleteLotOccupantType.js +++ /dev/null @@ -1,10 +0,0 @@ -import { deleteRecord } from '../../database/deleteRecord.js'; -import { getLotOccupantTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('LotOccupantTypes', request.body.lotOccupantTypeId, request.session.user); - const lotOccupantTypes = await getLotOccupantTypes(); - response.json({ - success, - lotOccupantTypes - }); -} diff --git a/handlers/admin-post/doDeleteLotOccupantType.ts b/handlers/admin-post/doDeleteLotOccupantType.ts deleted file mode 100644 index 5f1fbe03..00000000 --- a/handlers/admin-post/doDeleteLotOccupantType.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { Request, Response } from 'express' - -import { deleteRecord } from '../../database/deleteRecord.js' -import { getLotOccupantTypes } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await deleteRecord( - 'LotOccupantTypes', - request.body.lotOccupantTypeId, - request.session.user as User - ) - - const lotOccupantTypes = await getLotOccupantTypes() - - response.json({ - success, - lotOccupantTypes - }) -} diff --git a/handlers/admin-post/doDeleteLotStatus.js b/handlers/admin-post/doDeleteLotStatus.js deleted file mode 100644 index 17e1c87a..00000000 --- a/handlers/admin-post/doDeleteLotStatus.js +++ /dev/null @@ -1,10 +0,0 @@ -import { deleteRecord } from '../../database/deleteRecord.js'; -import { getLotStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('LotStatuses', request.body.burialSiteStatusId, request.session.user); - const lotStatuses = await getLotStatuses(); - response.json({ - success, - lotStatuses - }); -} diff --git a/handlers/admin-post/doMoveLotStatusDown.d.ts b/handlers/admin-post/doMoveBurialSiteStatusDown.d.ts similarity index 100% rename from handlers/admin-post/doMoveLotStatusDown.d.ts rename to handlers/admin-post/doMoveBurialSiteStatusDown.d.ts diff --git a/handlers/admin-post/doMoveBurialSiteStatusDown.js b/handlers/admin-post/doMoveBurialSiteStatusDown.js new file mode 100644 index 00000000..524f71bc --- /dev/null +++ b/handlers/admin-post/doMoveBurialSiteStatusDown.js @@ -0,0 +1,12 @@ +import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveRecordDownToBottom('BurialSiteStatuses', request.body.burialSiteStatusId) + : await moveRecordDown('BurialSiteStatuses', request.body.burialSiteStatusId); + const burialSiteStatuses = await getBurialSiteStatuses(); + response.json({ + success, + burialSiteStatuses + }); +} diff --git a/handlers/admin-post/doMoveLotStatusDown.ts b/handlers/admin-post/doMoveBurialSiteStatusDown.ts similarity index 51% rename from handlers/admin-post/doMoveLotStatusDown.ts rename to handlers/admin-post/doMoveBurialSiteStatusDown.ts index b6601c3f..4272a0b3 100644 --- a/handlers/admin-post/doMoveLotStatusDown.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusDown.ts @@ -4,7 +4,7 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js' -import { getLotStatuses } from '../../helpers/functions.cache.js' +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' export default async function handler( request: Request< @@ -16,13 +16,19 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('LotStatuses', request.body.burialSiteStatusId) - : await moveRecordDown('LotStatuses', request.body.burialSiteStatusId) + ? await moveRecordDownToBottom( + 'BurialSiteStatuses', + request.body.burialSiteStatusId + ) + : await moveRecordDown( + 'BurialSiteStatuses', + request.body.burialSiteStatusId + ) - const lotStatuses = await getLotStatuses() + const burialSiteStatuses = await getBurialSiteStatuses() response.json({ success, - lotStatuses + burialSiteStatuses }) } diff --git a/handlers/admin-post/doMoveLotStatusUp.d.ts b/handlers/admin-post/doMoveBurialSiteStatusUp.d.ts similarity index 100% rename from handlers/admin-post/doMoveLotStatusUp.d.ts rename to handlers/admin-post/doMoveBurialSiteStatusUp.d.ts diff --git a/handlers/admin-post/doMoveBurialSiteStatusUp.js b/handlers/admin-post/doMoveBurialSiteStatusUp.js new file mode 100644 index 00000000..8ae1266e --- /dev/null +++ b/handlers/admin-post/doMoveBurialSiteStatusUp.js @@ -0,0 +1,12 @@ +import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveRecordUpToTop('BurialSiteStatuses', request.body.burialSiteStatusId) + : await moveRecordUp('BurialSiteStatuses', request.body.burialSiteStatusId); + const burialSiteStatuses = await getBurialSiteStatuses(); + response.json({ + success, + burialSiteStatuses + }); +} diff --git a/handlers/admin-post/doMoveLotStatusUp.ts b/handlers/admin-post/doMoveBurialSiteStatusUp.ts similarity index 51% rename from handlers/admin-post/doMoveLotStatusUp.ts rename to handlers/admin-post/doMoveBurialSiteStatusUp.ts index 95a25a7e..a70079d7 100644 --- a/handlers/admin-post/doMoveLotStatusUp.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusUp.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' -import { getLotStatuses } from '../../helpers/functions.cache.js' +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' export default async function handler( request: Request< @@ -13,13 +13,19 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('LotStatuses', request.body.burialSiteStatusId) - : await moveRecordUp('LotStatuses', request.body.burialSiteStatusId) + ? await moveRecordUpToTop( + 'BurialSiteStatuses', + request.body.burialSiteStatusId + ) + : await moveRecordUp( + 'BurialSiteStatuses', + request.body.burialSiteStatusId + ) - const lotStatuses = await getLotStatuses() + const burialSiteStatuses = await getBurialSiteStatuses() response.json({ success, - lotStatuses + burialSiteStatuses }) } diff --git a/handlers/admin-post/doMoveLotTypeDown.d.ts b/handlers/admin-post/doMoveBurialSiteTypeDown.d.ts similarity index 100% rename from handlers/admin-post/doMoveLotTypeDown.d.ts rename to handlers/admin-post/doMoveBurialSiteTypeDown.d.ts diff --git a/handlers/admin-post/doMoveLotTypeDown.js b/handlers/admin-post/doMoveBurialSiteTypeDown.js similarity index 55% rename from handlers/admin-post/doMoveLotTypeDown.js rename to handlers/admin-post/doMoveBurialSiteTypeDown.js index af8cf5a3..21253c99 100644 --- a/handlers/admin-post/doMoveLotTypeDown.js +++ b/handlers/admin-post/doMoveBurialSiteTypeDown.js @@ -2,11 +2,11 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecor import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('LotTypes', request.body.burialSiteTypeId) - : await moveRecordDown('LotTypes', request.body.burialSiteTypeId); - const lotTypes = await getBurialSiteTypes(); + ? await moveRecordDownToBottom('BurialSiteTypes', request.body.burialSiteTypeId) + : await moveRecordDown('BurialSiteTypes', request.body.burialSiteTypeId); + const burialSiteTypes = await getBurialSiteTypes(); response.json({ success, - lotTypes + burialSiteTypes }); } diff --git a/handlers/admin-post/doMoveLotTypeDown.ts b/handlers/admin-post/doMoveBurialSiteTypeDown.ts similarity index 64% rename from handlers/admin-post/doMoveLotTypeDown.ts rename to handlers/admin-post/doMoveBurialSiteTypeDown.ts index f8063e7b..ac29982d 100644 --- a/handlers/admin-post/doMoveLotTypeDown.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeDown.ts @@ -16,13 +16,16 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('LotTypes', request.body.burialSiteTypeId) - : await moveRecordDown('LotTypes', request.body.burialSiteTypeId) + ? await moveRecordDownToBottom( + 'BurialSiteTypes', + request.body.burialSiteTypeId + ) + : await moveRecordDown('BurialSiteTypes', request.body.burialSiteTypeId) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveLotTypeFieldDown.d.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.d.ts similarity index 100% rename from handlers/admin-post/doMoveLotTypeFieldDown.d.ts rename to handlers/admin-post/doMoveBurialSiteTypeFieldDown.d.ts diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js new file mode 100644 index 00000000..8fae220c --- /dev/null +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js @@ -0,0 +1,12 @@ +import { moveBurialSiteTypeFieldDown, moveBurialSiteTypeFieldDownToBottom } from '../../database/moveBurialSiteTypeField.js'; +import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveBurialSiteTypeFieldDownToBottom(request.body.lotTypeFieldId) + : await moveBurialSiteTypeFieldDown(request.body.lotTypeFieldId); + const burialSiteTypes = await getBurialSiteTypes(); + response.json({ + success, + burialSiteTypes + }); +} diff --git a/handlers/admin-post/doMoveLotTypeFieldUp.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts similarity index 54% rename from handlers/admin-post/doMoveLotTypeFieldUp.ts rename to handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts index a5410549..67969b18 100644 --- a/handlers/admin-post/doMoveLotTypeFieldUp.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts @@ -1,9 +1,9 @@ import type { Request, Response } from 'express' import { - moveLotTypeFieldUp, - moveLotTypeFieldUpToTop -} from '../../database/moveLotTypeField.js' + moveBurialSiteTypeFieldDown, + moveBurialSiteTypeFieldDownToBottom +} from '../../database/moveBurialSiteTypeField.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' export default async function handler( @@ -16,13 +16,13 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveLotTypeFieldUpToTop(request.body.lotTypeFieldId) - : await moveLotTypeFieldUp(request.body.lotTypeFieldId) + ? await moveBurialSiteTypeFieldDownToBottom(request.body.lotTypeFieldId) + : await moveBurialSiteTypeFieldDown(request.body.lotTypeFieldId) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveLotTypeFieldUp.d.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.d.ts similarity index 100% rename from handlers/admin-post/doMoveLotTypeFieldUp.d.ts rename to handlers/admin-post/doMoveBurialSiteTypeFieldUp.d.ts diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js new file mode 100644 index 00000000..4a667578 --- /dev/null +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js @@ -0,0 +1,12 @@ +import { moveBurialSiteTypeFieldUp, moveBurialSiteTypeFieldUpToTop } from '../../database/moveBurialSiteTypeField.js'; +import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveBurialSiteTypeFieldUpToTop(request.body.lotTypeFieldId) + : await moveBurialSiteTypeFieldUp(request.body.lotTypeFieldId); + const burialSiteTypes = await getBurialSiteTypes(); + response.json({ + success, + burialSiteTypes + }); +} diff --git a/handlers/admin-post/doMoveLotTypeFieldDown.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts similarity index 55% rename from handlers/admin-post/doMoveLotTypeFieldDown.ts rename to handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts index aa44b738..7d730f59 100644 --- a/handlers/admin-post/doMoveLotTypeFieldDown.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts @@ -1,9 +1,9 @@ import type { Request, Response } from 'express' import { - moveLotTypeFieldDown, - moveLotTypeFieldDownToBottom -} from '../../database/moveLotTypeField.js' + moveBurialSiteTypeFieldUp, + moveBurialSiteTypeFieldUpToTop +} from '../../database/moveBurialSiteTypeField.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' export default async function handler( @@ -16,13 +16,13 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveLotTypeFieldDownToBottom(request.body.lotTypeFieldId) - : await moveLotTypeFieldDown(request.body.lotTypeFieldId) + ? await moveBurialSiteTypeFieldUpToTop(request.body.lotTypeFieldId) + : await moveBurialSiteTypeFieldUp(request.body.lotTypeFieldId) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveLotTypeUp.d.ts b/handlers/admin-post/doMoveBurialSiteTypeUp.d.ts similarity index 100% rename from handlers/admin-post/doMoveLotTypeUp.d.ts rename to handlers/admin-post/doMoveBurialSiteTypeUp.d.ts diff --git a/handlers/admin-post/doMoveLotTypeUp.js b/handlers/admin-post/doMoveBurialSiteTypeUp.js similarity index 55% rename from handlers/admin-post/doMoveLotTypeUp.js rename to handlers/admin-post/doMoveBurialSiteTypeUp.js index 0fa010b2..83452d6e 100644 --- a/handlers/admin-post/doMoveLotTypeUp.js +++ b/handlers/admin-post/doMoveBurialSiteTypeUp.js @@ -2,11 +2,11 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('LotTypes', request.body.burialSiteTypeId) - : await moveRecordUp('LotTypes', request.body.burialSiteTypeId); - const lotTypes = await getBurialSiteTypes(); + ? await moveRecordUpToTop('BurialSiteTypes', request.body.burialSiteTypeId) + : await moveRecordUp('BurialSiteTypes', request.body.burialSiteTypeId); + const burialSiteTypes = await getBurialSiteTypes(); response.json({ success, - lotTypes + burialSiteTypes }); } diff --git a/handlers/admin-post/doMoveLotTypeUp.ts b/handlers/admin-post/doMoveBurialSiteTypeUp.ts similarity index 64% rename from handlers/admin-post/doMoveLotTypeUp.ts rename to handlers/admin-post/doMoveBurialSiteTypeUp.ts index 2fa85ba3..ad4a0108 100644 --- a/handlers/admin-post/doMoveLotTypeUp.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeUp.ts @@ -13,13 +13,16 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('LotTypes', request.body.burialSiteTypeId) - : await moveRecordUp('LotTypes', request.body.burialSiteTypeId) + ? await moveRecordUpToTop( + 'BurialSiteTypes', + request.body.burialSiteTypeId + ) + : await moveRecordUp('BurialSiteTypes', request.body.burialSiteTypeId) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveOccupancyTypeDown.d.ts b/handlers/admin-post/doMoveContractTypeDown.d.ts similarity index 100% rename from handlers/admin-post/doMoveOccupancyTypeDown.d.ts rename to handlers/admin-post/doMoveContractTypeDown.d.ts diff --git a/handlers/admin-post/doMoveOccupancyTypeDown.js b/handlers/admin-post/doMoveContractTypeDown.js similarity index 64% rename from handlers/admin-post/doMoveOccupancyTypeDown.js rename to handlers/admin-post/doMoveContractTypeDown.js index d8e742eb..339fed25 100644 --- a/handlers/admin-post/doMoveOccupancyTypeDown.js +++ b/handlers/admin-post/doMoveContractTypeDown.js @@ -2,13 +2,13 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecor import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('OccupancyTypes', request.body.contractTypeId) - : await moveRecordDown('OccupancyTypes', request.body.contractTypeId); - const occupancyTypes = await getContractTypes(); + ? await moveRecordDownToBottom('ContractTypes', request.body.contractTypeId) + : await moveRecordDown('ContractTypes', request.body.contractTypeId); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doMoveOccupancyTypeDown.ts b/handlers/admin-post/doMoveContractTypeDown.ts similarity index 79% rename from handlers/admin-post/doMoveOccupancyTypeDown.ts rename to handlers/admin-post/doMoveContractTypeDown.ts index 15e1e79e..7687daad 100644 --- a/handlers/admin-post/doMoveOccupancyTypeDown.ts +++ b/handlers/admin-post/doMoveContractTypeDown.ts @@ -20,17 +20,17 @@ export default async function handler( const success = request.body.moveToEnd === '1' ? await moveRecordDownToBottom( - 'OccupancyTypes', + 'ContractTypes', request.body.contractTypeId ) - : await moveRecordDown('OccupancyTypes', request.body.contractTypeId) + : await moveRecordDown('ContractTypes', request.body.contractTypeId) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldDown.d.ts b/handlers/admin-post/doMoveContractTypeFieldDown.d.ts similarity index 100% rename from handlers/admin-post/doMoveOccupancyTypeFieldDown.d.ts rename to handlers/admin-post/doMoveContractTypeFieldDown.d.ts diff --git a/handlers/admin-post/doMoveContractTypeFieldDown.js b/handlers/admin-post/doMoveContractTypeFieldDown.js new file mode 100644 index 00000000..15642a80 --- /dev/null +++ b/handlers/admin-post/doMoveContractTypeFieldDown.js @@ -0,0 +1,14 @@ +import { moveContractTypeFieldDown, moveContractTypeFieldDownToBottom } from '../../database/moveContractTypeField.js'; +import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveContractTypeFieldDownToBottom(request.body.contractTypeFieldId) + : await moveContractTypeFieldDown(request.body.contractTypeFieldId); + const contractTypes = await getContractTypes(); + const allContractTypeFields = await getAllContractTypeFields(); + response.json({ + success, + contractTypes, + allContractTypeFields + }); +} diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldDown.ts b/handlers/admin-post/doMoveContractTypeFieldDown.ts similarity index 65% rename from handlers/admin-post/doMoveOccupancyTypeFieldDown.ts rename to handlers/admin-post/doMoveContractTypeFieldDown.ts index 7d4b45f2..1a20056f 100644 --- a/handlers/admin-post/doMoveOccupancyTypeFieldDown.ts +++ b/handlers/admin-post/doMoveContractTypeFieldDown.ts @@ -1,9 +1,9 @@ import type { Request, Response } from 'express' import { - moveOccupancyTypeFieldDown, - moveOccupancyTypeFieldDownToBottom -} from '../../database/moveOccupancyTypeField.js' + moveContractTypeFieldDown, + moveContractTypeFieldDownToBottom +} from '../../database/moveContractTypeField.js' import { getAllContractTypeFields, getContractTypes @@ -19,17 +19,17 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypeFieldDownToBottom( + ? await moveContractTypeFieldDownToBottom( request.body.contractTypeFieldId ) - : await moveOccupancyTypeFieldDown(request.body.contractTypeFieldId) + : await moveContractTypeFieldDown(request.body.contractTypeFieldId) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldUp.d.ts b/handlers/admin-post/doMoveContractTypeFieldUp.d.ts similarity index 100% rename from handlers/admin-post/doMoveOccupancyTypeFieldUp.d.ts rename to handlers/admin-post/doMoveContractTypeFieldUp.d.ts diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldUp.js b/handlers/admin-post/doMoveContractTypeFieldUp.js similarity index 50% rename from handlers/admin-post/doMoveOccupancyTypeFieldUp.js rename to handlers/admin-post/doMoveContractTypeFieldUp.js index 2f26afcb..42345bb4 100644 --- a/handlers/admin-post/doMoveOccupancyTypeFieldUp.js +++ b/handlers/admin-post/doMoveContractTypeFieldUp.js @@ -1,14 +1,14 @@ -import { moveOccupancyTypeFieldUp, moveOccupancyTypeFieldUpToTop } from '../../database/moveOccupancyTypeField.js'; +import { moveContractTypeFieldUp, moveContractTypeFieldUpToTop } from '../../database/moveContractTypeField.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypeFieldUpToTop(request.body.contractTypeFieldId) - : await moveOccupancyTypeFieldUp(request.body.contractTypeFieldId); - const occupancyTypes = await getContractTypes(); + ? await moveContractTypeFieldUpToTop(request.body.contractTypeFieldId) + : await moveContractTypeFieldUp(request.body.contractTypeFieldId); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldUp.ts b/handlers/admin-post/doMoveContractTypeFieldUp.ts similarity index 61% rename from handlers/admin-post/doMoveOccupancyTypeFieldUp.ts rename to handlers/admin-post/doMoveContractTypeFieldUp.ts index 17caf399..bffa4fc7 100644 --- a/handlers/admin-post/doMoveOccupancyTypeFieldUp.ts +++ b/handlers/admin-post/doMoveContractTypeFieldUp.ts @@ -1,9 +1,9 @@ import type { Request, Response } from 'express' import { - moveOccupancyTypeFieldUp, - moveOccupancyTypeFieldUpToTop -} from '../../database/moveOccupancyTypeField.js' + moveContractTypeFieldUp, + moveContractTypeFieldUpToTop +} from '../../database/moveContractTypeField.js' import { getAllContractTypeFields, getContractTypes @@ -19,15 +19,15 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypeFieldUpToTop(request.body.contractTypeFieldId) - : await moveOccupancyTypeFieldUp(request.body.contractTypeFieldId) + ? await moveContractTypeFieldUpToTop(request.body.contractTypeFieldId) + : await moveContractTypeFieldUp(request.body.contractTypeFieldId) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doMoveOccupancyTypePrintDown.d.ts b/handlers/admin-post/doMoveContractTypePrintDown.d.ts similarity index 100% rename from handlers/admin-post/doMoveOccupancyTypePrintDown.d.ts rename to handlers/admin-post/doMoveContractTypePrintDown.d.ts diff --git a/handlers/admin-post/doMoveContractTypePrintDown.js b/handlers/admin-post/doMoveContractTypePrintDown.js new file mode 100644 index 00000000..45ef7477 --- /dev/null +++ b/handlers/admin-post/doMoveContractTypePrintDown.js @@ -0,0 +1,14 @@ +import { moveContractTypePrintDown, moveContractTypePrintDownToBottom } from '../../database/moveContractTypePrintDown.js'; +import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveContractTypePrintDownToBottom(request.body.contractTypeId, request.body.printEJS) + : await moveContractTypePrintDown(request.body.contractTypeId, request.body.printEJS); + const contractTypes = await getContractTypes(); + const allContractTypeFields = await getAllContractTypeFields(); + response.json({ + success, + contractTypes, + allContractTypeFields + }); +} diff --git a/handlers/admin-post/doMoveOccupancyTypePrintDown.ts b/handlers/admin-post/doMoveContractTypePrintDown.ts similarity index 71% rename from handlers/admin-post/doMoveOccupancyTypePrintDown.ts rename to handlers/admin-post/doMoveContractTypePrintDown.ts index 56f7ef54..4720f2bb 100644 --- a/handlers/admin-post/doMoveOccupancyTypePrintDown.ts +++ b/handlers/admin-post/doMoveContractTypePrintDown.ts @@ -1,9 +1,9 @@ import type { Request, Response } from 'express' import { - moveOccupancyTypePrintDown, - moveOccupancyTypePrintDownToBottom -} from '../../database/moveOccupancyTypePrintDown.js' + moveContractTypePrintDown, + moveContractTypePrintDownToBottom +} from '../../database/moveContractTypePrintDown.js' import { getAllContractTypeFields, getContractTypes @@ -19,21 +19,21 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypePrintDownToBottom( + ? await moveContractTypePrintDownToBottom( request.body.contractTypeId, request.body.printEJS ) - : await moveOccupancyTypePrintDown( + : await moveContractTypePrintDown( request.body.contractTypeId, request.body.printEJS ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doMoveOccupancyTypePrintUp.d.ts b/handlers/admin-post/doMoveContractTypePrintUp.d.ts similarity index 100% rename from handlers/admin-post/doMoveOccupancyTypePrintUp.d.ts rename to handlers/admin-post/doMoveContractTypePrintUp.d.ts diff --git a/handlers/admin-post/doMoveContractTypePrintUp.js b/handlers/admin-post/doMoveContractTypePrintUp.js new file mode 100644 index 00000000..2cc6c47d --- /dev/null +++ b/handlers/admin-post/doMoveContractTypePrintUp.js @@ -0,0 +1,14 @@ +import { moveContractTypePrintUp, moveContractTypePrintUpToTop } from '../../database/moveContractTypePrintUp.js'; +import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = request.body.moveToEnd === '1' + ? await moveContractTypePrintUpToTop(request.body.contractTypeId, request.body.printEJS) + : await moveContractTypePrintUp(request.body.contractTypeId, request.body.printEJS); + const contractTypes = await getContractTypes(); + const allContractTypeFields = await getAllContractTypeFields(); + response.json({ + success, + contractTypes, + allContractTypeFields + }); +} diff --git a/handlers/admin-post/doMoveOccupancyTypePrintUp.ts b/handlers/admin-post/doMoveContractTypePrintUp.ts similarity index 72% rename from handlers/admin-post/doMoveOccupancyTypePrintUp.ts rename to handlers/admin-post/doMoveContractTypePrintUp.ts index 81cb8089..6d153889 100644 --- a/handlers/admin-post/doMoveOccupancyTypePrintUp.ts +++ b/handlers/admin-post/doMoveContractTypePrintUp.ts @@ -1,9 +1,9 @@ import type { Request, Response } from 'express' import { - moveOccupancyTypePrintUp, - moveOccupancyTypePrintUpToTop -} from '../../database/moveOccupancyTypePrintUp.js' + moveContractTypePrintUp, + moveContractTypePrintUpToTop +} from '../../database/moveContractTypePrintUp.js' import { getAllContractTypeFields, getContractTypes @@ -19,21 +19,21 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypePrintUpToTop( + ? await moveContractTypePrintUpToTop( request.body.contractTypeId, request.body.printEJS ) - : await moveOccupancyTypePrintUp( + : await moveContractTypePrintUp( request.body.contractTypeId, request.body.printEJS ) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doMoveOccupancyTypeUp.d.ts b/handlers/admin-post/doMoveContractTypeUp.d.ts similarity index 100% rename from handlers/admin-post/doMoveOccupancyTypeUp.d.ts rename to handlers/admin-post/doMoveContractTypeUp.d.ts diff --git a/handlers/admin-post/doMoveOccupancyTypeUp.js b/handlers/admin-post/doMoveContractTypeUp.js similarity index 64% rename from handlers/admin-post/doMoveOccupancyTypeUp.js rename to handlers/admin-post/doMoveContractTypeUp.js index f70117b6..cea229c4 100644 --- a/handlers/admin-post/doMoveOccupancyTypeUp.js +++ b/handlers/admin-post/doMoveContractTypeUp.js @@ -2,13 +2,13 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('OccupancyTypes', request.body.contractTypeId) - : await moveRecordUp('OccupancyTypes', request.body.contractTypeId); - const occupancyTypes = await getContractTypes(); + ? await moveRecordUpToTop('ContractTypes', request.body.contractTypeId) + : await moveRecordUp('ContractTypes', request.body.contractTypeId); + const contractTypes = await getContractTypes(); const allContractTypeFields = await getAllContractTypeFields(); response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }); } diff --git a/handlers/admin-post/doMoveOccupancyTypeUp.ts b/handlers/admin-post/doMoveContractTypeUp.ts similarity index 72% rename from handlers/admin-post/doMoveOccupancyTypeUp.ts rename to handlers/admin-post/doMoveContractTypeUp.ts index 0365bf35..f5aaacf7 100644 --- a/handlers/admin-post/doMoveOccupancyTypeUp.ts +++ b/handlers/admin-post/doMoveContractTypeUp.ts @@ -16,15 +16,15 @@ export default async function handler( ): Promise { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('OccupancyTypes', request.body.contractTypeId) - : await moveRecordUp('OccupancyTypes', request.body.contractTypeId) + ? await moveRecordUpToTop('ContractTypes', request.body.contractTypeId) + : await moveRecordUp('ContractTypes', request.body.contractTypeId) - const occupancyTypes = await getContractTypes() + const contractTypes = await getContractTypes() const allContractTypeFields = await getAllContractTypeFields() response.json({ success, - occupancyTypes, + contractTypes, allContractTypeFields }) } diff --git a/handlers/admin-post/doMoveLotOccupantTypeDown.js b/handlers/admin-post/doMoveLotOccupantTypeDown.js deleted file mode 100644 index 6f41ca8a..00000000 --- a/handlers/admin-post/doMoveLotOccupantTypeDown.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; -import { getLotOccupantTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('LotOccupantTypes', request.body.lotOccupantTypeId) - : await moveRecordDown('LotOccupantTypes', request.body.lotOccupantTypeId); - const lotOccupantTypes = await getLotOccupantTypes(); - response.json({ - success, - lotOccupantTypes - }); -} diff --git a/handlers/admin-post/doMoveLotOccupantTypeDown.ts b/handlers/admin-post/doMoveLotOccupantTypeDown.ts deleted file mode 100644 index 74a4cdd9..00000000 --- a/handlers/admin-post/doMoveLotOccupantTypeDown.ts +++ /dev/null @@ -1,31 +0,0 @@ -import type { Request, Response } from 'express' - -import { - moveRecordDown, - moveRecordDownToBottom -} from '../../database/moveRecord.js' -import { getLotOccupantTypes } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request< - unknown, - unknown, - { lotOccupantTypeId: string; moveToEnd: '0' | '1' } - >, - response: Response -): Promise { - const success = - request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( - 'LotOccupantTypes', - request.body.lotOccupantTypeId - ) - : await moveRecordDown('LotOccupantTypes', request.body.lotOccupantTypeId) - - const lotOccupantTypes = await getLotOccupantTypes() - - response.json({ - success, - lotOccupantTypes - }) -} diff --git a/handlers/admin-post/doMoveLotOccupantTypeUp.js b/handlers/admin-post/doMoveLotOccupantTypeUp.js deleted file mode 100644 index 69dbf28b..00000000 --- a/handlers/admin-post/doMoveLotOccupantTypeUp.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; -import { getLotOccupantTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('LotOccupantTypes', request.body.lotOccupantTypeId) - : await moveRecordUp('LotOccupantTypes', request.body.lotOccupantTypeId); - const lotOccupantTypes = await getLotOccupantTypes(); - response.json({ - success, - lotOccupantTypes - }); -} diff --git a/handlers/admin-post/doMoveLotOccupantTypeUp.ts b/handlers/admin-post/doMoveLotOccupantTypeUp.ts deleted file mode 100644 index c805a623..00000000 --- a/handlers/admin-post/doMoveLotOccupantTypeUp.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { Request, Response } from 'express' - -import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' -import { getLotOccupantTypes } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request< - unknown, - unknown, - { lotOccupantTypeId: string; moveToEnd: '0' | '1' } - >, - response: Response -): Promise { - const success = - request.body.moveToEnd === '1' - ? await moveRecordUpToTop( - 'LotOccupantTypes', - request.body.lotOccupantTypeId - ) - : await moveRecordUp('LotOccupantTypes', request.body.lotOccupantTypeId) - - const lotOccupantTypes = await getLotOccupantTypes() - - response.json({ - success, - lotOccupantTypes - }) -} diff --git a/handlers/admin-post/doMoveLotStatusDown.js b/handlers/admin-post/doMoveLotStatusDown.js deleted file mode 100644 index c4f75be0..00000000 --- a/handlers/admin-post/doMoveLotStatusDown.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; -import { getLotStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('LotStatuses', request.body.burialSiteStatusId) - : await moveRecordDown('LotStatuses', request.body.burialSiteStatusId); - const lotStatuses = await getLotStatuses(); - response.json({ - success, - lotStatuses - }); -} diff --git a/handlers/admin-post/doMoveLotStatusUp.js b/handlers/admin-post/doMoveLotStatusUp.js deleted file mode 100644 index 4ee6b8bd..00000000 --- a/handlers/admin-post/doMoveLotStatusUp.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; -import { getLotStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('LotStatuses', request.body.burialSiteStatusId) - : await moveRecordUp('LotStatuses', request.body.burialSiteStatusId); - const lotStatuses = await getLotStatuses(); - response.json({ - success, - lotStatuses - }); -} diff --git a/handlers/admin-post/doMoveLotTypeFieldDown.js b/handlers/admin-post/doMoveLotTypeFieldDown.js deleted file mode 100644 index 726835f1..00000000 --- a/handlers/admin-post/doMoveLotTypeFieldDown.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moveLotTypeFieldDown, moveLotTypeFieldDownToBottom } from '../../database/moveLotTypeField.js'; -import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveLotTypeFieldDownToBottom(request.body.lotTypeFieldId) - : await moveLotTypeFieldDown(request.body.lotTypeFieldId); - const lotTypes = await getBurialSiteTypes(); - response.json({ - success, - lotTypes - }); -} diff --git a/handlers/admin-post/doMoveLotTypeFieldUp.js b/handlers/admin-post/doMoveLotTypeFieldUp.js deleted file mode 100644 index dd786075..00000000 --- a/handlers/admin-post/doMoveLotTypeFieldUp.js +++ /dev/null @@ -1,12 +0,0 @@ -import { moveLotTypeFieldUp, moveLotTypeFieldUpToTop } from '../../database/moveLotTypeField.js'; -import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveLotTypeFieldUpToTop(request.body.lotTypeFieldId) - : await moveLotTypeFieldUp(request.body.lotTypeFieldId); - const lotTypes = await getBurialSiteTypes(); - response.json({ - success, - lotTypes - }); -} diff --git a/handlers/admin-post/doMoveOccupancyTypeFieldDown.js b/handlers/admin-post/doMoveOccupancyTypeFieldDown.js deleted file mode 100644 index 32471dee..00000000 --- a/handlers/admin-post/doMoveOccupancyTypeFieldDown.js +++ /dev/null @@ -1,14 +0,0 @@ -import { moveOccupancyTypeFieldDown, moveOccupancyTypeFieldDownToBottom } from '../../database/moveOccupancyTypeField.js'; -import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypeFieldDownToBottom(request.body.contractTypeFieldId) - : await moveOccupancyTypeFieldDown(request.body.contractTypeFieldId); - const occupancyTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); - response.json({ - success, - occupancyTypes, - allContractTypeFields - }); -} diff --git a/handlers/admin-post/doMoveOccupancyTypePrintDown.js b/handlers/admin-post/doMoveOccupancyTypePrintDown.js deleted file mode 100644 index 7abdb9ea..00000000 --- a/handlers/admin-post/doMoveOccupancyTypePrintDown.js +++ /dev/null @@ -1,14 +0,0 @@ -import { moveOccupancyTypePrintDown, moveOccupancyTypePrintDownToBottom } from '../../database/moveOccupancyTypePrintDown.js'; -import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypePrintDownToBottom(request.body.contractTypeId, request.body.printEJS) - : await moveOccupancyTypePrintDown(request.body.contractTypeId, request.body.printEJS); - const occupancyTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); - response.json({ - success, - occupancyTypes, - allContractTypeFields - }); -} diff --git a/handlers/admin-post/doMoveOccupancyTypePrintUp.js b/handlers/admin-post/doMoveOccupancyTypePrintUp.js deleted file mode 100644 index fb46928e..00000000 --- a/handlers/admin-post/doMoveOccupancyTypePrintUp.js +++ /dev/null @@ -1,14 +0,0 @@ -import { moveOccupancyTypePrintUp, moveOccupancyTypePrintUpToTop } from '../../database/moveOccupancyTypePrintUp.js'; -import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = request.body.moveToEnd === '1' - ? await moveOccupancyTypePrintUpToTop(request.body.contractTypeId, request.body.printEJS) - : await moveOccupancyTypePrintUp(request.body.contractTypeId, request.body.printEJS); - const occupancyTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); - response.json({ - success, - occupancyTypes, - allContractTypeFields - }); -} diff --git a/handlers/admin-post/doUpdateLotStatus.d.ts b/handlers/admin-post/doUpdateBurialSiteStatus.d.ts similarity index 86% rename from handlers/admin-post/doUpdateLotStatus.d.ts rename to handlers/admin-post/doUpdateBurialSiteStatus.d.ts index 5ffcdbf1..0186900b 100644 --- a/handlers/admin-post/doUpdateLotStatus.d.ts +++ b/handlers/admin-post/doUpdateBurialSiteStatus.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/admin-post/doUpdateBurialSiteStatus.js b/handlers/admin-post/doUpdateBurialSiteStatus.js new file mode 100644 index 00000000..7dc48ccb --- /dev/null +++ b/handlers/admin-post/doUpdateBurialSiteStatus.js @@ -0,0 +1,10 @@ +import { updateRecord } from '../../database/updateRecord.js'; +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; +export default async function handler(request, response) { + const success = await updateRecord('BurialSiteStatuses', request.body.burialSiteStatusId, request.body.burialSiteStatus, request.session.user); + const burialSiteStatuses = await getBurialSiteStatuses(); + response.json({ + success, + burialSiteStatuses + }); +} diff --git a/handlers/admin-post/doUpdateLotStatus.ts b/handlers/admin-post/doUpdateBurialSiteStatus.ts similarity index 58% rename from handlers/admin-post/doUpdateLotStatus.ts rename to handlers/admin-post/doUpdateBurialSiteStatus.ts index d37b4c38..57f18fd3 100644 --- a/handlers/admin-post/doUpdateLotStatus.ts +++ b/handlers/admin-post/doUpdateBurialSiteStatus.ts @@ -1,27 +1,27 @@ import type { Request, Response } from 'express' import { updateRecord } from '../../database/updateRecord.js' -import { getLotStatuses } from '../../helpers/functions.cache.js' +import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' export default async function handler( request: Request< unknown, unknown, - { burialSiteStatusId: string; lotStatus: string } + { burialSiteStatusId: string; burialSiteStatus: string } >, response: Response ): Promise { const success = await updateRecord( - 'LotStatuses', + 'BurialSiteStatuses', request.body.burialSiteStatusId, - request.body.lotStatus, + request.body.burialSiteStatus, request.session.user as User ) - const lotStatuses = await getLotStatuses() + const burialSiteStatuses = await getBurialSiteStatuses() response.json({ success, - lotStatuses + burialSiteStatuses }) } diff --git a/handlers/admin-post/doUpdateLotType.d.ts b/handlers/admin-post/doUpdateBurialSiteType.d.ts similarity index 87% rename from handlers/admin-post/doUpdateLotType.d.ts rename to handlers/admin-post/doUpdateBurialSiteType.d.ts index 430aceb5..2fca9bcd 100644 --- a/handlers/admin-post/doUpdateLotType.d.ts +++ b/handlers/admin-post/doUpdateBurialSiteType.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/admin-post/doUpdateLotType.js b/handlers/admin-post/doUpdateBurialSiteType.js similarity index 52% rename from handlers/admin-post/doUpdateLotType.js rename to handlers/admin-post/doUpdateBurialSiteType.js index f31b440e..4fa955c3 100644 --- a/handlers/admin-post/doUpdateLotType.js +++ b/handlers/admin-post/doUpdateBurialSiteType.js @@ -1,10 +1,10 @@ import { updateRecord } from '../../database/updateRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { - const success = await updateRecord('LotTypes', request.body.burialSiteTypeId, request.body.lotType, request.session.user); - const lotTypes = await getBurialSiteTypes(); + const success = await updateRecord('BurialSiteTypes', request.body.burialSiteTypeId, request.body.burialSiteType, request.session.user); + const burialSiteTypes = await getBurialSiteTypes(); response.json({ success, - lotTypes + burialSiteTypes }); } diff --git a/handlers/admin-post/doUpdateLotType.ts b/handlers/admin-post/doUpdateBurialSiteType.ts similarity index 75% rename from handlers/admin-post/doUpdateLotType.ts rename to handlers/admin-post/doUpdateBurialSiteType.ts index 8b872d71..2cbe47c3 100644 --- a/handlers/admin-post/doUpdateLotType.ts +++ b/handlers/admin-post/doUpdateBurialSiteType.ts @@ -4,20 +4,20 @@ import { updateRecord } from '../../database/updateRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' export default async function handler( - request: Request, + request: Request, response: Response ): Promise { const success = await updateRecord( - 'LotTypes', + 'BurialSiteTypes', request.body.burialSiteTypeId, - request.body.lotType, + request.body.burialSiteType, request.session.user as User ) - const lotTypes = await getBurialSiteTypes() + const burialSiteTypes = await getBurialSiteTypes() response.json({ success, - lotTypes + burialSiteTypes }) } diff --git a/handlers/admin-post/doUpdateLotOccupantType.d.ts b/handlers/admin-post/doUpdateLotOccupantType.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/admin-post/doUpdateLotOccupantType.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doUpdateLotOccupantType.js b/handlers/admin-post/doUpdateLotOccupantType.js deleted file mode 100644 index 856177cc..00000000 --- a/handlers/admin-post/doUpdateLotOccupantType.js +++ /dev/null @@ -1,10 +0,0 @@ -import updateLotOccupantType from '../../database/updateLotOccupantType.js'; -import { getLotOccupantTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateLotOccupantType(request.body, request.session.user); - const lotOccupantTypes = await getLotOccupantTypes(); - response.json({ - success, - lotOccupantTypes - }); -} diff --git a/handlers/admin-post/doUpdateLotOccupantType.ts b/handlers/admin-post/doUpdateLotOccupantType.ts deleted file mode 100644 index e554dc95..00000000 --- a/handlers/admin-post/doUpdateLotOccupantType.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { Request, Response } from 'express' - -import updateLotOccupantType, { - type UpdateLotOccupantTypeForm -} from '../../database/updateLotOccupantType.js' -import { getLotOccupantTypes } from '../../helpers/functions.cache.js' - -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await updateLotOccupantType( - request.body as UpdateLotOccupantTypeForm, - request.session.user as User - ) - - const lotOccupantTypes = await getLotOccupantTypes() - - response.json({ - success, - lotOccupantTypes - }) -} diff --git a/handlers/admin-post/doUpdateLotStatus.js b/handlers/admin-post/doUpdateLotStatus.js deleted file mode 100644 index a31b8797..00000000 --- a/handlers/admin-post/doUpdateLotStatus.js +++ /dev/null @@ -1,10 +0,0 @@ -import { updateRecord } from '../../database/updateRecord.js'; -import { getLotStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateRecord('LotStatuses', request.body.burialSiteStatusId, request.body.lotStatus, request.session.user); - const lotStatuses = await getLotStatuses(); - response.json({ - success, - lotStatuses - }); -} diff --git a/handlers/cemeteries-get/edit.js b/handlers/cemeteries-get/edit.js index 9a35d0e1..b5a5b2de 100644 --- a/handlers/cemeteries-get/edit.js +++ b/handlers/cemeteries-get/edit.js @@ -16,7 +16,7 @@ export default async function handler(request, response) { const burialSiteStatusSummary = await getBurialSiteStatusSummary({ cemeteryId: cemetery.cemeteryId }); - response.render('map-edit', { + response.render('cemetery-edit', { headTitle: cemetery.cemeteryName, isCreate: false, cemetery, diff --git a/handlers/cemeteries-get/edit.ts b/handlers/cemeteries-get/edit.ts index c4c3e9c9..6665d7ce 100644 --- a/handlers/cemeteries-get/edit.ts +++ b/handlers/cemeteries-get/edit.ts @@ -29,7 +29,7 @@ export default async function handler( cemeteryId: cemetery.cemeteryId }) - response.render('map-edit', { + response.render('cemetery-edit', { headTitle: cemetery.cemeteryName, isCreate: false, cemetery, diff --git a/handlers/cemeteries-get/new.js b/handlers/cemeteries-get/new.js index fda2e6dd..1a425ca8 100644 --- a/handlers/cemeteries-get/new.js +++ b/handlers/cemeteries-get/new.js @@ -6,7 +6,7 @@ export default async function handler(_request, response) { cemeteryProvince: getConfigProperty('settings.cemeteries.provinceDefault') }; const cemeterySVGs = await getCemeterySVGs(); - response.render('map-edit', { + response.render('cemetery-edit', { headTitle: `Create a Cemetery`, isCreate: true, cemetery, diff --git a/handlers/cemeteries-get/new.ts b/handlers/cemeteries-get/new.ts index 54fe94b2..999023f1 100644 --- a/handlers/cemeteries-get/new.ts +++ b/handlers/cemeteries-get/new.ts @@ -15,7 +15,7 @@ export default async function handler( const cemeterySVGs = await getCemeterySVGs() - response.render('map-edit', { + response.render('cemetery-edit', { headTitle: `Create a Cemetery`, isCreate: true, cemetery, diff --git a/handlers/cemeteries-get/previous.js b/handlers/cemeteries-get/previous.js index 763f8a0e..a22cd8e3 100644 --- a/handlers/cemeteries-get/previous.js +++ b/handlers/cemeteries-get/previous.js @@ -1,11 +1,11 @@ -import getPreviouscemeteryId from '../../database/getPreviouscemeteryId.js'; +import getPreviousCemeteryId from '../../database/getPreviousCemeteryId.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; export default async function handler(request, response) { const cemeteryId = Number.parseInt(request.params.cemeteryId, 10); - const previouscemeteryId = await getPreviouscemeteryId(cemeteryId); - if (previouscemeteryId === undefined) { - response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/maps/?error=noPreviouscemeteryIdFound`); + const previousCemeteryId = await getPreviousCemeteryId(cemeteryId); + if (previousCemeteryId === undefined) { + response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=noPreviousCemeteryIdFound`); return; } - response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/maps/${previouscemeteryId.toString()}`); + response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/${previousCemeteryId.toString()}`); } diff --git a/handlers/cemeteries-get/previous.ts b/handlers/cemeteries-get/previous.ts index d5f3091b..6b797826 100644 --- a/handlers/cemeteries-get/previous.ts +++ b/handlers/cemeteries-get/previous.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import getPreviouscemeteryId from '../../database/getPreviouscemeteryId.js' +import getPreviousCemeteryId from '../../database/getPreviousCemeteryId.js' import { getConfigProperty } from '../../helpers/config.helpers.js' export default async function handler( @@ -9,13 +9,13 @@ export default async function handler( ): Promise { const cemeteryId = Number.parseInt(request.params.cemeteryId, 10) - const previouscemeteryId = await getPreviouscemeteryId(cemeteryId) + const previousCemeteryId = await getPreviousCemeteryId(cemeteryId) - if (previouscemeteryId === undefined) { + if (previousCemeteryId === undefined) { response.redirect( `${getConfigProperty( 'reverseProxy.urlPrefix' - )}/maps/?error=noPreviouscemeteryIdFound` + )}/cemeteries/?error=noPreviousCemeteryIdFound` ) return } @@ -23,6 +23,6 @@ export default async function handler( response.redirect( `${getConfigProperty( 'reverseProxy.urlPrefix' - )}/maps/${previouscemeteryId.toString()}` + )}/cemeteries/${previousCemeteryId.toString()}` ) } diff --git a/handlers/cemeteries-get/view.js b/handlers/cemeteries-get/view.js index c44fec2f..a76909d7 100644 --- a/handlers/cemeteries-get/view.js +++ b/handlers/cemeteries-get/view.js @@ -1,23 +1,23 @@ -import getLotStatusSummary from '../../database/getLotStatusSummary.js'; -import getLotTypeSummary from '../../database/getLotTypeSummary.js'; -import getMap from '../../database/getMap.js'; +import getBurialSiteStatusSummary from '../../database/getBurialSiteStatusSummary.js'; +import getBurialSiteTypeSummary from '../../database/getBurialSiteTypeSummary.js'; +import getCemetery from '../../database/getCemetery.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; export default async function handler(request, response) { - const map = await getMap(request.params.cemeteryId); - if (map === undefined) { - response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/maps/?error=cemeteryIdNotFound`); + const cemetery = await getCemetery(request.params.cemeteryId); + if (cemetery === undefined) { + response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=cemeteryIdNotFound`); return; } - const lotTypeSummary = await getLotTypeSummary({ - cemeteryId: map.cemeteryId + const burialSiteTypeSummary = await getBurialSiteTypeSummary({ + cemeteryId: cemetery.cemeteryId }); - const lotStatusSummary = await getLotStatusSummary({ - cemeteryId: map.cemeteryId + const burialSiteStatusSummary = await getBurialSiteStatusSummary({ + cemeteryId: cemetery.cemeteryId }); - response.render('map-view', { - headTitle: map.cemeteryName, - map, - lotTypeSummary, - lotStatusSummary + response.render('cemetery-view', { + headTitle: cemetery.cemeteryName, + cemetery, + burialSiteTypeSummary, + burialSiteStatusSummary }); } diff --git a/handlers/cemeteries-get/view.ts b/handlers/cemeteries-get/view.ts index ca950958..a671499d 100644 --- a/handlers/cemeteries-get/view.ts +++ b/handlers/cemeteries-get/view.ts @@ -1,35 +1,35 @@ import type { Request, Response } from 'express' -import getLotStatusSummary from '../../database/getLotStatusSummary.js' -import getLotTypeSummary from '../../database/getLotTypeSummary.js' -import getMap from '../../database/getMap.js' +import getBurialSiteStatusSummary from '../../database/getBurialSiteStatusSummary.js' +import getBurialSiteTypeSummary from '../../database/getBurialSiteTypeSummary.js' +import getCemetery from '../../database/getCemetery.js' import { getConfigProperty } from '../../helpers/config.helpers.js' export default async function handler( request: Request, response: Response ): Promise { - const map = await getMap(request.params.cemeteryId) + const cemetery = await getCemetery(request.params.cemeteryId) - if (map === undefined) { + if (cemetery === undefined) { response.redirect( - `${getConfigProperty('reverseProxy.urlPrefix')}/maps/?error=cemeteryIdNotFound` + `${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=cemeteryIdNotFound` ) return } - const lotTypeSummary = await getLotTypeSummary({ - cemeteryId: map.cemeteryId + const burialSiteTypeSummary = await getBurialSiteTypeSummary({ + cemeteryId: cemetery.cemeteryId }) - const lotStatusSummary = await getLotStatusSummary({ - cemeteryId: map.cemeteryId + const burialSiteStatusSummary = await getBurialSiteStatusSummary({ + cemeteryId: cemetery.cemeteryId }) - response.render('map-view', { - headTitle: map.cemeteryName, - map, - lotTypeSummary, - lotStatusSummary + response.render('cemetery-view', { + headTitle: cemetery.cemeteryName, + cemetery, + burialSiteTypeSummary, + burialSiteStatusSummary }) } diff --git a/handlers/cemeteries-post/doCreateCemetery.d.ts b/handlers/cemeteries-post/doCreateCemetery.d.ts index 19d32e4d..12553b0f 100644 --- a/handlers/cemeteries-post/doCreateCemetery.d.ts +++ b/handlers/cemeteries-post/doCreateCemetery.d.ts @@ -1,2 +1,3 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +import { type AddCemeteryForm } from '../../database/addCemetery.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/cemeteries-post/doCreateCemetery.js b/handlers/cemeteries-post/doCreateCemetery.js index 9761fc7d..0892cc3c 100644 --- a/handlers/cemeteries-post/doCreateCemetery.js +++ b/handlers/cemeteries-post/doCreateCemetery.js @@ -1,6 +1,6 @@ -import addMap from '../../database/addMap.js'; +import addCemetery from '../../database/addCemetery.js'; export default async function handler(request, response) { - const cemeteryId = await addMap(request.body, request.session.user); + const cemeteryId = await addCemetery(request.body, request.session.user); response.json({ success: true, cemeteryId diff --git a/handlers/cemeteries-post/doCreateCemetery.ts b/handlers/cemeteries-post/doCreateCemetery.ts index a75cc7f9..9fae9fca 100644 --- a/handlers/cemeteries-post/doCreateCemetery.ts +++ b/handlers/cemeteries-post/doCreateCemetery.ts @@ -1,13 +1,15 @@ import type { Request, Response } from 'express' -import addMap, { type AddMapForm } from '../../database/addMap.js' +import addCemetery, { + type AddCemeteryForm +} from '../../database/addCemetery.js' export default async function handler( - request: Request, + request: Request, response: Response ): Promise { - const cemeteryId = await addMap( - request.body as AddMapForm, + const cemeteryId = await addCemetery( + request.body, request.session.user as User ) @@ -16,4 +18,3 @@ export default async function handler( cemeteryId }) } - diff --git a/handlers/cemeteries-post/doDeleteCemetery.d.ts b/handlers/cemeteries-post/doDeleteCemetery.d.ts index 19d32e4d..9c8cc345 100644 --- a/handlers/cemeteries-post/doDeleteCemetery.d.ts +++ b/handlers/cemeteries-post/doDeleteCemetery.d.ts @@ -1,2 +1,4 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/cemeteries-post/doDeleteCemetery.js b/handlers/cemeteries-post/doDeleteCemetery.js index bb3c4bea..ca75cff2 100644 --- a/handlers/cemeteries-post/doDeleteCemetery.js +++ b/handlers/cemeteries-post/doDeleteCemetery.js @@ -1,7 +1,7 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js'; export default async function handler(request, response) { - const success = await deleteRecord('Maps', request.body.cemeteryId, request.session.user); + const success = await deleteRecord('Cemeteries', request.body.cemeteryId, request.session.user); response.json({ success }); diff --git a/handlers/cemeteries-post/doDeleteCemetery.ts b/handlers/cemeteries-post/doDeleteCemetery.ts index 610f9f1a..ad1d47c8 100644 --- a/handlers/cemeteries-post/doDeleteCemetery.ts +++ b/handlers/cemeteries-post/doDeleteCemetery.ts @@ -4,11 +4,11 @@ import { deleteRecord } from '../../database/deleteRecord.js' import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js' export default async function handler( - request: Request, + request: Request, response: Response ): Promise { const success = await deleteRecord( - 'Maps', + 'Cemeteries', request.body.cemeteryId, request.session.user as User ) @@ -21,4 +21,3 @@ export default async function handler( clearNextPreviousBurialSiteIdCache(-1) }) } - diff --git a/handlers/cemeteries-post/doUpdateCemetery.d.ts b/handlers/cemeteries-post/doUpdateCemetery.d.ts new file mode 100644 index 00000000..d04e73c4 --- /dev/null +++ b/handlers/cemeteries-post/doUpdateCemetery.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type UpdateCemeteryForm } from '../../database/updateCemetery.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/cemeteries-post/doUpdateMap.js b/handlers/cemeteries-post/doUpdateCemetery.js similarity index 51% rename from handlers/cemeteries-post/doUpdateMap.js rename to handlers/cemeteries-post/doUpdateCemetery.js index f25f92c6..74c26935 100644 --- a/handlers/cemeteries-post/doUpdateMap.js +++ b/handlers/cemeteries-post/doUpdateCemetery.js @@ -1,6 +1,6 @@ -import updateMap from '../../database/updateMap.js'; +import updateCemetery from '../../database/updateCemetery.js'; export default async function handler(request, response) { - const success = await updateMap(request.body, request.session.user); + const success = await updateCemetery(request.body, request.session.user); response.json({ success, cemeteryId: request.body.cemeteryId diff --git a/handlers/cemeteries-post/doUpdateCemetery.ts b/handlers/cemeteries-post/doUpdateCemetery.ts new file mode 100644 index 00000000..f31c3147 --- /dev/null +++ b/handlers/cemeteries-post/doUpdateCemetery.ts @@ -0,0 +1,20 @@ +import type { Request, Response } from 'express' + +import updateCemetery, { + type UpdateCemeteryForm +} from '../../database/updateCemetery.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const success = await updateCemetery( + request.body, + request.session.user as User + ) + + response.json({ + success, + cemeteryId: request.body.cemeteryId + }) +} diff --git a/handlers/cemeteries-post/doUpdateMap.d.ts b/handlers/cemeteries-post/doUpdateMap.d.ts deleted file mode 100644 index 19d32e4d..00000000 --- a/handlers/cemeteries-post/doUpdateMap.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/cemeteries-post/doUpdateMap.ts b/handlers/cemeteries-post/doUpdateMap.ts deleted file mode 100644 index 1455be30..00000000 --- a/handlers/cemeteries-post/doUpdateMap.ts +++ /dev/null @@ -1,18 +0,0 @@ -import type { Request, Response } from 'express' - -import updateMap, { type UpdateMapForm } from '../../database/updateMap.js' - -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await updateMap( - request.body as UpdateMapForm, - request.session.user as User - ) - - response.json({ - success, - cemeteryId: request.body.cemeteryId as string - }) -} diff --git a/routes/admin.js b/routes/admin.js index 33ce2ab0..b5d4978a 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -9,7 +9,7 @@ import handler_doAddFee from '../handlers/admin-post/doAddFee.js'; import handler_doAddFeeCategory from '../handlers/admin-post/doAddFeeCategory.js'; import handler_doAddLotOccupantType from '../handlers/admin-post/doAddLotOccupantType.js'; import handler_doAddLotStatus from '../handlers/admin-post/doAddLotStatus.js'; -import handler_doAddLotType from '../handlers/admin-post/doAddLotType.js'; +import handler_doAddLotType from '../handlers/admin-post/doAddBurialSiteType.js'; import handler_doAddLotTypeField from '../handlers/admin-post/doAddLotTypeField.js'; import handler_doAddOccupancyType from '../handlers/admin-post/doAddOccupancyType.js'; import handler_doAddOccupancyTypeField from '../handlers/admin-post/doAddOccupancyTypeField.js'; diff --git a/routes/admin.ts b/routes/admin.ts index 7896e4cd..1731a22e 100644 --- a/routes/admin.ts +++ b/routes/admin.ts @@ -10,7 +10,7 @@ import handler_doAddFee from '../handlers/admin-post/doAddFee.js' import handler_doAddFeeCategory from '../handlers/admin-post/doAddFeeCategory.js' import handler_doAddLotOccupantType from '../handlers/admin-post/doAddLotOccupantType.js' import handler_doAddLotStatus from '../handlers/admin-post/doAddLotStatus.js' -import handler_doAddLotType from '../handlers/admin-post/doAddLotType.js' +import handler_doAddLotType from '../handlers/admin-post/doAddBurialSiteType.js' import handler_doAddLotTypeField from '../handlers/admin-post/doAddLotTypeField.js' import handler_doAddOccupancyType from '../handlers/admin-post/doAddOccupancyType.js' import handler_doAddOccupancyTypeField from '../handlers/admin-post/doAddOccupancyTypeField.js' diff --git a/routes/cemeteries.js b/routes/cemeteries.js index 48e83e94..d8629786 100644 --- a/routes/cemeteries.js +++ b/routes/cemeteries.js @@ -7,7 +7,7 @@ import handler_search from '../handlers/cemeteries-get/search.js'; import handler_view from '../handlers/cemeteries-get/view.js'; import handler_doCreateMap from '../handlers/cemeteries-post/doCreateCemetery.js'; import handler_doDeleteMap from '../handlers/cemeteries-post/doDeleteCemetery.js'; -import handler_doUpdateMap from '../handlers/cemeteries-post/doUpdateMap.js'; +import handler_doUpdateMap from '../handlers/cemeteries-post/doUpdateCemetery.js'; import { updateGetHandler, updatePostHandler } from '../handlers/permissions.js'; export const router = Router(); router.get('/', handler_search); diff --git a/routes/cemeteries.ts b/routes/cemeteries.ts index 7ad094be..4d9b2780 100644 --- a/routes/cemeteries.ts +++ b/routes/cemeteries.ts @@ -8,7 +8,7 @@ import handler_search from '../handlers/cemeteries-get/search.js' import handler_view from '../handlers/cemeteries-get/view.js' import handler_doCreateMap from '../handlers/cemeteries-post/doCreateCemetery.js' import handler_doDeleteMap from '../handlers/cemeteries-post/doDeleteCemetery.js' -import handler_doUpdateMap from '../handlers/cemeteries-post/doUpdateMap.js' +import handler_doUpdateMap from '../handlers/cemeteries-post/doUpdateCemetery.js' import { updateGetHandler, updatePostHandler } from '../handlers/permissions.js' export const router = Router()