From 44119638c251fdf1ef8f4bd301b2193ee91dd937 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 3 Mar 2025 15:46:18 -0500 Subject: [PATCH] refactoring, plus funeral home maint --- app.js | 2 + app.ts | 2 + cypress/e2e/02-update/cemeteries.cy.js | 8 +- cypress/e2e/02-update/cemeteries.cy.ts | 8 +- data/config.baseOntario.js | 3 +- data/config.baseOntario.ts | 4 +- data/config.baseSsm.js | 3 +- data/config.baseSsm.ts | 5 +- data/config.defaultValues.d.ts | 6 +- data/config.defaultValues.js | 6 +- data/config.defaultValues.ts | 6 +- database/addFuneralHome.d.ts | 10 + database/addFuneralHome.js | 15 + database/addFuneralHome.ts | 47 + database/cleanupDatabase.js | 6 +- database/cleanupDatabase.ts | 6 +- database/deleteRecord.d.ts | 2 +- database/deleteRecord.js | 1 + database/deleteRecord.ts | 2 + database/getFuneralHome.d.ts | 2 + database/getFuneralHome.js | 15 + database/getFuneralHome.ts | 25 + database/getFuneralHomes.d.ts | 2 + database/getFuneralHomes.js | 14 + database/getFuneralHomes.ts | 22 + database/getReportData.js | 24 +- database/getReportData.ts | 24 +- database/updateFuneralHome.d.ts | 11 + database/updateFuneralHome.js | 16 + database/updateFuneralHome.ts | 48 + handlers/admin-get/tables.js | 5 +- handlers/admin-get/tables.ts | 5 +- handlers/api-get/milestoneICS.js | 2 +- handlers/api-get/milestoneICS.ts | 2 +- handlers/cemeteries-get/new.js | 4 +- handlers/cemeteries-get/new.ts | 4 +- handlers/funeralHomes-get/edit.d.ts | 2 + handlers/funeralHomes-get/edit.js | 14 + handlers/funeralHomes-get/edit.ts | 24 + handlers/funeralHomes-get/new.d.ts | 2 + handlers/funeralHomes-get/new.js | 12 + handlers/funeralHomes-get/new.ts | 17 + handlers/funeralHomes-get/search.d.ts | 2 + handlers/funeralHomes-get/search.js | 8 + handlers/funeralHomes-get/search.ts | 15 + handlers/funeralHomes-get/view.d.ts | 2 + handlers/funeralHomes-get/view.js | 14 + handlers/funeralHomes-get/view.ts | 24 + .../doCreateFuneralHome.d.ts | 3 + .../funeralHomes-post/doCreateFuneralHome.js | 8 + .../funeralHomes-post/doCreateFuneralHome.ts | 18 + .../doDeleteFuneralHome.d.ts | 4 + .../funeralHomes-post/doDeleteFuneralHome.js | 7 + .../funeralHomes-post/doDeleteFuneralHome.ts | 18 + .../doUpdateFuneralHome.d.ts | 3 + .../funeralHomes-post/doUpdateFuneralHome.js | 8 + .../funeralHomes-post/doUpdateFuneralHome.ts | 20 + handlers/reports-get/reportName.d.ts | 5 +- handlers/reports-get/reportName.ts | 4 +- ...yType.html => adminContractTypes-add.html} | 16 +- ....html => adminContractTypes-addField.html} | 16 +- ....html => adminContractTypes-addPrint.html} | 14 +- ...Type.html => adminContractTypes-edit.html} | 20 +- ...html => adminContractTypes-editField.html} | 44 +- public/html/adminFees-addFee.html | 4 +- public/html/adminFees-editFee.html | 4 +- ...upant.html => contract-editInterment.html} | 56 +- ...ot.html => contract-selectBurialSite.html} | 0 public/html/lotOccupancy-addComment.html | 14 +- public/html/lotOccupancy-addOccupant.html | 72 +- public/html/lotOccupancy-addTransaction.html | 20 +- public/html/lotOccupancy-createWorkOrder.html | 4 +- public/html/lotOccupancy-editComment.html | 30 +- public/html/lotOccupancy-editFeeQuantity.html | 14 +- public/html/lotOccupancy-editTransaction.html | 30 +- public/html/lotOccupancy-setFeeQuantity.html | 10 +- public/html/workOrder-addLotOccupancy.html | 16 +- public/javascripts/burialSite.edit.js | 2 +- public/javascripts/burialSite.edit.ts | 4 +- public/javascripts/burialSite.search.js | 2 +- public/javascripts/burialSite.search.ts | 4 +- public/javascripts/burialSite.view.js | 2 +- public/javascripts/burialSite.view.ts | 4 +- public/javascripts/burialSiteTypes.admin.js | 2 +- public/javascripts/burialSiteTypes.admin.ts | 4 +- public/javascripts/cemetery.edit.js | 14 +- public/javascripts/cemetery.edit.ts | 16 +- public/javascripts/cemetery.search.js | 10 +- public/javascripts/cemetery.search.ts | 12 +- public/javascripts/contract.edit.js | 695 ++------- public/javascripts/contract.edit.ts | 1110 +++----------- public/javascripts/contract.search.js | 2 +- public/javascripts/contract.search.ts | 4 +- public/javascripts/contractTypes.admin.js | 373 +++-- public/javascripts/contractTypes.admin.ts | 460 +++--- public/javascripts/dashboard.js | 2 +- public/javascripts/dashboard.ts | 2 +- public/javascripts/database.admin.js | 2 +- public/javascripts/database.admin.ts | 2 +- public/javascripts/fees.admin.js | 26 +- public/javascripts/fees.admin.ts | 28 +- public/javascripts/funeralHome.edit.d.ts | 1 + public/javascripts/funeralHome.edit.js | 81 + public/javascripts/funeralHome.edit.ts | 123 ++ public/javascripts/funeralHome.search.d.ts | 1 + public/javascripts/funeralHome.search.js | 82 + public/javascripts/funeralHome.search.ts | 128 ++ public/javascripts/main.js | 10 +- public/javascripts/main.ts | 24 +- public/javascripts/tables.admin.js | 945 +++++------- public/javascripts/tables.admin.ts | 1334 +++++++---------- public/javascripts/types.d.ts | 3 +- public/javascripts/types.ts | 3 +- public/javascripts/workOrder.edit.js | 6 +- public/javascripts/workOrder.edit.ts | 6 +- .../workOrder.milestoneCalendar.js | 2 +- .../workOrder.milestoneCalendar.ts | 2 +- public/javascripts/workOrder.outlook.js | 2 +- public/javascripts/workOrder.outlook.ts | 2 +- public/javascripts/workOrder.search.js | 2 +- public/javascripts/workOrder.search.ts | 2 +- public/javascripts/workOrder.view.js | 2 +- public/javascripts/workOrder.view.ts | 2 +- routes/funeralHomes.d.ts | 2 + routes/funeralHomes.js | 18 + routes/funeralHomes.ts | 40 + temp/legacy.importFromCSV.js | 60 +- temp/legacy.importFromCSV.ts | 112 +- temp/legacy.importFromCsv.ids.d.ts | 6 +- temp/legacy.importFromCsv.ids.js | 6 +- temp/legacy.importFromCsv.ids.ts | 6 +- test/functions.js | 18 +- test/functions.ts | 18 +- types/configTypes.d.ts | 9 +- types/configTypes.ts | 9 +- types/recordTypes.d.ts | 10 + types/recordTypes.ts | 11 + views/_header.ejs | 6 + views/_menu-admin.ejs | 12 +- views/admin-contractTypes.ejs | 30 +- views/admin-database.ejs | 2 +- views/admin-fees.ejs | 2 +- views/admin-tables.ejs | 276 ++-- views/cemetery-edit.ejs | 167 +-- views/contract-edit.ejs | 613 ++++---- views/contract-view.ejs | 144 +- views/dashboard.ejs | 10 +- views/funeralHome-edit.ejs | 162 ++ views/funeralHome-search.ejs | 65 + views/funeralHome-view.ejs | 70 + views/print/pdf/ssm.cemetery.burialPermit.ejs | 8 +- views/print/pdf/ssm.cemetery.contract.ejs | 32 +- views/print/pdf/workOrder.ejs | 4 +- views/print/screen/contract.ejs | 90 +- views/report-search.ejs | 24 +- views/workOrder-view.ejs | 24 +- 156 files changed, 4047 insertions(+), 4549 deletions(-) create mode 100644 database/addFuneralHome.d.ts create mode 100644 database/addFuneralHome.js create mode 100644 database/addFuneralHome.ts create mode 100644 database/getFuneralHome.d.ts create mode 100644 database/getFuneralHome.js create mode 100644 database/getFuneralHome.ts create mode 100644 database/getFuneralHomes.d.ts create mode 100644 database/getFuneralHomes.js create mode 100644 database/getFuneralHomes.ts create mode 100644 database/updateFuneralHome.d.ts create mode 100644 database/updateFuneralHome.js create mode 100644 database/updateFuneralHome.ts create mode 100644 handlers/funeralHomes-get/edit.d.ts create mode 100644 handlers/funeralHomes-get/edit.js create mode 100644 handlers/funeralHomes-get/edit.ts create mode 100644 handlers/funeralHomes-get/new.d.ts create mode 100644 handlers/funeralHomes-get/new.js create mode 100644 handlers/funeralHomes-get/new.ts create mode 100644 handlers/funeralHomes-get/search.d.ts create mode 100644 handlers/funeralHomes-get/search.js create mode 100644 handlers/funeralHomes-get/search.ts create mode 100644 handlers/funeralHomes-get/view.d.ts create mode 100644 handlers/funeralHomes-get/view.js create mode 100644 handlers/funeralHomes-get/view.ts create mode 100644 handlers/funeralHomes-post/doCreateFuneralHome.d.ts create mode 100644 handlers/funeralHomes-post/doCreateFuneralHome.js create mode 100644 handlers/funeralHomes-post/doCreateFuneralHome.ts create mode 100644 handlers/funeralHomes-post/doDeleteFuneralHome.d.ts create mode 100644 handlers/funeralHomes-post/doDeleteFuneralHome.js create mode 100644 handlers/funeralHomes-post/doDeleteFuneralHome.ts create mode 100644 handlers/funeralHomes-post/doUpdateFuneralHome.d.ts create mode 100644 handlers/funeralHomes-post/doUpdateFuneralHome.js create mode 100644 handlers/funeralHomes-post/doUpdateFuneralHome.ts rename public/html/{adminOccupancyTypes-addOccupancyType.html => adminContractTypes-add.html} (68%) rename public/html/{adminOccupancyTypes-addOccupancyTypeField.html => adminContractTypes-addField.html} (72%) rename public/html/{adminOccupancyTypes-addOccupancyTypePrint.html => adminContractTypes-addPrint.html} (77%) rename public/html/{adminOccupancyTypes-editOccupancyType.html => adminContractTypes-edit.html} (66%) rename public/html/{adminOccupancyTypes-editOccupancyTypeField.html => adminContractTypes-editField.html} (80%) rename public/html/{lotOccupancy-editOccupant.html => contract-editInterment.html} (76%) rename public/html/{lotOccupancy-selectLot.html => contract-selectBurialSite.html} (100%) create mode 100644 public/javascripts/funeralHome.edit.d.ts create mode 100644 public/javascripts/funeralHome.edit.js create mode 100644 public/javascripts/funeralHome.edit.ts create mode 100644 public/javascripts/funeralHome.search.d.ts create mode 100644 public/javascripts/funeralHome.search.js create mode 100644 public/javascripts/funeralHome.search.ts create mode 100644 routes/funeralHomes.d.ts create mode 100644 routes/funeralHomes.js create mode 100644 routes/funeralHomes.ts create mode 100644 views/funeralHome-edit.ejs create mode 100644 views/funeralHome-search.ejs create mode 100644 views/funeralHome-view.ejs diff --git a/app.js b/app.js index 831a95e3..9c740bb0 100644 --- a/app.js +++ b/app.js @@ -22,6 +22,7 @@ import routerBurialSites from './routes/burialSites.js'; import routerCemeteries from './routes/cemeteries.js'; import routerContracts from './routes/contracts.js'; import routerDashboard from './routes/dashboard.js'; +import routerFuneralHomes from './routes/funeralHomes.js'; import routerLogin from './routes/login.js'; import routerPrint from './routes/print.js'; import routerReports from './routes/reports.js'; @@ -142,6 +143,7 @@ app.use(`${urlPrefix}/api/:apiKey`, permissionHandlers.apiGetHandler, routerApi) app.use(`${urlPrefix}/print`, sessionChecker, routerPrint); app.use(`${urlPrefix}/cemeteries`, sessionChecker, routerCemeteries); app.use(`${urlPrefix}/burialSites`, sessionChecker, routerBurialSites); +app.use(`${urlPrefix}/funeralHomes`, sessionChecker, routerFuneralHomes); app.use(`${urlPrefix}/contracts`, sessionChecker, routerContracts); app.use(`${urlPrefix}/workOrders`, sessionChecker, routerWorkOrders); app.use(`${urlPrefix}/reports`, sessionChecker, routerReports); diff --git a/app.ts b/app.ts index 5e2f85df..753dc21f 100644 --- a/app.ts +++ b/app.ts @@ -24,6 +24,7 @@ import routerBurialSites from './routes/burialSites.js' import routerCemeteries from './routes/cemeteries.js' import routerContracts from './routes/contracts.js' import routerDashboard from './routes/dashboard.js' +import routerFuneralHomes from './routes/funeralHomes.js' import routerLogin from './routes/login.js' import routerPrint from './routes/print.js' import routerReports from './routes/reports.js' @@ -233,6 +234,7 @@ app.use(`${urlPrefix}/api/:apiKey`, permissionHandlers.apiGetHandler, routerApi) app.use(`${urlPrefix}/print`, sessionChecker, routerPrint) app.use(`${urlPrefix}/cemeteries`, sessionChecker, routerCemeteries) app.use(`${urlPrefix}/burialSites`, sessionChecker, routerBurialSites) +app.use(`${urlPrefix}/funeralHomes`, sessionChecker, routerFuneralHomes) app.use(`${urlPrefix}/contracts`, sessionChecker, routerContracts) app.use(`${urlPrefix}/workOrders`, sessionChecker, routerWorkOrders) diff --git a/cypress/e2e/02-update/cemeteries.cy.js b/cypress/e2e/02-update/cemeteries.cy.js index f45c7f6a..7d5f7257 100644 --- a/cypress/e2e/02-update/cemeteries.cy.js +++ b/cypress/e2e/02-update/cemeteries.cy.js @@ -45,8 +45,8 @@ describe('Update - Cemeteries', () => { .type(cemeteryData.cemeteryLongitude?.toString() ?? ''); }); cy.log('Ensure the default city and province are used'); - cy.get("input[name='cemeteryCity']").should('have.value', getConfigProperty('settings.cemeteries.cityDefault')); - cy.get("input[name='cemeteryProvince']").should('have.value', getConfigProperty('settings.cemeteries.provinceDefault')); + cy.get("input[name='cemeteryCity']").should('have.value', getConfigProperty('settings.cityDefault')); + cy.get("input[name='cemeteryProvince']").should('have.value', getConfigProperty('settings.provinceDefault')); cy.log('Submit the form'); cy.get('#form--cemetery').submit(); cy.wait(1000); @@ -58,8 +58,8 @@ describe('Update - Cemeteries', () => { cy.get("textarea[name='cemeteryDescription']").should('have.value', cemeteryData.cemeteryDescription); cy.get("input[name='cemeteryAddress1']").should('have.value', cemeteryData.cemeteryAddress1); cy.get("input[name='cemeteryAddress2']").should('have.value', cemeteryData.cemeteryAddress2); - cy.get("input[name='cemeteryCity']").should('have.value', getConfigProperty('settings.cemeteries.cityDefault')); - cy.get("input[name='cemeteryProvince']").should('have.value', getConfigProperty('settings.cemeteries.provinceDefault')); + cy.get("input[name='cemeteryCity']").should('have.value', getConfigProperty('settings.cityDefault')); + cy.get("input[name='cemeteryProvince']").should('have.value', getConfigProperty('settings.provinceDefault')); cy.get("input[name='cemeteryPostalCode']").should('have.value', cemeteryData.cemeteryPostalCode); cy.get("input[name='cemeteryPhoneNumber']").should('have.value', cemeteryData.cemeteryPhoneNumber); cy.get("input[name='cemeteryLatitude']").should('have.value', cemeteryData.cemeteryLatitude?.toString()); diff --git a/cypress/e2e/02-update/cemeteries.cy.ts b/cypress/e2e/02-update/cemeteries.cy.ts index 9c89de78..8bc66847 100644 --- a/cypress/e2e/02-update/cemeteries.cy.ts +++ b/cypress/e2e/02-update/cemeteries.cy.ts @@ -65,12 +65,12 @@ describe('Update - Cemeteries', () => { cy.get("input[name='cemeteryCity']").should( 'have.value', - getConfigProperty('settings.cemeteries.cityDefault') + getConfigProperty('settings.cityDefault') ) cy.get("input[name='cemeteryProvince']").should( 'have.value', - getConfigProperty('settings.cemeteries.provinceDefault') + getConfigProperty('settings.provinceDefault') ) cy.log('Submit the form') @@ -106,12 +106,12 @@ describe('Update - Cemeteries', () => { cy.get("input[name='cemeteryCity']").should( 'have.value', - getConfigProperty('settings.cemeteries.cityDefault') + getConfigProperty('settings.cityDefault') ) cy.get("input[name='cemeteryProvince']").should( 'have.value', - getConfigProperty('settings.cemeteries.provinceDefault') + getConfigProperty('settings.provinceDefault') ) cy.get("input[name='cemeteryPostalCode']").should( diff --git a/data/config.baseOntario.js b/data/config.baseOntario.js index a8498898..a1e27d50 100644 --- a/data/config.baseOntario.js +++ b/data/config.baseOntario.js @@ -1,6 +1,5 @@ import { config as baseConfig } from './config.base.js'; export const config = Object.assign({}, baseConfig); -config.settings.contracts.provinceDefault = 'ON'; -config.settings.cemeteries.provinceDefault = 'ON'; +config.settings.provinceDefault = 'ON'; config.settings.fees.taxPercentageDefault = 13; export default config; diff --git a/data/config.baseOntario.ts b/data/config.baseOntario.ts index ee30a862..077fb234 100644 --- a/data/config.baseOntario.ts +++ b/data/config.baseOntario.ts @@ -2,9 +2,7 @@ import { config as baseConfig } from './config.base.js' export const config = Object.assign({}, baseConfig) -config.settings.contracts.provinceDefault = 'ON' - -config.settings.cemeteries.provinceDefault = 'ON' +config.settings.provinceDefault = 'ON' config.settings.fees.taxPercentageDefault = 13 diff --git a/data/config.baseSsm.js b/data/config.baseSsm.js index 2a0afd24..ea3bc42b 100644 --- a/data/config.baseSsm.js +++ b/data/config.baseSsm.js @@ -35,12 +35,11 @@ config.settings.burialSites.burialSiteNameSegments = { } } }; -config.settings.contracts.cityDefault = 'Sault Ste. Marie'; +config.settings.cityDefault = 'Sault Ste. Marie'; config.settings.contracts.prints = [ 'pdf/ssm.cemetery.burialPermit', 'pdf/ssm.cemetery.contract' ]; -config.settings.cemeteries.cityDefault = 'Sault Ste. Marie'; config.settings.workOrders.workOrderNumberLength = 6; config.settings.workOrders.workOrderMilestoneDateRecentBeforeDays = 7; config.settings.workOrders.workOrderMilestoneDateRecentAfterDays = 30; diff --git a/data/config.baseSsm.ts b/data/config.baseSsm.ts index 3965c51b..7059e2ef 100644 --- a/data/config.baseSsm.ts +++ b/data/config.baseSsm.ts @@ -41,14 +41,13 @@ config.settings.burialSites.burialSiteNameSegments = { } } -config.settings.contracts.cityDefault = 'Sault Ste. Marie' +config.settings.cityDefault = 'Sault Ste. Marie' + config.settings.contracts.prints = [ 'pdf/ssm.cemetery.burialPermit', 'pdf/ssm.cemetery.contract' ] -config.settings.cemeteries.cityDefault = 'Sault Ste. Marie' - config.settings.workOrders.workOrderNumberLength = 6 config.settings.workOrders.workOrderMilestoneDateRecentBeforeDays = 7 config.settings.workOrders.workOrderMilestoneDateRecentAfterDays = 30 diff --git a/data/config.defaultValues.d.ts b/data/config.defaultValues.d.ts index dc0cc417..e02a1d60 100644 --- a/data/config.defaultValues.d.ts +++ b/data/config.defaultValues.d.ts @@ -24,12 +24,10 @@ export declare const configDefaultValues: { 'aliases.externalReceiptNumber': string; 'aliases.workOrderOpenDate': string; 'aliases.workOrderCloseDate': string; - 'settings.cemeteries.cityDefault': string; - 'settings.cemeteries.provinceDefault': string; + 'settings.cityDefault': string; + 'settings.provinceDefault': string; 'settings.burialSites.burialSiteNameSegments': ConfigBurialSiteNameSegments; 'settings.contracts.burialSiteIdIsRequired': boolean; - 'settings.contracts.cityDefault': string; - 'settings.contracts.provinceDefault': string; 'settings.contracts.prints': string[]; 'settings.fees.taxPercentageDefault': number; 'settings.workOrders.workOrderNumberLength': number; diff --git a/data/config.defaultValues.js b/data/config.defaultValues.js index c176db9a..a6d88a17 100644 --- a/data/config.defaultValues.js +++ b/data/config.defaultValues.js @@ -23,8 +23,8 @@ export const configDefaultValues = { 'aliases.externalReceiptNumber': 'External Receipt Number', 'aliases.workOrderOpenDate': 'Order Date', 'aliases.workOrderCloseDate': 'Completion Date', - 'settings.cemeteries.cityDefault': '', - 'settings.cemeteries.provinceDefault': '', + 'settings.cityDefault': '', + 'settings.provinceDefault': '', 'settings.burialSites.burialSiteNameSegments': { separator: '-', segments: { @@ -38,8 +38,6 @@ export const configDefaultValues = { } }, 'settings.contracts.burialSiteIdIsRequired': true, - 'settings.contracts.cityDefault': '', - 'settings.contracts.provinceDefault': '', 'settings.contracts.prints': ['screen/contract'], 'settings.fees.taxPercentageDefault': 0, 'settings.workOrders.workOrderNumberLength': 6, diff --git a/data/config.defaultValues.ts b/data/config.defaultValues.ts index a4f83559..71415c3b 100644 --- a/data/config.defaultValues.ts +++ b/data/config.defaultValues.ts @@ -39,8 +39,8 @@ export const configDefaultValues = { 'aliases.workOrderOpenDate': 'Order Date', 'aliases.workOrderCloseDate': 'Completion Date', - 'settings.cemeteries.cityDefault': '', - 'settings.cemeteries.provinceDefault': '', + 'settings.cityDefault': '', + 'settings.provinceDefault': '', 'settings.burialSites.burialSiteNameSegments': { separator: '-', @@ -57,8 +57,6 @@ export const configDefaultValues = { 'settings.contracts.burialSiteIdIsRequired': true, - 'settings.contracts.cityDefault': '', - 'settings.contracts.provinceDefault': '', 'settings.contracts.prints': ['screen/contract'], 'settings.fees.taxPercentageDefault': 0, diff --git a/database/addFuneralHome.d.ts b/database/addFuneralHome.d.ts new file mode 100644 index 00000000..46e3a817 --- /dev/null +++ b/database/addFuneralHome.d.ts @@ -0,0 +1,10 @@ +export interface AddForm { + funeralHomeName: string; + funeralHomeAddress1: string; + funeralHomeAddress2: string; + funeralHomeCity: string; + funeralHomeProvince: string; + funeralHomePostalCode: string; + funeralHomePhoneNumber: string; +} +export default function addFuneralHome(addForm: AddForm, user: User): Promise; diff --git a/database/addFuneralHome.js b/database/addFuneralHome.js new file mode 100644 index 00000000..e83bf842 --- /dev/null +++ b/database/addFuneralHome.js @@ -0,0 +1,15 @@ +import { acquireConnection } from './pool.js'; +export default async function addFuneralHome(addForm, user) { + const database = await acquireConnection(); + const rightNowMillis = Date.now(); + const result = database + .prepare(`insert into FuneralHomes ( + funeralHomeName, funeralHomeAddress1, funeralHomeAddress2, + funeralHomeCity, funeralHomeProvince, funeralHomePostalCode, funeralHomePhoneNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) + .run(addForm.funeralHomeName, addForm.funeralHomeAddress1, addForm.funeralHomeAddress2, addForm.funeralHomeCity, addForm.funeralHomeProvince, addForm.funeralHomePostalCode, addForm.funeralHomePhoneNumber, user.userName, rightNowMillis, user.userName, rightNowMillis); + database.release(); + return result.lastInsertRowid; +} diff --git a/database/addFuneralHome.ts b/database/addFuneralHome.ts new file mode 100644 index 00000000..f96ea474 --- /dev/null +++ b/database/addFuneralHome.ts @@ -0,0 +1,47 @@ +import { acquireConnection } from './pool.js' + +export interface AddForm { + funeralHomeName: string + funeralHomeAddress1: string + funeralHomeAddress2: string + funeralHomeCity: string + funeralHomeProvince: string + funeralHomePostalCode: string + funeralHomePhoneNumber: string +} + +export default async function addFuneralHome( + addForm: AddForm, + user: User +): Promise { + const database = await acquireConnection() + + const rightNowMillis = Date.now() + + const result = database + .prepare( + `insert into FuneralHomes ( + funeralHomeName, funeralHomeAddress1, funeralHomeAddress2, + funeralHomeCity, funeralHomeProvince, funeralHomePostalCode, funeralHomePhoneNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` + ) + .run( + addForm.funeralHomeName, + addForm.funeralHomeAddress1, + addForm.funeralHomeAddress2, + addForm.funeralHomeCity, + addForm.funeralHomeProvince, + addForm.funeralHomePostalCode, + addForm.funeralHomePhoneNumber, + user.userName, + rightNowMillis, + user.userName, + rightNowMillis + ) + + database.release() + + return result.lastInsertRowid as number +} diff --git a/database/cleanupDatabase.js b/database/cleanupDatabase.js index 87919327..c7750b54 100644 --- a/database/cleanupDatabase.js +++ b/database/cleanupDatabase.js @@ -23,7 +23,7 @@ export default async function cleanupDatabase(user) { .prepare('delete from WorkOrderComments where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; /* - * Work Order Burial Site Contracts + * Work Order Contracts */ inactivatedRecordCount += database .prepare(`update WorkOrderContracts @@ -181,7 +181,7 @@ export default async function cleanupDatabase(user) { and contractTypeFieldId not in (select contractTypeFieldId from ContractFields)`) .run(recordDeleteTimeMillisMin).changes; /* - * Occupancy Type Prints + * Contract Type Prints */ inactivatedRecordCount += database .prepare(`update ContractTypePrints @@ -246,7 +246,7 @@ export default async function cleanupDatabase(user) { and burialSiteId not in (select burialSiteId from BurialSiteComments) and burialSiteId not in (select burialSiteId from BurialSiteFields) and burialSiteId not in (select burialSiteId from Contracts) - and burialSiteId not in (select burialSiteId from WorkOrderLots)`) + and burialSiteId not in (select burialSiteId from WorkOrderBurialSites)`) .run(recordDeleteTimeMillisMin).changes; /* * Burial Site Statuses diff --git a/database/cleanupDatabase.ts b/database/cleanupDatabase.ts index cf6dca1f..144abbec 100644 --- a/database/cleanupDatabase.ts +++ b/database/cleanupDatabase.ts @@ -37,7 +37,7 @@ export default async function cleanupDatabase( .run(recordDeleteTimeMillisMin).changes /* - * Work Order Burial Site Contracts + * Work Order Contracts */ inactivatedRecordCount += database @@ -271,7 +271,7 @@ export default async function cleanupDatabase( .run(recordDeleteTimeMillisMin).changes /* - * Occupancy Type Prints + * Contract Type Prints */ inactivatedRecordCount += database @@ -364,7 +364,7 @@ export default async function cleanupDatabase( and burialSiteId not in (select burialSiteId from BurialSiteComments) and burialSiteId not in (select burialSiteId from BurialSiteFields) and burialSiteId not in (select burialSiteId from Contracts) - and burialSiteId not in (select burialSiteId from WorkOrderLots)` + and burialSiteId not in (select burialSiteId from WorkOrderBurialSites)` ) .run(recordDeleteTimeMillisMin).changes diff --git a/database/deleteRecord.d.ts b/database/deleteRecord.d.ts index 8ecf9f25..b5323573 100644 --- a/database/deleteRecord.d.ts +++ b/database/deleteRecord.d.ts @@ -1,3 +1,3 @@ -type RecordTable = 'FeeCategories' | 'Fees' | 'BurialSites' | 'BurialSiteComments' | 'Contracts' | 'ContractComments' | 'BurialSiteStatuses' | 'BurialSiteTypes' | 'BurialSiteTypeFields' | 'Cemeteries' | 'ContractTypes' | 'ContractTypeFields' | 'WorkOrders' | 'WorkOrderComments' | 'WorkOrderMilestones' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; +type RecordTable = 'FeeCategories' | 'Fees' | 'BurialSites' | 'BurialSiteComments' | 'Contracts' | 'ContractComments' | 'BurialSiteStatuses' | 'BurialSiteTypes' | 'BurialSiteTypeFields' | 'Cemeteries' | 'FuneralHomes' | 'ContractTypes' | 'ContractTypeFields' | 'WorkOrders' | 'WorkOrderComments' | 'WorkOrderMilestones' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; export declare function deleteRecord(recordTable: RecordTable, recordId: number | string, user: User): Promise; export {}; diff --git a/database/deleteRecord.js b/database/deleteRecord.js index eef67d90..8a096af5 100644 --- a/database/deleteRecord.js +++ b/database/deleteRecord.js @@ -11,6 +11,7 @@ recordIdColumns.set('BurialSiteStatuses', 'burialSiteStatusId'); recordIdColumns.set('BurialSiteTypes', 'burialSiteTypeId'); recordIdColumns.set('BurialSiteTypeFields', 'burialSiteTypeFieldId'); recordIdColumns.set('Cemeteries', 'cemeteryId'); +recordIdColumns.set('FuneralHomes', 'funeralHomeId'); recordIdColumns.set('ContractTypes', 'contractTypeId'); recordIdColumns.set('ContractTypeFields', 'contractTypeFieldId'); recordIdColumns.set('WorkOrders', 'workOrderId'); diff --git a/database/deleteRecord.ts b/database/deleteRecord.ts index a5a17a0c..3bf0c442 100644 --- a/database/deleteRecord.ts +++ b/database/deleteRecord.ts @@ -13,6 +13,7 @@ type RecordTable = | 'BurialSiteTypes' | 'BurialSiteTypeFields' | 'Cemeteries' + | 'FuneralHomes' | 'ContractTypes' | 'ContractTypeFields' | 'WorkOrders' @@ -32,6 +33,7 @@ recordIdColumns.set('BurialSiteStatuses', 'burialSiteStatusId') recordIdColumns.set('BurialSiteTypes', 'burialSiteTypeId') recordIdColumns.set('BurialSiteTypeFields', 'burialSiteTypeFieldId') recordIdColumns.set('Cemeteries', 'cemeteryId') +recordIdColumns.set('FuneralHomes', 'funeralHomeId') recordIdColumns.set('ContractTypes', 'contractTypeId') recordIdColumns.set('ContractTypeFields', 'contractTypeFieldId') recordIdColumns.set('WorkOrders', 'workOrderId') diff --git a/database/getFuneralHome.d.ts b/database/getFuneralHome.d.ts new file mode 100644 index 00000000..c33ac8e5 --- /dev/null +++ b/database/getFuneralHome.d.ts @@ -0,0 +1,2 @@ +import type { FuneralHome } from '../types/recordTypes.js'; +export default function getFuneralHome(funeralHomeId: number | string): Promise; diff --git a/database/getFuneralHome.js b/database/getFuneralHome.js new file mode 100644 index 00000000..dbde71eb --- /dev/null +++ b/database/getFuneralHome.js @@ -0,0 +1,15 @@ +import { acquireConnection } from './pool.js'; +export default async function getFuneralHome(funeralHomeId) { + const database = await acquireConnection(); + const funeralHome = database + .prepare(`select funeralHomeId, funeralHomeName, + funeralHomeAddress1, funeralHomeAddress2, + funeralHomeCity, funeralHomeProvince, funeralHomePostalCode, funeralHomePhoneNumber + from FuneralHomes f + where f.recordDelete_timeMillis is null + and f.funeralHomeId = ? + order by f.funeralHomeName, f.funeralHomeId`) + .get(funeralHomeId); + database.release(); + return funeralHome; +} diff --git a/database/getFuneralHome.ts b/database/getFuneralHome.ts new file mode 100644 index 00000000..2e2eef24 --- /dev/null +++ b/database/getFuneralHome.ts @@ -0,0 +1,25 @@ +import type { Cemetery, FuneralHome } from '../types/recordTypes.js' + +import { acquireConnection } from './pool.js' + +export default async function getFuneralHome( + funeralHomeId: number | string +): Promise { + const database = await acquireConnection() + + const funeralHome = database + .prepare( + `select funeralHomeId, funeralHomeName, + funeralHomeAddress1, funeralHomeAddress2, + funeralHomeCity, funeralHomeProvince, funeralHomePostalCode, funeralHomePhoneNumber + from FuneralHomes f + where f.recordDelete_timeMillis is null + and f.funeralHomeId = ? + order by f.funeralHomeName, f.funeralHomeId` + ) + .get(funeralHomeId) as Cemetery | undefined + + database.release() + + return funeralHome +} diff --git a/database/getFuneralHomes.d.ts b/database/getFuneralHomes.d.ts new file mode 100644 index 00000000..4fb76855 --- /dev/null +++ b/database/getFuneralHomes.d.ts @@ -0,0 +1,2 @@ +import type { FuneralHome } from '../types/recordTypes.js'; +export default function getFuneralHomes(): Promise; diff --git a/database/getFuneralHomes.js b/database/getFuneralHomes.js new file mode 100644 index 00000000..e61010b4 --- /dev/null +++ b/database/getFuneralHomes.js @@ -0,0 +1,14 @@ +import { acquireConnection } from './pool.js'; +export default async function getFuneralHomes() { + const database = await acquireConnection(); + const funeralHomes = database + .prepare(`select funeralHomeId, funeralHomeName, + funeralHomeAddress1, funeralHomeAddress2, + funeralHomeCity, funeralHomeProvince, funeralHomePostalCode, funeralHomePhoneNumber + from FuneralHomes f + where f.recordDelete_timeMillis is null + order by f.funeralHomeName, f.funeralHomeId`) + .all(); + database.release(); + return funeralHomes; +} diff --git a/database/getFuneralHomes.ts b/database/getFuneralHomes.ts new file mode 100644 index 00000000..e505551d --- /dev/null +++ b/database/getFuneralHomes.ts @@ -0,0 +1,22 @@ +import type { Cemetery, FuneralHome } from '../types/recordTypes.js' + +import { acquireConnection } from './pool.js' + +export default async function getFuneralHomes(): Promise { + const database = await acquireConnection() + + const funeralHomes = database + .prepare( + `select funeralHomeId, funeralHomeName, + funeralHomeAddress1, funeralHomeAddress2, + funeralHomeCity, funeralHomeProvince, funeralHomePostalCode, funeralHomePhoneNumber + from FuneralHomes f + where f.recordDelete_timeMillis is null + order by f.funeralHomeName, f.funeralHomeId` + ) + .all() as Cemetery[] + + database.release() + + return funeralHomes +} diff --git a/database/getReportData.js b/database/getReportData.js index 3fd7f1ad..89ad396b 100644 --- a/database/getReportData.js +++ b/database/getReportData.js @@ -28,11 +28,7 @@ export default async function getReportData(reportName, reportParameters = {}) { case 'burialSites-byBurialSiteTypeId': { sql = `select l.burialSiteId, m.cemeteryName, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, t.burialSiteType, s.burialSiteStatus from BurialSites l @@ -47,11 +43,7 @@ export default async function getReportData(reportName, reportParameters = {}) { case 'burialSites-byBurialSiteStatusId': { sql = `select l.burialSiteId, m.cemeteryName, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, t.burialSiteType, s.burialSiteStatus from BurialSites l @@ -66,11 +58,7 @@ export default async function getReportData(reportName, reportParameters = {}) { case 'burialSites-byCemeteryId': { sql = `select l.burialSiteId, m.cemeteryName, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, t.burialSiteType, s.burialSiteStatus from BurialSites l @@ -96,11 +84,7 @@ export default async function getReportData(reportName, reportParameters = {}) { } case 'contracts-current-byCemeteryId': { sql = `select o.contractId, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, m.cemeteryName, ot.contractType, o.contractStartDate, diff --git a/database/getReportData.ts b/database/getReportData.ts index c6f336d4..7bd4e9d0 100644 --- a/database/getReportData.ts +++ b/database/getReportData.ts @@ -46,11 +46,7 @@ export default async function getReportData( case 'burialSites-byBurialSiteTypeId': { sql = `select l.burialSiteId, m.cemeteryName, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, t.burialSiteType, s.burialSiteStatus from BurialSites l @@ -68,11 +64,7 @@ export default async function getReportData( case 'burialSites-byBurialSiteStatusId': { sql = `select l.burialSiteId, m.cemeteryName, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, t.burialSiteType, s.burialSiteStatus from BurialSites l @@ -90,11 +82,7 @@ export default async function getReportData( case 'burialSites-byCemeteryId': { sql = `select l.burialSiteId, m.cemeteryName, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, t.burialSiteType, s.burialSiteStatus from BurialSites l @@ -126,11 +114,7 @@ export default async function getReportData( case 'contracts-current-byCemeteryId': { sql = `select o.contractId, - l.burialSiteNameSegment1, - l.burialSiteNameSegment2, - l.burialSiteNameSegment3, - l.burialSiteNameSegment4, - l.burialSiteNameSegment5, + l.burialSiteName, m.cemeteryName, ot.contractType, o.contractStartDate, diff --git a/database/updateFuneralHome.d.ts b/database/updateFuneralHome.d.ts new file mode 100644 index 00000000..dee8c5e8 --- /dev/null +++ b/database/updateFuneralHome.d.ts @@ -0,0 +1,11 @@ +export interface UpdateForm { + funeralHomeId: number | string; + funeralHomeName: string; + funeralHomeAddress1: string; + funeralHomeAddress2: string; + funeralHomeCity: string; + funeralHomeProvince: string; + funeralHomePostalCode: string; + funeralHomePhoneNumber: string; +} +export default function updateFuneralHome(updateForm: UpdateForm, user: User): Promise; diff --git a/database/updateFuneralHome.js b/database/updateFuneralHome.js new file mode 100644 index 00000000..b0b6aa99 --- /dev/null +++ b/database/updateFuneralHome.js @@ -0,0 +1,16 @@ +import { acquireConnection } from './pool.js'; +export default async function updateFuneralHome(updateForm, user) { + const database = await acquireConnection(); + const rightNowMillis = Date.now(); + const result = database + .prepare(`update FuneralHomes + set funeralHomeName = ?, + funeralHomeAddress1 = ?, funeralHomeAddress2 = ?, + funeralHomeCity = ?, funeralHomeProvince = ?, funeralHomePostalCode = ?, funeralHomePhoneNumber = ?, + recordUpdate_userName = ?, recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and funeralHomeId = ?`) + .run(updateForm.funeralHomeName, updateForm.funeralHomeAddress1, updateForm.funeralHomeAddress2, updateForm.funeralHomeCity, updateForm.funeralHomeProvince, updateForm.funeralHomePostalCode, updateForm.funeralHomePhoneNumber, user.userName, rightNowMillis, updateForm.funeralHomeId); + database.release(); + return result.changes > 0; +} diff --git a/database/updateFuneralHome.ts b/database/updateFuneralHome.ts new file mode 100644 index 00000000..2354fe33 --- /dev/null +++ b/database/updateFuneralHome.ts @@ -0,0 +1,48 @@ +import { acquireConnection } from './pool.js' + +export interface UpdateForm { + funeralHomeId: number | string + funeralHomeName: string + funeralHomeAddress1: string + funeralHomeAddress2: string + funeralHomeCity: string + funeralHomeProvince: string + funeralHomePostalCode: string + funeralHomePhoneNumber: string +} + +export default async function updateFuneralHome( + updateForm: UpdateForm, + user: User +): Promise { + const database = await acquireConnection() + + const rightNowMillis = Date.now() + + const result = database + .prepare( + `update FuneralHomes + set funeralHomeName = ?, + funeralHomeAddress1 = ?, funeralHomeAddress2 = ?, + funeralHomeCity = ?, funeralHomeProvince = ?, funeralHomePostalCode = ?, funeralHomePhoneNumber = ?, + recordUpdate_userName = ?, recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and funeralHomeId = ?` + ) + .run( + updateForm.funeralHomeName, + updateForm.funeralHomeAddress1, + updateForm.funeralHomeAddress2, + updateForm.funeralHomeCity, + updateForm.funeralHomeProvince, + updateForm.funeralHomePostalCode, + updateForm.funeralHomePhoneNumber, + user.userName, + rightNowMillis, + updateForm.funeralHomeId + ) + + database.release() + + return result.changes > 0 +} diff --git a/handlers/admin-get/tables.js b/handlers/admin-get/tables.js index 9caed8fd..9009f759 100644 --- a/handlers/admin-get/tables.js +++ b/handlers/admin-get/tables.js @@ -1,15 +1,12 @@ -import { getSolidIconClasses } from '@cityssm/font-awesome-v5-iconclasses'; 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 burialSiteStatuses = await getBurialSiteStatuses(); - const fontAwesomeIconClasses = await getSolidIconClasses(); response.render('admin-tables', { headTitle: 'Config Table Management', workOrderTypes, workOrderMilestoneTypes, - burialSiteStatuses, - fontAwesomeIconClasses + burialSiteStatuses }); } diff --git a/handlers/admin-get/tables.ts b/handlers/admin-get/tables.ts index 47f786f7..a62de824 100644 --- a/handlers/admin-get/tables.ts +++ b/handlers/admin-get/tables.ts @@ -15,13 +15,10 @@ export default async function handler( const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() const burialSiteStatuses = await getBurialSiteStatuses() - const fontAwesomeIconClasses = await getSolidIconClasses() - response.render('admin-tables', { headTitle: 'Config Table Management', workOrderTypes, workOrderMilestoneTypes, - burialSiteStatuses, - fontAwesomeIconClasses + burialSiteStatuses }) } diff --git a/handlers/api-get/milestoneICS.js b/handlers/api-get/milestoneICS.js index 4984ad2d..c2c8661f 100644 --- a/handlers/api-get/milestoneICS.js +++ b/handlers/api-get/milestoneICS.js @@ -60,7 +60,7 @@ function buildEventDescriptionHTML_occupancies(request, milestone) { descriptionHTML += ` - ${escapeHTML(occupancy.occupancyType ?? '')} + ${escapeHTML(occupancy.contractType ?? '')} diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts index a9f3020a..8a6a52d3 100644 --- a/handlers/api-get/milestoneICS.ts +++ b/handlers/api-get/milestoneICS.ts @@ -95,7 +95,7 @@ function buildEventDescriptionHTML_occupancies( descriptionHTML += ` - ${escapeHTML(occupancy.occupancyType ?? '')} + ${escapeHTML(occupancy.contractType ?? '')} diff --git a/handlers/cemeteries-get/new.js b/handlers/cemeteries-get/new.js index 1a425ca8..cd33aba0 100644 --- a/handlers/cemeteries-get/new.js +++ b/handlers/cemeteries-get/new.js @@ -2,8 +2,8 @@ import { getCemeterySVGs } from '../../helpers/cemeteries.helpers.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; export default async function handler(_request, response) { const cemetery = { - cemeteryCity: getConfigProperty('settings.cemeteries.cityDefault'), - cemeteryProvince: getConfigProperty('settings.cemeteries.provinceDefault') + cemeteryCity: getConfigProperty('settings.cityDefault'), + cemeteryProvince: getConfigProperty('settings.provinceDefault') }; const cemeterySVGs = await getCemeterySVGs(); response.render('cemetery-edit', { diff --git a/handlers/cemeteries-get/new.ts b/handlers/cemeteries-get/new.ts index 999023f1..74ed4ce9 100644 --- a/handlers/cemeteries-get/new.ts +++ b/handlers/cemeteries-get/new.ts @@ -9,8 +9,8 @@ export default async function handler( response: Response ): Promise { const cemetery: Cemetery = { - cemeteryCity: getConfigProperty('settings.cemeteries.cityDefault'), - cemeteryProvince: getConfigProperty('settings.cemeteries.provinceDefault') + cemeteryCity: getConfigProperty('settings.cityDefault'), + cemeteryProvince: getConfigProperty('settings.provinceDefault') } const cemeterySVGs = await getCemeterySVGs() diff --git a/handlers/funeralHomes-get/edit.d.ts b/handlers/funeralHomes-get/edit.d.ts new file mode 100644 index 00000000..19d32e4d --- /dev/null +++ b/handlers/funeralHomes-get/edit.d.ts @@ -0,0 +1,2 @@ +import type { Request, Response } from 'express'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/funeralHomes-get/edit.js b/handlers/funeralHomes-get/edit.js new file mode 100644 index 00000000..3f7cf9db --- /dev/null +++ b/handlers/funeralHomes-get/edit.js @@ -0,0 +1,14 @@ +import getFuneralHome from '../../database/getFuneralHome.js'; +import { getConfigProperty } from '../../helpers/config.helpers.js'; +export default async function handler(request, response) { + const funeralHome = await getFuneralHome(request.params.funeralHomeId); + if (funeralHome === undefined) { + response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/funeralHomes/?error=funeralHomeIdNotFound`); + return; + } + response.render('funeralHome-edit', { + headTitle: funeralHome.funeralHomeName, + isCreate: false, + funeralHome + }); +} diff --git a/handlers/funeralHomes-get/edit.ts b/handlers/funeralHomes-get/edit.ts new file mode 100644 index 00000000..daf2d7e2 --- /dev/null +++ b/handlers/funeralHomes-get/edit.ts @@ -0,0 +1,24 @@ +import type { Request, Response } from 'express' + +import getFuneralHome from '../../database/getFuneralHome.js' +import { getConfigProperty } from '../../helpers/config.helpers.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const funeralHome = await getFuneralHome(request.params.funeralHomeId) + + if (funeralHome === undefined) { + response.redirect( + `${getConfigProperty('reverseProxy.urlPrefix')}/funeralHomes/?error=funeralHomeIdNotFound` + ) + return + } + + response.render('funeralHome-edit', { + headTitle: funeralHome.funeralHomeName, + isCreate: false, + funeralHome + }) +} diff --git a/handlers/funeralHomes-get/new.d.ts b/handlers/funeralHomes-get/new.d.ts new file mode 100644 index 00000000..f4584afd --- /dev/null +++ b/handlers/funeralHomes-get/new.d.ts @@ -0,0 +1,2 @@ +import type { Request, Response } from 'express'; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/funeralHomes-get/new.js b/handlers/funeralHomes-get/new.js new file mode 100644 index 00000000..9c35d88b --- /dev/null +++ b/handlers/funeralHomes-get/new.js @@ -0,0 +1,12 @@ +import { getConfigProperty } from '../../helpers/config.helpers.js'; +export default function handler(_request, response) { + const funeralHome = { + funeralHomeCity: getConfigProperty('settings.cityDefault'), + funeralHomeProvince: getConfigProperty('settings.provinceDefault') + }; + response.render('funeralHome-edit', { + headTitle: `Create a Funeral Home`, + isCreate: true, + funeralHome + }); +} diff --git a/handlers/funeralHomes-get/new.ts b/handlers/funeralHomes-get/new.ts new file mode 100644 index 00000000..92c7b7d1 --- /dev/null +++ b/handlers/funeralHomes-get/new.ts @@ -0,0 +1,17 @@ +import type { Request, Response } from 'express' + +import { getConfigProperty } from '../../helpers/config.helpers.js' +import type { FuneralHome } from '../../types/recordTypes.js' + +export default function handler(_request: Request, response: Response): void { + const funeralHome: FuneralHome = { + funeralHomeCity: getConfigProperty('settings.cityDefault'), + funeralHomeProvince: getConfigProperty('settings.provinceDefault') + } + + response.render('funeralHome-edit', { + headTitle: `Create a Funeral Home`, + isCreate: true, + funeralHome + }) +} diff --git a/handlers/funeralHomes-get/search.d.ts b/handlers/funeralHomes-get/search.d.ts new file mode 100644 index 00000000..4bcb65f6 --- /dev/null +++ b/handlers/funeralHomes-get/search.d.ts @@ -0,0 +1,2 @@ +import type { Request, Response } from 'express'; +export default function handler(_request: Request, response: Response): Promise; diff --git a/handlers/funeralHomes-get/search.js b/handlers/funeralHomes-get/search.js new file mode 100644 index 00000000..969419b5 --- /dev/null +++ b/handlers/funeralHomes-get/search.js @@ -0,0 +1,8 @@ +import getFuneralHomes from '../../database/getFuneralHomes.js'; +export default async function handler(_request, response) { + const funeralHomes = await getFuneralHomes(); + response.render('funeralHome-search', { + headTitle: `Funeral Home Search`, + funeralHomes + }); +} diff --git a/handlers/funeralHomes-get/search.ts b/handlers/funeralHomes-get/search.ts new file mode 100644 index 00000000..f90aa34e --- /dev/null +++ b/handlers/funeralHomes-get/search.ts @@ -0,0 +1,15 @@ +import type { Request, Response } from 'express' + +import getFuneralHomes from '../../database/getFuneralHomes.js' + +export default async function handler( + _request: Request, + response: Response +): Promise { + const funeralHomes = await getFuneralHomes() + + response.render('funeralHome-search', { + headTitle: `Funeral Home Search`, + funeralHomes + }) +} diff --git a/handlers/funeralHomes-get/view.d.ts b/handlers/funeralHomes-get/view.d.ts new file mode 100644 index 00000000..19d32e4d --- /dev/null +++ b/handlers/funeralHomes-get/view.d.ts @@ -0,0 +1,2 @@ +import type { Request, Response } from 'express'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/funeralHomes-get/view.js b/handlers/funeralHomes-get/view.js new file mode 100644 index 00000000..190983c2 --- /dev/null +++ b/handlers/funeralHomes-get/view.js @@ -0,0 +1,14 @@ +import getFuneralHome from '../../database/getFuneralHome.js'; +import { getConfigProperty } from '../../helpers/config.helpers.js'; +export default async function handler(request, response) { + const funeralHome = await getFuneralHome(request.params.funeralHomeId); + if (funeralHome === undefined) { + response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/funeralHomes/?error=funeralHomeIdNotFound`); + return; + } + response.render('funeralHome-view', { + headTitle: funeralHome.funeralHomeName, + isCreate: false, + funeralHome + }); +} diff --git a/handlers/funeralHomes-get/view.ts b/handlers/funeralHomes-get/view.ts new file mode 100644 index 00000000..0c8c6f25 --- /dev/null +++ b/handlers/funeralHomes-get/view.ts @@ -0,0 +1,24 @@ +import type { Request, Response } from 'express' + +import getFuneralHome from '../../database/getFuneralHome.js' +import { getConfigProperty } from '../../helpers/config.helpers.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const funeralHome = await getFuneralHome(request.params.funeralHomeId) + + if (funeralHome === undefined) { + response.redirect( + `${getConfigProperty('reverseProxy.urlPrefix')}/funeralHomes/?error=funeralHomeIdNotFound` + ) + return + } + + response.render('funeralHome-view', { + headTitle: funeralHome.funeralHomeName, + isCreate: false, + funeralHome + }) +} diff --git a/handlers/funeralHomes-post/doCreateFuneralHome.d.ts b/handlers/funeralHomes-post/doCreateFuneralHome.d.ts new file mode 100644 index 00000000..5ca3c69d --- /dev/null +++ b/handlers/funeralHomes-post/doCreateFuneralHome.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type AddForm } from '../../database/addFuneralHome.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/funeralHomes-post/doCreateFuneralHome.js b/handlers/funeralHomes-post/doCreateFuneralHome.js new file mode 100644 index 00000000..588d107e --- /dev/null +++ b/handlers/funeralHomes-post/doCreateFuneralHome.js @@ -0,0 +1,8 @@ +import addFuneralHome from '../../database/addFuneralHome.js'; +export default async function handler(request, response) { + const funeralHomeId = await addFuneralHome(request.body, request.session.user); + response.json({ + success: true, + funeralHomeId + }); +} diff --git a/handlers/funeralHomes-post/doCreateFuneralHome.ts b/handlers/funeralHomes-post/doCreateFuneralHome.ts new file mode 100644 index 00000000..88cc71f9 --- /dev/null +++ b/handlers/funeralHomes-post/doCreateFuneralHome.ts @@ -0,0 +1,18 @@ +import type { Request, Response } from 'express' + +import addFuneralHome, { type AddForm } from '../../database/addFuneralHome.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const funeralHomeId = await addFuneralHome( + request.body, + request.session.user as User + ) + + response.json({ + success: true, + funeralHomeId + }) +} diff --git a/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts b/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts new file mode 100644 index 00000000..33acaa76 --- /dev/null +++ b/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts @@ -0,0 +1,4 @@ +import type { Request, Response } from 'express'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/funeralHomes-post/doDeleteFuneralHome.js b/handlers/funeralHomes-post/doDeleteFuneralHome.js new file mode 100644 index 00000000..95027a6a --- /dev/null +++ b/handlers/funeralHomes-post/doDeleteFuneralHome.js @@ -0,0 +1,7 @@ +import { deleteRecord } from '../../database/deleteRecord.js'; +export default async function handler(request, response) { + const success = await deleteRecord('FuneralHomes', request.body.funeralHomeId, request.session.user); + response.json({ + success + }); +} diff --git a/handlers/funeralHomes-post/doDeleteFuneralHome.ts b/handlers/funeralHomes-post/doDeleteFuneralHome.ts new file mode 100644 index 00000000..8a7fe099 --- /dev/null +++ b/handlers/funeralHomes-post/doDeleteFuneralHome.ts @@ -0,0 +1,18 @@ +import type { Request, Response } from 'express' + +import { deleteRecord } from '../../database/deleteRecord.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const success = await deleteRecord( + 'FuneralHomes', + request.body.funeralHomeId, + request.session.user as User + ) + + response.json({ + success + }) +} diff --git a/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts b/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts new file mode 100644 index 00000000..25c89065 --- /dev/null +++ b/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type UpdateForm } from '../../database/updateFuneralHome.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/funeralHomes-post/doUpdateFuneralHome.js b/handlers/funeralHomes-post/doUpdateFuneralHome.js new file mode 100644 index 00000000..d476b065 --- /dev/null +++ b/handlers/funeralHomes-post/doUpdateFuneralHome.js @@ -0,0 +1,8 @@ +import updateFuneralHome from '../../database/updateFuneralHome.js'; +export default async function handler(request, response) { + const success = await updateFuneralHome(request.body, request.session.user); + response.json({ + success, + funeralHomeId: request.body.funeralHomeId + }); +} diff --git a/handlers/funeralHomes-post/doUpdateFuneralHome.ts b/handlers/funeralHomes-post/doUpdateFuneralHome.ts new file mode 100644 index 00000000..94086a5f --- /dev/null +++ b/handlers/funeralHomes-post/doUpdateFuneralHome.ts @@ -0,0 +1,20 @@ +import type { Request, Response } from 'express' + +import updateFuneralHome, { + type UpdateForm +} from '../../database/updateFuneralHome.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + const success = await updateFuneralHome( + request.body, + request.session.user as User + ) + + response.json({ + success, + funeralHomeId: request.body.funeralHomeId + }) +} diff --git a/handlers/reports-get/reportName.d.ts b/handlers/reports-get/reportName.d.ts index 19d32e4d..bb919204 100644 --- a/handlers/reports-get/reportName.d.ts +++ b/handlers/reports-get/reportName.d.ts @@ -1,2 +1,5 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +import { type ReportParameters } from '../../database/getReportData.js'; +export default function handler(request: Request<{ + reportName: string; +}, unknown, unknown, ReportParameters>, response: Response): Promise; diff --git a/handlers/reports-get/reportName.ts b/handlers/reports-get/reportName.ts index 2cf9cdc3..d0b5206a 100644 --- a/handlers/reports-get/reportName.ts +++ b/handlers/reports-get/reportName.ts @@ -6,14 +6,14 @@ import getReportData, { } from '../../database/getReportData.js' export default async function handler( - request: Request, + request: Request<{ reportName: string }, unknown, unknown, ReportParameters>, response: Response ): Promise { const reportName = request.params.reportName const rows = await getReportData( reportName, - request.query as ReportParameters + request.query ) if (rows === undefined) { diff --git a/public/html/adminOccupancyTypes-addOccupancyType.html b/public/html/adminContractTypes-add.html similarity index 68% rename from public/html/adminOccupancyTypes-addOccupancyType.html rename to public/html/adminContractTypes-add.html index e1e5b8c0..3eaf5cc5 100644 --- a/public/html/adminOccupancyTypes-addOccupancyType.html +++ b/public/html/adminContractTypes-add.html @@ -3,7 +3,7 @@

- Add Type + Add Contract Type

-
+
- Contract Type
- Add Type + Add Contract Type diff --git a/public/html/adminOccupancyTypes-addOccupancyTypeField.html b/public/html/adminContractTypes-addField.html similarity index 72% rename from public/html/adminOccupancyTypes-addOccupancyTypeField.html rename to public/html/adminContractTypes-addField.html index 84b99116..57be1477 100644 --- a/public/html/adminOccupancyTypes-addOccupancyTypeField.html +++ b/public/html/adminContractTypes-addField.html @@ -3,7 +3,7 @@

- Add Type Field + Add Contract Type Field

- +
-
Add Field diff --git a/public/html/adminOccupancyTypes-addOccupancyTypePrint.html b/public/html/adminContractTypes-addPrint.html similarity index 77% rename from public/html/adminOccupancyTypes-addOccupancyTypePrint.html rename to public/html/adminContractTypes-addPrint.html index 0067f3a9..b6c7f05e 100644 --- a/public/html/adminOccupancyTypes-addOccupancyTypePrint.html +++ b/public/html/adminContractTypes-addPrint.html @@ -3,7 +3,7 @@

- Add Type Print + Add Contract Type Print

- +
-
- Contract Type
Update TypeUpdate Contract Type diff --git a/public/html/adminOccupancyTypes-editOccupancyTypeField.html b/public/html/adminContractTypes-editField.html similarity index 80% rename from public/html/adminOccupancyTypes-editOccupancyTypeField.html rename to public/html/adminContractTypes-editField.html index 15d4f335..8c3d4a92 100644 --- a/public/html/adminOccupancyTypes-editOccupancyTypeField.html +++ b/public/html/adminContractTypes-editField.html @@ -3,7 +3,7 @@

- Update Type Field + Update Contract Type Field

- +
@@ -24,14 +24,14 @@
-
@@ -83,13 +83,13 @@
-

@@ -164,7 +164,7 @@

- + -
- +
-
-
-
-
@@ -231,7 +231,7 @@
- +
-
@@ -36,7 +36,7 @@
diff --git a/public/html/lotOccupancy-addTransaction.html b/public/html/lotOccupancy-addTransaction.html index 5583beb8..e1e2ffcc 100644 --- a/public/html/lotOccupancy-addTransaction.html +++ b/public/html/lotOccupancy-addTransaction.html @@ -10,10 +10,10 @@ >
-
+ @@ -21,13 +21,13 @@
-
@@ -73,7 +73,7 @@
- +
@@ -43,14 +43,14 @@
@@ -64,14 +64,14 @@
@@ -88,7 +88,7 @@
- - - -
- +
-
@@ -78,13 +78,13 @@
Update Transaction diff --git a/public/html/lotOccupancy-setFeeQuantity.html b/public/html/lotOccupancy-setFeeQuantity.html index f5fd14ba..daf7bd14 100644 --- a/public/html/lotOccupancy-setFeeQuantity.html +++ b/public/html/lotOccupancy-setFeeQuantity.html @@ -10,15 +10,15 @@ >
- - ${cemetery.burialSiteCount} `); } searchResultsContainerElement.innerHTML = ''; if (searchResultCount === 0) { - // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = `

There are no cemeteries that meet the search criteria.

`; @@ -78,7 +77,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); const searchResultsTableElement = document.createElement('table'); searchResultsTableElement.className = 'table is-fullwidth is-striped is-hoverable has-sticky-header'; - // eslint-disable-next-line no-unsanitized/property searchResultsTableElement.innerHTML = ` Cemetery Address diff --git a/public/javascripts/cemetery.search.ts b/public/javascripts/cemetery.search.ts index 18f38484..12a54d95 100644 --- a/public/javascripts/cemetery.search.ts +++ b/public/javascripts/cemetery.search.ts @@ -2,13 +2,13 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { Cemetery } from '../../types/recordTypes.js' -import type { LOS } from './types.js' +import type { Sunrise } from './types.js' declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.los as LOS + const sunrise = exports.sunrise as Sunrise const cemeteries = exports.cemeteries as Cemetery[] @@ -23,7 +23,7 @@ declare const exports: Record // eslint-disable-next-line complexity function renderResults(): void { // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = los.getLoadingParagraphHTML( + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( `Loading Cemeteries...` ) @@ -60,7 +60,7 @@ declare const exports: Record 'beforeend', ` - + ${cityssm.escapeHTML( (cemetery.cemeteryName ?? '') === '' ? '(No Name)' : cemetery.cemeteryName ?? '' )} @@ -106,7 +106,7 @@ declare const exports: Record : '' } - ${cemetery.burialSiteCount} + ${cemetery.burialSiteCount} ` ) @@ -115,7 +115,6 @@ declare const exports: Record searchResultsContainerElement.innerHTML = '' if (searchResultCount === 0) { - // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = `

There are no cemeteries that meet the search criteria.

` @@ -125,7 +124,6 @@ declare const exports: Record searchResultsTableElement.className = 'table is-fullwidth is-striped is-hoverable has-sticky-header' - // eslint-disable-next-line no-unsanitized/property searchResultsTableElement.innerHTML = ` Cemetery Address diff --git a/public/javascripts/contract.edit.js b/public/javascripts/contract.edit.js index 607b4cae..b40459c2 100644 --- a/public/javascripts/contract.edit.js +++ b/public/javascripts/contract.edit.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const sunrise = exports.sunrise; const contractId = document.querySelector('#contract--contractId').value; const isCreate = contractId === ''; /* @@ -9,13 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); */ let refreshAfterSave = isCreate; function setUnsavedChanges() { - los.setUnsavedChanges(); + sunrise.setUnsavedChanges(); document .querySelector("button[type='submit'][form='form--contract']") ?.classList.remove('is-light'); } function clearUnsavedChanges() { - los.clearUnsavedChanges(); + sunrise.clearUnsavedChanges(); document .querySelector("button[type='submit'][form='form--contract']") ?.classList.add('is-light'); @@ -23,23 +23,23 @@ Object.defineProperty(exports, "__esModule", { value: true }); const formElement = document.querySelector('#form--contract'); formElement.addEventListener('submit', (formEvent) => { formEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/${isCreate ? 'doCreateBurialSiteOccupancy' : 'doUpdateContract'}`, formElement, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/${isCreate ? 'doCreateContract' : 'doUpdateContract'}`, formElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { clearUnsavedChanges(); if (isCreate || refreshAfterSave) { - globalThis.location.href = los.getContractURL(responseJSON.contractId, true, true); + globalThis.location.href = sunrise.getContractURL(responseJSON.contractId, true, true); } else { bulmaJS.alert({ - message: `${los.escapedAliases.Occupancy} Updated Successfully`, + message: `Contract Updated Successfully`, contextualColorName: 'success' }); } } else { bulmaJS.alert({ - title: `Error Saving ${los.escapedAliases.Occupancy}`, + title: `Error Saving Contract`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); @@ -51,13 +51,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); formInputElement.addEventListener('change', setUnsavedChanges); } function doCopy() { - cityssm.postJSON(`${los.urlPrefix}/contracts/doCopyContract`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doCopyContract`, { contractId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { clearUnsavedChanges(); - globalThis.location.href = los.getContractURL(responseJSON.contractId, true); + globalThis.location.href = sunrise.getContractURL(responseJSON.contractId, true); } else { bulmaJS.alert({ @@ -72,7 +72,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); .querySelector('#button--copyContract') ?.addEventListener('click', (clickEvent) => { clickEvent.preventDefault(); - if (los.hasUnsavedChanges()) { + if (sunrise.hasUnsavedChanges()) { bulmaJS.alert({ title: 'Unsaved Changes', message: 'Please save all unsaved changes before continuing.', @@ -81,7 +81,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } else { bulmaJS.confirm({ - title: `Copy ${los.escapedAliases.Occupancy} Record as New`, + title: `Copy Contract Record as New`, message: 'Are you sure you want to copy this record to a new record?', contextualColorName: 'info', okButton: { @@ -92,17 +92,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); document - .querySelector('#button--deleteLotOccupancy') + .querySelector('#button--deleteContract') ?.addEventListener('click', (clickEvent) => { clickEvent.preventDefault(); function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/contracts/doDeleteContract`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContract`, { contractId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { clearUnsavedChanges(); - globalThis.location.href = los.getContractURL(); + globalThis.location.href = sunrise.getContractURL(); } else { bulmaJS.alert({ @@ -114,7 +114,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Record`, + title: `Delete Contract Record`, message: 'Are you sure you want to delete this record?', contextualColorName: 'warning', okButton: { @@ -130,7 +130,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let createCloseModalFunction; function doCreate(formEvent) { formEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doCreateWorkOrder`, formEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doCreateWorkOrder`, formEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { createCloseModalFunction(); @@ -140,8 +140,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); contextualColorName: 'success', okButton: { text: 'Yes, Open the Work Order', - callbackFunction: () => { - globalThis.location.href = los.getWorkOrderURL(responseJSON.workOrderId, true); + callbackFunction() { + globalThis.location.href = sunrise.getWorkOrderURL(responseJSON.workOrderId, true); } } }); @@ -187,41 +187,39 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); }); - // Occupancy Type + // Contract Type const contractTypeIdElement = document.querySelector('#contract--contractTypeId'); if (isCreate) { const contractFieldsContainerElement = document.querySelector('#container--contractFields'); contractTypeIdElement.addEventListener('change', () => { if (contractTypeIdElement.value === '') { - // eslint-disable-next-line no-unsanitized/property contractFieldsContainerElement.innerHTML = `
-

Select the ${los.escapedAliases.occupancy} type to load the available fields.

+

Select the contract type to load the available fields.

`; return; } - cityssm.postJSON(`${los.urlPrefix}/contracts/doGetContractTypeFields`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetContractTypeFields`, { contractTypeId: contractTypeIdElement.value }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; - if (responseJSON.ContractTypeFields.length === 0) { - // eslint-disable-next-line no-unsanitized/property + if (responseJSON.contractTypeFields.length === 0) { contractFieldsContainerElement.innerHTML = `
-

There are no additional fields for this ${los.escapedAliases.occupancy} type.

+

There are no additional fields for this contract type.

`; return; } contractFieldsContainerElement.innerHTML = ''; let contractTypeFieldIds = ''; - for (const occupancyTypeField of responseJSON.ContractTypeFields) { - contractTypeFieldIds += `,${occupancyTypeField.contractTypeFieldId.toString()}`; - const fieldName = `contractFieldValue_${occupancyTypeField.contractTypeFieldId.toString()}`; + for (const contractTypeField of responseJSON.contractTypeFields) { + contractTypeFieldIds += `,${contractTypeField.contractTypeFieldId.toString()}`; + const fieldName = `contractFieldValue_${contractTypeField.contractTypeFieldId.toString()}`; const fieldId = `contract--${fieldName}`; const fieldElement = document.createElement('div'); fieldElement.className = 'field'; fieldElement.innerHTML = `
`; - fieldElement.querySelector('label').textContent = occupancyTypeField.occupancyTypeField; - if (occupancyTypeField.fieldType === 'select' || - (occupancyTypeField.occupancyTypeFieldValues ?? '') !== '') { + fieldElement.querySelector('label').textContent = contractTypeField.contractTypeField; + if (contractTypeField.fieldType === 'select' || + (contractTypeField.fieldValues ?? '') !== '') { ; fieldElement.querySelector('.control').innerHTML = `
`; const selectElement = fieldElement.querySelector('select'); - selectElement.required = occupancyTypeField.isRequired; - const optionValues = occupancyTypeField.occupancyTypeFieldValues.split('\n'); + selectElement.required = contractTypeField.isRequired; + const optionValues = contractTypeField.fieldValues.split('\n'); for (const optionValue of optionValues) { const optionElement = document.createElement('option'); optionElement.value = optionValue; @@ -243,19 +241,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); inputElement.className = 'input'; inputElement.id = fieldId; inputElement.name = fieldName; - inputElement.type = occupancyTypeField.fieldType; - inputElement.required = occupancyTypeField.isRequired; - inputElement.minLength = - occupancyTypeField.minLength; - inputElement.maxLength = - occupancyTypeField.maxLength; - if ((occupancyTypeField.pattern ?? '') !== '') { - inputElement.pattern = occupancyTypeField.pattern; + inputElement.type = contractTypeField.fieldType; + inputElement.required = contractTypeField.isRequired; + inputElement.minLength = contractTypeField.minLength; + inputElement.maxLength = contractTypeField.maxLength; + if ((contractTypeField.pattern ?? '') !== '') { + inputElement.pattern = contractTypeField.pattern; } ; fieldElement.querySelector('.control').append(inputElement); } - console.log(fieldElement); contractFieldsContainerElement.append(fieldElement); } contractFieldsContainerElement.insertAdjacentHTML('beforeend', @@ -266,12 +261,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } else { - const originalcontractTypeId = contractTypeIdElement.value; + const originalContractTypeId = contractTypeIdElement.value; contractTypeIdElement.addEventListener('change', () => { - if (contractTypeIdElement.value !== originalcontractTypeId) { + if (contractTypeIdElement.value !== originalContractTypeId) { bulmaJS.confirm({ title: 'Confirm Change', - message: `Are you sure you want to change the ${los.escapedAliases.occupancy} type?\n + message: `Are you sure you want to change the contract type?\n This change affects the additional fields associated with this record, and may also affect the available fees.`, contextualColorName: 'warning', okButton: { @@ -283,147 +278,145 @@ Object.defineProperty(exports, "__esModule", { value: true }); cancelButton: { text: 'Revert the Change', callbackFunction: () => { - contractTypeIdElement.value = originalcontractTypeId; + contractTypeIdElement.value = originalContractTypeId; } } }); } }); } - // Lot Selector - const lotNameElement = document.querySelector('#contract--lotName'); - lotNameElement.addEventListener('click', (clickEvent) => { - const currentLotName = clickEvent.currentTarget.value; - let lotSelectCloseModalFunction; - let lotSelectModalElement; - let lotSelectFormElement; - let lotSelectResultsElement; - function renderSelectedLotAndClose(lotId, lotName) { + // Burial Site Selector + const burialSiteNameElement = document.querySelector('#contract--burialSiteName'); + burialSiteNameElement.addEventListener('click', (clickEvent) => { + const currentBurialSiteName = clickEvent.currentTarget + .value; + let burialSiteSelectCloseModalFunction; + let burialSiteSelectModalElement; + let burialSiteSelectFormElement; + let burialSiteSelectResultsElement; + function renderSelectedBurialSiteAndClose(burialSiteId, burialSiteName) { ; - document.querySelector('#contract--lotId').value = lotId.toString(); - document.querySelector('#contract--lotName').value = lotName; + document.querySelector('#contract--burialSiteId').value = burialSiteId.toString(); + document.querySelector('#contract--burialSiteName').value = burialSiteName; setUnsavedChanges(); - lotSelectCloseModalFunction(); + burialSiteSelectCloseModalFunction(); } - function selectExistingLot(clickEvent) { + function selectExistingBurialSite(clickEvent) { clickEvent.preventDefault(); const selectedLotElement = clickEvent.currentTarget; - renderSelectedLotAndClose(selectedLotElement.dataset.lotId ?? '', selectedLotElement.dataset.lotName ?? ''); + renderSelectedBurialSiteAndClose(selectedLotElement.dataset.burialSiteId ?? '', selectedLotElement.dataset.burialSiteName ?? ''); } - function searchLots() { + function searchBurialSites() { // eslint-disable-next-line no-unsanitized/property - lotSelectResultsElement.innerHTML = - los.getLoadingParagraphHTML('Searching...'); - cityssm.postJSON(`${los.urlPrefix}/burialSites/doSearchBurialSites`, lotSelectFormElement, (rawResponseJSON) => { + burialSiteSelectResultsElement.innerHTML = + sunrise.getLoadingParagraphHTML('Searching...'); + cityssm.postJSON(`${sunrise.urlPrefix}/burialSites/doSearchBurialSites`, burialSiteSelectFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.count === 0) { - lotSelectResultsElement.innerHTML = `
+ burialSiteSelectResultsElement.innerHTML = `

No results.

`; return; } const panelElement = document.createElement('div'); panelElement.className = 'panel'; - for (const lot of responseJSON.lots) { + for (const burialSite of responseJSON.burialSites) { const panelBlockElement = document.createElement('a'); panelBlockElement.className = 'panel-block is-block'; panelBlockElement.href = '#'; - panelBlockElement.dataset.lotId = lot.lotId.toString(); - panelBlockElement.dataset.lotName = lot.lotName; + panelBlockElement.dataset.burialSiteId = + burialSite.burialSiteId.toString(); + panelBlockElement.dataset.lotName = burialSite.burialSiteName; // eslint-disable-next-line no-unsanitized/property panelBlockElement.innerHTML = `
- ${cityssm.escapeHTML(lot.lotName ?? '')}
- ${cityssm.escapeHTML(lot.cemeteryName ?? '')} + ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')}
+ ${cityssm.escapeHTML(burialSite.cemeteryName ?? '')}
- ${cityssm.escapeHTML(lot.lotStatus)}
+ ${cityssm.escapeHTML(burialSite.burialSiteStatus)}
- ${lot.contractCount > 0 ? 'Currently Occupied' : ''} + ${(burialSite.contractCount ?? 0) > 0 ? 'Has Current Contract' : ''}
`; - panelBlockElement.addEventListener('click', selectExistingLot); + panelBlockElement.addEventListener('click', selectExistingBurialSite); panelElement.append(panelBlockElement); } - lotSelectResultsElement.innerHTML = ''; - lotSelectResultsElement.append(panelElement); + burialSiteSelectResultsElement.innerHTML = ''; + burialSiteSelectResultsElement.append(panelElement); }); } - function createLotAndSelect(submitEvent) { + function createBurialSiteAndSelect(submitEvent) { submitEvent.preventDefault(); - const lotName = lotSelectModalElement.querySelector('#lotCreate--lotName').value; - cityssm.postJSON(`${los.urlPrefix}/burialSites/doCreateBurialSite`, submitEvent.currentTarget, (rawResponseJSON) => { + const burialSiteName = burialSiteSelectModalElement.querySelector('#burialSiteCreate--burialSiteName').value; + cityssm.postJSON(`${sunrise.urlPrefix}/burialSites/doCreateBurialSite`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { - renderSelectedLotAndClose(responseJSON.lotId ?? '', lotName); + renderSelectedBurialSiteAndClose(responseJSON.burialSiteId ?? '', burialSiteName); } else { bulmaJS.alert({ - title: `Error Creating ${los.escapedAliases.Lot}`, + title: `Error Creating Burial Site`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); } }); } - cityssm.openHtmlModal('contract-selectLot', { + cityssm.openHtmlModal('contract-selectBurialSite', { onshow(modalElement) { - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped(); - lotSelectModalElement = modalElement; - lotSelectCloseModalFunction = closeModalFunction; + burialSiteSelectModalElement = modalElement; + burialSiteSelectCloseModalFunction = closeModalFunction; bulmaJS.init(modalElement); // search Tab - const lotNameFilterElement = modalElement.querySelector('#lotSelect--lotName'); - if (document.querySelector('#contract--lotId') - .value !== '') { - lotNameFilterElement.value = currentLotName; + const burialSiteNameFilterElement = modalElement.querySelector('#burialSiteSelect--burialSiteName'); + if (document.querySelector('#contract--burialSiteId').value !== '') { + burialSiteNameFilterElement.value = currentBurialSiteName; } - lotNameFilterElement.focus(); - lotNameFilterElement.addEventListener('change', searchLots); - const occupancyStatusFilterElement = modalElement.querySelector('#lotSelect--occupancyStatus'); - occupancyStatusFilterElement.addEventListener('change', searchLots); - if (currentLotName !== '') { - occupancyStatusFilterElement.value = ''; + burialSiteNameFilterElement.focus(); + burialSiteNameFilterElement.addEventListener('change', searchBurialSites); + const contractStatusFilterElement = modalElement.querySelector('#burialSiteSelect--occupancyStatus'); + contractStatusFilterElement.addEventListener('change', searchBurialSites); + if (currentBurialSiteName !== '') { + contractStatusFilterElement.value = ''; } - lotSelectFormElement = modalElement.querySelector('#form--lotSelect'); - lotSelectResultsElement = modalElement.querySelector('#resultsContainer--lotSelect'); - lotSelectFormElement.addEventListener('submit', (submitEvent) => { + burialSiteSelectFormElement = modalElement.querySelector('#form--burialSiteSelect'); + burialSiteSelectResultsElement = modalElement.querySelector('#resultsContainer--burialSiteSelect'); + burialSiteSelectFormElement.addEventListener('submit', (submitEvent) => { submitEvent.preventDefault(); }); - searchLots(); - // Create Tab - if (exports.lotNamePattern) { - const regex = exports.lotNamePattern; - modalElement.querySelector('#lotCreate--lotName').pattern = regex.source; - } - const lotTypeElement = modalElement.querySelector('#lotCreate--burialSiteTypeId'); - for (const lotType of exports.lotTypes) { + searchBurialSites(); + const burialSiteTypeElement = modalElement.querySelector('#burialSiteCreate--burialSiteTypeId'); + for (const burialSiteType of exports.burialSiteTypes) { const optionElement = document.createElement('option'); - optionElement.value = lotType.burialSiteTypeId.toString(); - optionElement.textContent = lotType.lotType; - lotTypeElement.append(optionElement); + optionElement.value = burialSiteType.burialSiteTypeId.toString(); + optionElement.textContent = burialSiteType.burialSiteType; + burialSiteTypeElement.append(optionElement); } - const lotStatusElement = modalElement.querySelector('#lotCreate--burialSiteStatusId'); - for (const lotStatus of exports.lotStatuses) { + const burialSiteStatusElement = modalElement.querySelector('#burialSiteCreate--burialSiteStatusId'); + for (const burialSiteStatus of exports.burialSiteStatuses) { const optionElement = document.createElement('option'); - optionElement.value = lotStatus.burialSiteStatusId.toString(); - optionElement.textContent = lotStatus.lotStatus; - lotStatusElement.append(optionElement); + optionElement.value = burialSiteStatus.burialSiteStatusId.toString(); + optionElement.textContent = burialSiteStatus.burialSiteStatus; + burialSiteStatusElement.append(optionElement); } - const mapElement = modalElement.querySelector('#lotCreate--cemeteryId'); - for (const map of exports.maps) { + const mapElement = modalElement.querySelector('#burialSiteCreate--cemeteryId'); + for (const cemetery of exports.cemeteries) { const optionElement = document.createElement('option'); - optionElement.value = map.cemeteryId.toString(); + optionElement.value = cemetery.cemeteryId.toString(); optionElement.textContent = - (map.cemeteryName ?? '') === '' ? '(No Name)' : map.cemeteryName ?? ''; + (cemetery.cemeteryName ?? '') === '' + ? '(No Name)' + : cemetery.cemeteryName ?? ''; mapElement.append(optionElement); } ; - modalElement.querySelector('#form--lotCreate').addEventListener('submit', createLotAndSelect); + modalElement.querySelector('#form--burialSiteCreate').addEventListener('submit', createBurialSiteAndSelect); }, onremoved() { bulmaJS.toggleHtmlClipped(); @@ -431,36 +424,36 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); }); document - .querySelector('.is-lot-view-button') + .querySelector('.is-burial-site-view-button') ?.addEventListener('click', () => { - const lotId = document.querySelector('#contract--lotId').value; - if (lotId === '') { + const burialSiteId = document.querySelector('#contract--burialSiteId').value; + if (burialSiteId === '') { bulmaJS.alert({ - message: `No ${los.escapedAliases.lot} selected.`, + message: `No burial site selected.`, contextualColorName: 'info' }); } else { - window.open(`${los.urlPrefix}/burialSites/${lotId}`); + window.open(`${sunrise.urlPrefix}/burialSites/${burialSiteId}`); } }); document - .querySelector('.is-clear-lot-button') + .querySelector('.is-clear-burial-site-button') ?.addEventListener('click', () => { - if (lotNameElement.disabled) { + if (burialSiteNameElement.disabled) { bulmaJS.alert({ message: 'You need to unlock the field before clearing it.', contextualColorName: 'info' }); } else { - lotNameElement.value = `(No ${los.escapedAliases.Lot})`; - document.querySelector('#contract--lotId').value = ''; + burialSiteNameElement.value = `(No Burial Site)`; + document.querySelector('#contract--burialSiteId').value = ''; setUnsavedChanges(); } }); // Start Date - los.initializeDatePickers(formElement); + sunrise.initializeDatePickers(formElement); document .querySelector('#contract--contractStartDateString') ?.addEventListener('change', () => { @@ -468,398 +461,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); endDatePicker.min = document.querySelector('#contract--contractStartDateString').value; endDatePicker.refresh(); }); - los.initializeUnlockFieldButtons(formElement); - (() => { - let contractOccupants = exports.contractOccupants; - delete exports.contractOccupants; - function openEditLotOccupancyOccupant(clickEvent) { - const lotOccupantIndex = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset - .lotOccupantIndex ?? '', 10); - const contractOccupant = contractOccupants.find((currentLotOccupancyOccupant) => { - return (currentLotOccupancyOccupant.lotOccupantIndex === lotOccupantIndex); - }); - let editFormElement; - let editCloseModalFunction; - function editOccupant(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/doUpdateContractOccupant`, editFormElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractOccupants = responseJSON.contractOccupants; - editCloseModalFunction(); - renderLotOccupancyOccupants(); - } - else { - bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Occupant}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - cityssm.openHtmlModal('contract-editOccupant', { - onshow(modalElement) { - los.populateAliases(modalElement); - modalElement.querySelector('#contractOccupantEdit--contractId').value = contractId; - modalElement.querySelector('#contractOccupantEdit--lotOccupantIndex').value = lotOccupantIndex.toString(); - const lotOccupantTypeSelectElement = modalElement.querySelector('#contractOccupantEdit--lotOccupantTypeId'); - let lotOccupantTypeSelected = false; - for (const lotOccupantType of exports.lotOccupantTypes) { - const optionElement = document.createElement('option'); - optionElement.value = lotOccupantType.lotOccupantTypeId.toString(); - optionElement.textContent = lotOccupantType.lotOccupantType; - optionElement.dataset.occupantCommentTitle = - lotOccupantType.occupantCommentTitle; - optionElement.dataset.fontAwesomeIconClass = - lotOccupantType.fontAwesomeIconClass; - if (lotOccupantType.lotOccupantTypeId === - contractOccupant.lotOccupantTypeId) { - optionElement.selected = true; - lotOccupantTypeSelected = true; - } - lotOccupantTypeSelectElement.append(optionElement); - } - if (!lotOccupantTypeSelected) { - const optionElement = document.createElement('option'); - optionElement.value = - contractOccupant.lotOccupantTypeId?.toString() ?? ''; - optionElement.textContent = - contractOccupant.lotOccupantType ?? ''; - optionElement.dataset.occupantCommentTitle = - contractOccupant.occupantCommentTitle; - optionElement.dataset.fontAwesomeIconClass = - contractOccupant.fontAwesomeIconClass; - optionElement.selected = true; - lotOccupantTypeSelectElement.append(optionElement); - } - ; - modalElement.querySelector('#contractOccupantEdit--fontAwesomeIconClass').innerHTML = - ``; - modalElement.querySelector('#contractOccupantEdit--occupantName').value = contractOccupant.occupantName ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantFamilyName').value = contractOccupant.occupantFamilyName ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantAddress1').value = contractOccupant.occupantAddress1 ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantAddress2').value = contractOccupant.occupantAddress2 ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantCity').value = contractOccupant.occupantCity ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantProvince').value = contractOccupant.occupantProvince ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantPostalCode').value = contractOccupant.occupantPostalCode ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantPhoneNumber').value = contractOccupant.occupantPhoneNumber ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantEmailAddress').value = contractOccupant.occupantEmailAddress ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantCommentTitle').textContent = - (contractOccupant.occupantCommentTitle ?? '') === '' - ? 'Comment' - : contractOccupant.occupantCommentTitle ?? ''; - modalElement.querySelector('#contractOccupantEdit--occupantComment').value = contractOccupant.occupantComment ?? ''; - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped(); - const lotOccupantTypeIdElement = modalElement.querySelector('#contractOccupantEdit--lotOccupantTypeId'); - lotOccupantTypeIdElement.focus(); - lotOccupantTypeIdElement.addEventListener('change', () => { - const fontAwesomeIconClass = lotOccupantTypeIdElement.selectedOptions[0].dataset - .fontAwesomeIconClass ?? 'user'; - modalElement.querySelector('#contractOccupantEdit--fontAwesomeIconClass').innerHTML = - ``; - let occupantCommentTitle = lotOccupantTypeIdElement.selectedOptions[0].dataset - .occupantCommentTitle ?? ''; - if (occupantCommentTitle === '') { - occupantCommentTitle = 'Comment'; - } - ; - modalElement.querySelector('#contractOccupantEdit--occupantCommentTitle').textContent = occupantCommentTitle; - }); - editFormElement = modalElement.querySelector('form'); - editFormElement.addEventListener('submit', editOccupant); - editCloseModalFunction = closeModalFunction; - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - } - }); - } - function deleteLotOccupancyOccupant(clickEvent) { - const lotOccupantIndex = clickEvent.currentTarget.closest('tr')?.dataset.lotOccupantIndex; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/contracts/doDeleteContractOccupant`, { - contractId, - lotOccupantIndex - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractOccupants = responseJSON.contractOccupants; - renderLotOccupancyOccupants(); - } - else { - bulmaJS.alert({ - title: `Error Removing ${los.escapedAliases.Occupant}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: `Remove ${los.escapedAliases.Occupant}?`, - message: `Are you sure you want to remove this ${los.escapedAliases.occupant}?`, - okButton: { - text: `Yes, Remove ${los.escapedAliases.Occupant}`, - callbackFunction: doDelete - }, - contextualColorName: 'warning' - }); - } - function renderLotOccupancyOccupants() { - const occupantsContainer = document.querySelector('#container--contractOccupants'); - cityssm.clearElement(occupantsContainer); - if (contractOccupants.length === 0) { - // eslint-disable-next-line no-unsanitized/property - occupantsContainer.innerHTML = `
-

There are no ${los.escapedAliases.occupants} associated with this record.

-
`; - return; - } - const tableElement = document.createElement('table'); - tableElement.className = 'table is-fullwidth is-striped is-hoverable'; - // eslint-disable-next-line no-unsanitized/property - tableElement.innerHTML = ` - ${los.escapedAliases.Occupant} - Address - Other Contact - Comment - Options - - `; - for (const contractOccupant of contractOccupants) { - const tableRowElement = document.createElement('tr'); - tableRowElement.dataset.lotOccupantIndex = - contractOccupant.lotOccupantIndex?.toString(); - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML((contractOccupant.occupantName ?? '') === '' && - (contractOccupant.occupantFamilyName ?? '') === '' - ? '(No Name)' - : `${contractOccupant.occupantName} ${contractOccupant.occupantFamilyName}`)}
- - - ${cityssm.escapeHTML(contractOccupant.lotOccupantType ?? '')} - - - ${(contractOccupant.occupantAddress1 ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantAddress1 ?? '')}
`} - ${(contractOccupant.occupantAddress2 ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantAddress2 ?? '')}
`} - ${(contractOccupant.occupantCity ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantCity ?? '')}, `} - ${cityssm.escapeHTML(contractOccupant.occupantProvince ?? '')}
- ${cityssm.escapeHTML(contractOccupant.occupantPostalCode ?? '')} - - ${(contractOccupant.occupantPhoneNumber ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantPhoneNumber ?? '')}
`} - ${(contractOccupant.occupantEmailAddress ?? '') === '' - ? '' - : cityssm.escapeHTML(contractOccupant.occupantEmailAddress ?? '')} - - - ${cityssm.escapeHTML(contractOccupant.occupantComment ?? '')} - - -
- - -
- `; - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', openEditLotOccupancyOccupant); - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteLotOccupancyOccupant); - tableElement.querySelector('tbody')?.append(tableRowElement); - } - occupantsContainer.append(tableElement); - } - if (isCreate) { - const lotOccupantTypeIdElement = document.querySelector('#contract--lotOccupantTypeId'); - lotOccupantTypeIdElement.addEventListener('change', () => { - const occupantFields = formElement.querySelectorAll("[data-table='LotOccupancyOccupant']"); - for (const occupantField of occupantFields) { - occupantField.disabled = lotOccupantTypeIdElement.value === ''; - } - let occupantCommentTitle = lotOccupantTypeIdElement.selectedOptions[0].dataset - .occupantCommentTitle ?? ''; - if (occupantCommentTitle === '') { - occupantCommentTitle = 'Comment'; - } - ; - formElement.querySelector('#contract--occupantCommentTitle').textContent = occupantCommentTitle; - }); - } - else { - renderLotOccupancyOccupants(); - } - document - .querySelector('#button--addOccupant') - ?.addEventListener('click', () => { - let addCloseModalFunction; - let addFormElement; - let searchFormElement; - let searchResultsElement; - function addOccupant(formOrObject) { - cityssm.postJSON(`${los.urlPrefix}/contracts/doAddLotOccupancyOccupant`, formOrObject, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractOccupants = responseJSON.contractOccupants; - addCloseModalFunction(); - renderLotOccupancyOccupants(); - } - else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Occupant}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function addOccupantFromForm(submitEvent) { - submitEvent.preventDefault(); - addOccupant(addFormElement); - } - let pastOccupantSearchResults = []; - function addOccupantFromCopy(clickEvent) { - clickEvent.preventDefault(); - const panelBlockElement = clickEvent.currentTarget; - const occupant = pastOccupantSearchResults[Number.parseInt(panelBlockElement.dataset.index ?? '', 10)]; - const lotOccupantTypeId = (panelBlockElement - .closest('.modal') - ?.querySelector('#contractOccupantCopy--lotOccupantTypeId')).value; - if (lotOccupantTypeId === '') { - bulmaJS.alert({ - title: `No ${los.escapedAliases.Occupant} Type Selected`, - message: `Select a type to apply to the newly added ${los.escapedAliases.occupant}.`, - contextualColorName: 'warning' - }); - } - else { - occupant.lotOccupantTypeId = Number.parseInt(lotOccupantTypeId, 10); - occupant.contractId = Number.parseInt(contractId, 10); - addOccupant(occupant); - } - } - function searchOccupants(event) { - event.preventDefault(); - if (searchFormElement.querySelector('#contractOccupantCopy--searchFilter').value === '') { - searchResultsElement.innerHTML = `
-

Enter a partial name or address in the search field above.

-
`; - return; - } - // eslint-disable-next-line no-unsanitized/property - searchResultsElement.innerHTML = - los.getLoadingParagraphHTML('Searching...'); - cityssm.postJSON(`${los.urlPrefix}/contracts/doSearchPastOccupants`, searchFormElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - pastOccupantSearchResults = responseJSON.occupants; - const panelElement = document.createElement('div'); - panelElement.className = 'panel'; - for (const [index, occupant] of pastOccupantSearchResults.entries()) { - const panelBlockElement = document.createElement('a'); - panelBlockElement.className = 'panel-block is-block'; - panelBlockElement.href = '#'; - panelBlockElement.dataset.index = index.toString(); - // eslint-disable-next-line no-unsanitized/property - panelBlockElement.innerHTML = ` - ${cityssm.escapeHTML(occupant.occupantName ?? '')} ${cityssm.escapeHTML(occupant.occupantFamilyName ?? '')} -
-
-
- ${cityssm.escapeHTML(occupant.occupantAddress1 ?? '')}
- ${(occupant.occupantAddress2 ?? '') === '' - ? '' - : `${cityssm.escapeHTML(occupant.occupantAddress2 ?? '')}
`}${cityssm.escapeHTML(occupant.occupantCity ?? '')}, ${cityssm.escapeHTML(occupant.occupantProvince ?? '')}
- ${cityssm.escapeHTML(occupant.occupantPostalCode ?? '')} -
-
- ${(occupant.occupantPhoneNumber ?? '') === '' - ? '' - : `${cityssm.escapeHTML(occupant.occupantPhoneNumber ?? '')}
`} - ${cityssm.escapeHTML(occupant.occupantEmailAddress ?? '')}
-
-
`; - panelBlockElement.addEventListener('click', addOccupantFromCopy); - panelElement.append(panelBlockElement); - } - searchResultsElement.innerHTML = ''; - searchResultsElement.append(panelElement); - }); - } - cityssm.openHtmlModal('contract-addOccupant', { - onshow(modalElement) { - los.populateAliases(modalElement); - modalElement.querySelector('#contractOccupantAdd--contractId').value = contractId; - const lotOccupantTypeSelectElement = modalElement.querySelector('#contractOccupantAdd--lotOccupantTypeId'); - const lotOccupantTypeCopySelectElement = modalElement.querySelector('#contractOccupantCopy--lotOccupantTypeId'); - for (const lotOccupantType of exports.lotOccupantTypes) { - const optionElement = document.createElement('option'); - optionElement.value = lotOccupantType.lotOccupantTypeId.toString(); - optionElement.textContent = lotOccupantType.lotOccupantType; - optionElement.dataset.occupantCommentTitle = - lotOccupantType.occupantCommentTitle; - optionElement.dataset.fontAwesomeIconClass = - lotOccupantType.fontAwesomeIconClass; - lotOccupantTypeSelectElement.append(optionElement); - lotOccupantTypeCopySelectElement.append(optionElement.cloneNode(true)); - } - ; - modalElement.querySelector('#contractOccupantAdd--occupantCity').value = exports.occupantCityDefault; - modalElement.querySelector('#contractOccupantAdd--occupantProvince').value = exports.occupantProvinceDefault; - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped(); - bulmaJS.init(modalElement); - const lotOccupantTypeIdElement = modalElement.querySelector('#contractOccupantAdd--lotOccupantTypeId'); - lotOccupantTypeIdElement.focus(); - lotOccupantTypeIdElement.addEventListener('change', () => { - const fontAwesomeIconClass = lotOccupantTypeIdElement.selectedOptions[0].dataset - .fontAwesomeIconClass ?? 'user'; - modalElement.querySelector('#contractOccupantAdd--fontAwesomeIconClass').innerHTML = - ``; - let occupantCommentTitle = lotOccupantTypeIdElement.selectedOptions[0].dataset - .occupantCommentTitle ?? ''; - if (occupantCommentTitle === '') { - occupantCommentTitle = 'Comment'; - } - ; - modalElement.querySelector('#contractOccupantAdd--occupantCommentTitle').textContent = occupantCommentTitle; - }); - addFormElement = modalElement.querySelector('#form--contractOccupantAdd'); - addFormElement.addEventListener('submit', addOccupantFromForm); - searchResultsElement = modalElement.querySelector('#contractOccupantCopy--searchResults'); - searchFormElement = modalElement.querySelector('#form--contractOccupantCopy'); - searchFormElement.addEventListener('submit', (formEvent) => { - formEvent.preventDefault(); - }); - modalElement.querySelector('#contractOccupantCopy--searchFilter').addEventListener('change', searchOccupants); - addCloseModalFunction = closeModalFunction; - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - document.querySelector('#button--addOccupant').focus(); - } - }); - }); - })(); + sunrise.initializeUnlockFieldButtons(formElement); if (!isCreate) { /** * Comments @@ -872,14 +474,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); const contractCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset .contractCommentId ?? '', 10); const contractComment = contractComments.find((currentLotOccupancyComment) => { - return (currentLotOccupancyComment.contractCommentId === - contractCommentId); + return (currentLotOccupancyComment.contractCommentId === contractCommentId); }); let editFormElement; let editCloseModalFunction; function editComment(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/doUpdateContractComment`, editFormElement, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractComment`, editFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { contractComments = responseJSON.contractComments ?? []; @@ -897,7 +498,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } cityssm.openHtmlModal('contract-editComment', { onshow(modalElement) { - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); modalElement.querySelector('#contractCommentEdit--contractId').value = contractId; modalElement.querySelector('#contractCommentEdit--contractCommentId').value = contractCommentId.toString(); modalElement.querySelector('#contractCommentEdit--contractComment').value = contractComment.contractComment ?? ''; @@ -906,15 +507,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); contractComment.contractCommentDateString ?? ''; const currentDateString = cityssm.dateToString(new Date()); contractCommentDateStringElement.max = - contractComment.contractCommentDateString <= - currentDateString + contractComment.contractCommentDateString <= currentDateString ? currentDateString : contractComment.contractCommentDateString ?? ''; modalElement.querySelector('#contractCommentEdit--contractCommentTimeString').value = contractComment.contractCommentTimeString ?? ''; }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped(); - los.initializeDatePickers(modalElement); + sunrise.initializeDatePickers(modalElement); modalElement.querySelector('#contractCommentEdit--contractComment').focus(); editFormElement = modalElement.querySelector('form'); editFormElement.addEventListener('submit', editComment); @@ -929,7 +529,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const contractCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset .contractCommentId ?? '', 10); function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/contracts/doDeleteContractComment`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractComment`, { contractId, contractCommentId }, (rawResponseJSON) => { @@ -1015,7 +615,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let addCloseModalFunction; function addComment(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/doAddContractComment`, addFormElement, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractComment`, addFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { contractComments = responseJSON.contractComments; @@ -1033,7 +633,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } cityssm.openHtmlModal('contract-addComment', { onshow(modalElement) { - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); modalElement.querySelector('#contractCommentAdd--contractId').value = contractId; }, onshown(modalElement, closeModalFunction) { @@ -1059,8 +659,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let feeGrandTotal = 0; for (const contractFee of contractFees) { feeGrandTotal += - ((contractFee.feeAmount ?? 0) + - (contractFee.taxAmount ?? 0)) * + ((contractFee.feeAmount ?? 0) + (contractFee.taxAmount ?? 0)) * (contractFee.quantity ?? 0); } return feeGrandTotal; @@ -1074,7 +673,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let updateCloseModalFunction; function doUpdateQuantity(formEvent) { formEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/doUpdateContractFeeQuantity`, formEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractFeeQuantity`, formEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { contractFees = responseJSON.contractFees; @@ -1114,7 +713,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function deleteContractFee(clickEvent) { const feeId = clickEvent.currentTarget.closest('.container--contractFee').dataset.feeId; function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/contracts/doDeleteContractFee`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractFee`, { contractId, feeId }, (rawResponseJSON) => { @@ -1234,7 +833,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } const addFeeButtonElement = document.querySelector('#button--addFee'); addFeeButtonElement.addEventListener('click', () => { - if (los.hasUnsavedChanges()) { + if (sunrise.hasUnsavedChanges()) { bulmaJS.alert({ message: 'Please save all unsaved changes before adding fees.', contextualColorName: 'warning' @@ -1248,7 +847,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); clickEvent.preventDefault(); const feeCategoryId = Number.parseInt(clickEvent.currentTarget.dataset.feeCategoryId ?? '', 10); - cityssm.postJSON(`${los.urlPrefix}/contracts/doAddContractFeeCategory`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractFeeCategory`, { contractId, feeCategoryId }, (rawResponseJSON) => { @@ -1271,7 +870,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } function doAddFee(feeId, quantity = 1) { - cityssm.postJSON(`${los.urlPrefix}/contracts/doAddLotOccupancyFee`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddLotOccupancyFee`, { contractId, feeId, quantity @@ -1414,7 +1013,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); onshow(modalElement) { feeFilterElement = modalElement.querySelector('#feeSelect--feeName'); feeFilterResultsElement = modalElement.querySelector('#resultsContainer--feeSelect'); - cityssm.postJSON(`${los.urlPrefix}/contracts/doGetFees`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetFees`, { contractId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; @@ -1456,7 +1055,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let editCloseModalFunction; function doEdit(formEvent) { formEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/doUpdateContractTransaction`, formEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractTransaction`, formEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { contractTransactions = responseJSON.contractTransactions; @@ -1474,7 +1073,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } cityssm.openHtmlModal('contract-editTransaction', { onshow(modalElement) { - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); modalElement.querySelector('#contractTransactionEdit--contractId').value = contractId; modalElement.querySelector('#contractTransactionEdit--transactionIndex').value = transaction.transactionIndex?.toString() ?? ''; modalElement.querySelector('#contractTransactionEdit--transactionAmount').value = transaction.transactionAmount.toFixed(2); @@ -1485,7 +1084,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped(); - los.initializeDatePickers(modalElement); + sunrise.initializeDatePickers(modalElement); modalElement.querySelector('#contractTransactionEdit--transactionAmount').focus(); modalElement .querySelector('form') @@ -1500,7 +1099,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function deleteContractTransaction(clickEvent) { const transactionIndex = clickEvent.currentTarget.closest('.container--contractTransaction').dataset.transactionIndex; function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/contracts/doDeleteContractTransaction`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractTransaction`, { contractId, transactionIndex }, (rawResponseJSON) => { @@ -1540,7 +1139,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); contractTransactionsContainerElement.innerHTML = ` - + @@ -1561,7 +1160,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let externalReceiptNumberHTML = ''; if (contractTransaction.externalReceiptNumber !== '') { externalReceiptNumberHTML = cityssm.escapeHTML(contractTransaction.externalReceiptNumber ?? ''); - if (los.dynamicsGPIntegrationIsEnabled) { + if (sunrise.dynamicsGPIntegrationIsEnabled) { if (contractTransaction.dynamicsGPDocument === undefined) { externalReceiptNumberHTML += ` @@ -1638,7 +1237,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let addCloseModalFunction; function doAddTransaction(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/contracts/doAddLotOccupancyTransaction`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddLotOccupancyTransaction`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { contractTransactions = responseJSON.contractTransactions; @@ -1669,7 +1268,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ''; return; } - cityssm.postJSON(`${los.urlPrefix}/contracts/doGetDynamicsGPDocument`, { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetDynamicsGPDocument`, { externalReceiptNumber }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; @@ -1694,7 +1293,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } cityssm.openHtmlModal('contract-addTransaction', { onshow(modalElement) { - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); modalElement.querySelector('#contractTransactionAdd--contractId').value = contractId.toString(); const feeGrandTotal = getFeeGrandTotal(); const transactionGrandTotal = getTransactionGrandTotal(); @@ -1702,7 +1301,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); transactionAmountElement.min = (-1 * transactionGrandTotal).toFixed(2); transactionAmountElement.max = Math.max(feeGrandTotal - transactionGrandTotal, 0).toFixed(2); transactionAmountElement.value = Math.max(feeGrandTotal - transactionGrandTotal, 0).toFixed(2); - if (los.dynamicsGPIntegrationIsEnabled) { + if (sunrise.dynamicsGPIntegrationIsEnabled) { externalReceiptNumberElement = modalElement.querySelector( // eslint-disable-next-line no-secrets/no-secrets '#contractTransactionAdd--externalReceiptNumber'); diff --git a/public/javascripts/contract.edit.ts b/public/javascripts/contract.edit.ts index b4709514..d4aa46a9 100644 --- a/public/javascripts/contract.edit.ts +++ b/public/javascripts/contract.edit.ts @@ -1,29 +1,27 @@ +/* eslint-disable max-lines */ import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { LOS } from '../../types/globalTypes.js' import type { + BurialSite, + BurialSiteStatus, + BurialSiteType, + Cemetery, + ContractInterment, + ContractTypeField, DynamicsGPDocument, Fee, FeeCategory, - Lot, - LotOccupancyComment, - LotOccupancyFee, - LotOccupancyOccupant, - LotOccupancyTransaction, - LotOccupantType, - LotStatus, - LotType, - MapRecord, - OccupancyTypeField, WorkOrderType } from '../../types/recordTypes.js' +import type { Sunrise } from './types.js' + declare const cityssm: cityssmGlobal declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.los as LOS + const sunrise = exports.sunrise as Sunrise const contractId = ( document.querySelector('#contract--contractId') as HTMLInputElement @@ -37,14 +35,14 @@ declare const exports: Record let refreshAfterSave = isCreate function setUnsavedChanges(): void { - los.setUnsavedChanges() + sunrise.setUnsavedChanges() document .querySelector("button[type='submit'][form='form--contract']") ?.classList.remove('is-light') } function clearUnsavedChanges(): void { - los.clearUnsavedChanges() + sunrise.clearUnsavedChanges() document .querySelector("button[type='submit'][form='form--contract']") ?.classList.add('is-light') @@ -58,7 +56,7 @@ declare const exports: Record formEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/contracts/${isCreate ? 'doCreateBurialSiteOccupancy' : 'doUpdateContract'}`, + `${sunrise.urlPrefix}/contracts/${isCreate ? 'doCreateContract' : 'doUpdateContract'}`, formElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -71,20 +69,20 @@ declare const exports: Record clearUnsavedChanges() if (isCreate || refreshAfterSave) { - globalThis.location.href = los.getContractURL( + globalThis.location.href = sunrise.getContractURL( responseJSON.contractId, true, true ) } else { bulmaJS.alert({ - message: `${los.escapedAliases.Occupancy} Updated Successfully`, + message: `Contract Updated Successfully`, contextualColorName: 'success' }) } } else { bulmaJS.alert({ - title: `Error Saving ${los.escapedAliases.Occupancy}`, + title: `Error Saving Contract`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) @@ -101,7 +99,7 @@ declare const exports: Record function doCopy(): void { cityssm.postJSON( - `${los.urlPrefix}/contracts/doCopyContract`, + `${sunrise.urlPrefix}/contracts/doCopyContract`, { contractId }, @@ -115,7 +113,7 @@ declare const exports: Record if (responseJSON.success) { clearUnsavedChanges() - globalThis.location.href = los.getContractURL( + globalThis.location.href = sunrise.getContractURL( responseJSON.contractId, true ) @@ -135,7 +133,7 @@ declare const exports: Record ?.addEventListener('click', (clickEvent) => { clickEvent.preventDefault() - if (los.hasUnsavedChanges()) { + if (sunrise.hasUnsavedChanges()) { bulmaJS.alert({ title: 'Unsaved Changes', message: 'Please save all unsaved changes before continuing.', @@ -143,7 +141,7 @@ declare const exports: Record }) } else { bulmaJS.confirm({ - title: `Copy ${los.escapedAliases.Occupancy} Record as New`, + title: `Copy Contract Record as New`, message: 'Are you sure you want to copy this record to a new record?', contextualColorName: 'info', okButton: { @@ -155,13 +153,13 @@ declare const exports: Record }) document - .querySelector('#button--deleteLotOccupancy') + .querySelector('#button--deleteContract') ?.addEventListener('click', (clickEvent) => { clickEvent.preventDefault() function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/contracts/doDeleteContract`, + `${sunrise.urlPrefix}/contracts/doDeleteContract`, { contractId }, @@ -173,7 +171,7 @@ declare const exports: Record if (responseJSON.success) { clearUnsavedChanges() - globalThis.location.href = los.getContractURL() + globalThis.location.href = sunrise.getContractURL() } else { bulmaJS.alert({ title: 'Error Deleting Record', @@ -186,7 +184,7 @@ declare const exports: Record } bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Record`, + title: `Delete Contract Record`, message: 'Are you sure you want to delete this record?', contextualColorName: 'warning', okButton: { @@ -207,7 +205,7 @@ declare const exports: Record formEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/workOrders/doCreateWorkOrder`, + `${sunrise.urlPrefix}/workOrders/doCreateWorkOrder`, formEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -225,8 +223,8 @@ declare const exports: Record contextualColorName: 'success', okButton: { text: 'Yes, Open the Work Order', - callbackFunction: () => { - globalThis.location.href = los.getWorkOrderURL( + callbackFunction() { + globalThis.location.href = sunrise.getWorkOrderURL( responseJSON.workOrderId, true ) @@ -299,7 +297,7 @@ declare const exports: Record }) }) - // Occupancy Type + // Contract Type const contractTypeIdElement = document.querySelector( '#contract--contractTypeId' @@ -312,28 +310,26 @@ declare const exports: Record contractTypeIdElement.addEventListener('change', () => { if (contractTypeIdElement.value === '') { - // eslint-disable-next-line no-unsanitized/property contractFieldsContainerElement.innerHTML = `
-

Select the ${los.escapedAliases.occupancy} type to load the available fields.

+

Select the contract type to load the available fields.

` return } cityssm.postJSON( - `${los.urlPrefix}/contracts/doGetContractTypeFields`, + `${sunrise.urlPrefix}/contracts/doGetContractTypeFields`, { contractTypeId: contractTypeIdElement.value }, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { - ContractTypeFields: OccupancyTypeField[] + contractTypeFields: ContractTypeField[] } - if (responseJSON.ContractTypeFields.length === 0) { - // eslint-disable-next-line no-unsanitized/property + if (responseJSON.contractTypeFields.length === 0) { contractFieldsContainerElement.innerHTML = `
-

There are no additional fields for this ${los.escapedAliases.occupancy} type.

+

There are no additional fields for this contract type.

` return @@ -343,10 +339,10 @@ declare const exports: Record let contractTypeFieldIds = '' - for (const occupancyTypeField of responseJSON.ContractTypeFields) { - contractTypeFieldIds += `,${occupancyTypeField.contractTypeFieldId.toString()}` + for (const contractTypeField of responseJSON.contractTypeFields) { + contractTypeFieldIds += `,${contractTypeField.contractTypeFieldId.toString()}` - const fieldName = `contractFieldValue_${occupancyTypeField.contractTypeFieldId.toString()}` + const fieldName = `contractFieldValue_${contractTypeField.contractTypeFieldId.toString()}` const fieldId = `contract--${fieldName}` @@ -355,11 +351,11 @@ declare const exports: Record fieldElement.innerHTML = `
` ;( fieldElement.querySelector('label') as HTMLLabelElement - ).textContent = occupancyTypeField.occupancyTypeField as string + ).textContent = contractTypeField.contractTypeField as string if ( - occupancyTypeField.fieldType === 'select' || - (occupancyTypeField.occupancyTypeFieldValues ?? '') !== '' + contractTypeField.fieldType === 'select' || + (contractTypeField.fieldValues ?? '') !== '' ) { ;( fieldElement.querySelector('.control') as HTMLElement @@ -373,10 +369,10 @@ declare const exports: Record 'select' ) as HTMLSelectElement - selectElement.required = occupancyTypeField.isRequired as boolean + selectElement.required = contractTypeField.isRequired as boolean const optionValues = ( - occupancyTypeField.occupancyTypeFieldValues as string + contractTypeField.fieldValues as string ).split('\n') for (const optionValue of optionValues) { @@ -394,18 +390,16 @@ declare const exports: Record inputElement.name = fieldName - inputElement.type = occupancyTypeField.fieldType + inputElement.type = contractTypeField.fieldType - inputElement.required = occupancyTypeField.isRequired as boolean + inputElement.required = contractTypeField.isRequired as boolean - inputElement.minLength = - occupancyTypeField.minLength as number + inputElement.minLength = contractTypeField.minLength as number - inputElement.maxLength = - occupancyTypeField.maxLength as number + inputElement.maxLength = contractTypeField.maxLength as number - if ((occupancyTypeField.pattern ?? '') !== '') { - inputElement.pattern = occupancyTypeField.pattern as string + if ((contractTypeField.pattern ?? '') !== '') { + inputElement.pattern = contractTypeField.pattern as string } ;(fieldElement.querySelector('.control') as HTMLElement).append( @@ -413,8 +407,6 @@ declare const exports: Record ) } - console.log(fieldElement) - contractFieldsContainerElement.append(fieldElement) } @@ -428,13 +420,13 @@ declare const exports: Record ) }) } else { - const originalcontractTypeId = contractTypeIdElement.value + const originalContractTypeId = contractTypeIdElement.value contractTypeIdElement.addEventListener('change', () => { - if (contractTypeIdElement.value !== originalcontractTypeId) { + if (contractTypeIdElement.value !== originalContractTypeId) { bulmaJS.confirm({ title: 'Confirm Change', - message: `Are you sure you want to change the ${los.escapedAliases.occupancy} type?\n + message: `Are you sure you want to change the contract type?\n This change affects the additional fields associated with this record, and may also affect the available fees.`, contextualColorName: 'warning', okButton: { @@ -446,7 +438,7 @@ declare const exports: Record cancelButton: { text: 'Revert the Change', callbackFunction: () => { - contractTypeIdElement.value = originalcontractTypeId + contractTypeIdElement.value = originalContractTypeId } } }) @@ -454,63 +446,64 @@ declare const exports: Record }) } - // Lot Selector + // Burial Site Selector - const lotNameElement = document.querySelector( - '#contract--lotName' + const burialSiteNameElement = document.querySelector( + '#contract--burialSiteName' ) as HTMLInputElement - lotNameElement.addEventListener('click', (clickEvent) => { - const currentLotName = (clickEvent.currentTarget as HTMLInputElement).value + burialSiteNameElement.addEventListener('click', (clickEvent) => { + const currentBurialSiteName = (clickEvent.currentTarget as HTMLInputElement) + .value - let lotSelectCloseModalFunction: () => void - let lotSelectModalElement: HTMLElement + let burialSiteSelectCloseModalFunction: () => void + let burialSiteSelectModalElement: HTMLElement - let lotSelectFormElement: HTMLFormElement - let lotSelectResultsElement: HTMLElement + let burialSiteSelectFormElement: HTMLFormElement + let burialSiteSelectResultsElement: HTMLElement - function renderSelectedLotAndClose( - lotId: number | string, - lotName: string + function renderSelectedBurialSiteAndClose( + burialSiteId: number | string, + burialSiteName: string ): void { ;( - document.querySelector('#contract--lotId') as HTMLInputElement - ).value = lotId.toString() + document.querySelector('#contract--burialSiteId') as HTMLInputElement + ).value = burialSiteId.toString() ;( - document.querySelector('#contract--lotName') as HTMLInputElement - ).value = lotName + document.querySelector('#contract--burialSiteName') as HTMLInputElement + ).value = burialSiteName setUnsavedChanges() - lotSelectCloseModalFunction() + burialSiteSelectCloseModalFunction() } - function selectExistingLot(clickEvent: Event): void { + function selectExistingBurialSite(clickEvent: Event): void { clickEvent.preventDefault() const selectedLotElement = clickEvent.currentTarget as HTMLElement - renderSelectedLotAndClose( - selectedLotElement.dataset.lotId ?? '', - selectedLotElement.dataset.lotName ?? '' + renderSelectedBurialSiteAndClose( + selectedLotElement.dataset.burialSiteId ?? '', + selectedLotElement.dataset.burialSiteName ?? '' ) } - function searchLots(): void { + function searchBurialSites(): void { // eslint-disable-next-line no-unsanitized/property - lotSelectResultsElement.innerHTML = - los.getLoadingParagraphHTML('Searching...') + burialSiteSelectResultsElement.innerHTML = + sunrise.getLoadingParagraphHTML('Searching...') cityssm.postJSON( - `${los.urlPrefix}/burialSites/doSearchBurialSites`, - lotSelectFormElement, + `${sunrise.urlPrefix}/burialSites/doSearchBurialSites`, + burialSiteSelectFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { count: number - lots: Lot[] + burialSites: BurialSite[] } if (responseJSON.count === 0) { - lotSelectResultsElement.innerHTML = `
+ burialSiteSelectResultsElement.innerHTML = `

No results.

` @@ -520,63 +513,70 @@ declare const exports: Record const panelElement = document.createElement('div') panelElement.className = 'panel' - for (const lot of responseJSON.lots) { + for (const burialSite of responseJSON.burialSites) { const panelBlockElement = document.createElement('a') panelBlockElement.className = 'panel-block is-block' panelBlockElement.href = '#' - panelBlockElement.dataset.lotId = lot.lotId.toString() - panelBlockElement.dataset.lotName = lot.lotName + panelBlockElement.dataset.burialSiteId = + burialSite.burialSiteId.toString() + panelBlockElement.dataset.lotName = burialSite.burialSiteName // eslint-disable-next-line no-unsanitized/property panelBlockElement.innerHTML = `
- ${cityssm.escapeHTML(lot.lotName ?? '')}
- ${cityssm.escapeHTML(lot.cemeteryName ?? '')} + ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')}
+ ${cityssm.escapeHTML(burialSite.cemeteryName ?? '')}
- ${cityssm.escapeHTML(lot.lotStatus as string)}
+ ${cityssm.escapeHTML(burialSite.burialSiteStatus as string)}
- ${lot.contractCount! > 0 ? 'Currently Occupied' : ''} + ${(burialSite.contractCount ?? 0) > 0 ? 'Has Current Contract' : ''}
` - panelBlockElement.addEventListener('click', selectExistingLot) + panelBlockElement.addEventListener( + 'click', + selectExistingBurialSite + ) panelElement.append(panelBlockElement) } - lotSelectResultsElement.innerHTML = '' - lotSelectResultsElement.append(panelElement) + burialSiteSelectResultsElement.innerHTML = '' + burialSiteSelectResultsElement.append(panelElement) } ) } - function createLotAndSelect(submitEvent: SubmitEvent): void { + function createBurialSiteAndSelect(submitEvent: SubmitEvent): void { submitEvent.preventDefault() - const lotName = ( - lotSelectModalElement.querySelector( - '#lotCreate--lotName' + const burialSiteName = ( + burialSiteSelectModalElement.querySelector( + '#burialSiteCreate--burialSiteName' ) as HTMLInputElement ).value cityssm.postJSON( - `${los.urlPrefix}/burialSites/doCreateBurialSite`, + `${sunrise.urlPrefix}/burialSites/doCreateBurialSite`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { success: boolean errorMessage?: string - lotId?: number + burialSiteId?: number } if (responseJSON.success) { - renderSelectedLotAndClose(responseJSON.lotId ?? '', lotName) + renderSelectedBurialSiteAndClose( + responseJSON.burialSiteId ?? '', + burialSiteName + ) } else { bulmaJS.alert({ - title: `Error Creating ${los.escapedAliases.Lot}`, + title: `Error Creating Burial Site`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) @@ -585,105 +585,109 @@ declare const exports: Record ) } - cityssm.openHtmlModal('contract-selectLot', { + cityssm.openHtmlModal('contract-selectBurialSite', { onshow(modalElement) { - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() - lotSelectModalElement = modalElement - lotSelectCloseModalFunction = closeModalFunction + burialSiteSelectModalElement = modalElement + burialSiteSelectCloseModalFunction = closeModalFunction bulmaJS.init(modalElement) // search Tab - const lotNameFilterElement = modalElement.querySelector( - '#lotSelect--lotName' + const burialSiteNameFilterElement = modalElement.querySelector( + '#burialSiteSelect--burialSiteName' ) as HTMLInputElement if ( - (document.querySelector('#contract--lotId') as HTMLInputElement) - .value !== '' + ( + document.querySelector( + '#contract--burialSiteId' + ) as HTMLInputElement + ).value !== '' ) { - lotNameFilterElement.value = currentLotName + burialSiteNameFilterElement.value = currentBurialSiteName } - lotNameFilterElement.focus() - lotNameFilterElement.addEventListener('change', searchLots) + burialSiteNameFilterElement.focus() + burialSiteNameFilterElement.addEventListener( + 'change', + searchBurialSites + ) - const occupancyStatusFilterElement = modalElement.querySelector( - '#lotSelect--occupancyStatus' + const contractStatusFilterElement = modalElement.querySelector( + '#burialSiteSelect--occupancyStatus' ) as HTMLSelectElement - occupancyStatusFilterElement.addEventListener('change', searchLots) + contractStatusFilterElement.addEventListener( + 'change', + searchBurialSites + ) - if (currentLotName !== '') { - occupancyStatusFilterElement.value = '' + if (currentBurialSiteName !== '') { + contractStatusFilterElement.value = '' } - lotSelectFormElement = modalElement.querySelector( - '#form--lotSelect' + burialSiteSelectFormElement = modalElement.querySelector( + '#form--burialSiteSelect' ) as HTMLFormElement - lotSelectResultsElement = modalElement.querySelector( - '#resultsContainer--lotSelect' + burialSiteSelectResultsElement = modalElement.querySelector( + '#resultsContainer--burialSiteSelect' ) as HTMLElement - lotSelectFormElement.addEventListener('submit', (submitEvent) => { - submitEvent.preventDefault() - }) + burialSiteSelectFormElement.addEventListener( + 'submit', + (submitEvent) => { + submitEvent.preventDefault() + } + ) - searchLots() + searchBurialSites() - // Create Tab - - if (exports.lotNamePattern) { - const regex = exports.lotNamePattern as RegExp - - ;( - modalElement.querySelector( - '#lotCreate--lotName' - ) as HTMLInputElement - ).pattern = regex.source - } - - const lotTypeElement = modalElement.querySelector( - '#lotCreate--burialSiteTypeId' + const burialSiteTypeElement = modalElement.querySelector( + '#burialSiteCreate--burialSiteTypeId' ) as HTMLSelectElement - for (const lotType of exports.lotTypes as LotType[]) { + for (const burialSiteType of exports.burialSiteTypes as BurialSiteType[]) { const optionElement = document.createElement('option') - optionElement.value = lotType.burialSiteTypeId.toString() - optionElement.textContent = lotType.lotType - lotTypeElement.append(optionElement) + optionElement.value = burialSiteType.burialSiteTypeId.toString() + optionElement.textContent = burialSiteType.burialSiteType + burialSiteTypeElement.append(optionElement) } - const lotStatusElement = modalElement.querySelector( - '#lotCreate--burialSiteStatusId' + const burialSiteStatusElement = modalElement.querySelector( + '#burialSiteCreate--burialSiteStatusId' ) as HTMLSelectElement - for (const lotStatus of exports.lotStatuses as LotStatus[]) { + for (const burialSiteStatus of exports.burialSiteStatuses as BurialSiteStatus[]) { const optionElement = document.createElement('option') - optionElement.value = lotStatus.burialSiteStatusId.toString() - optionElement.textContent = lotStatus.lotStatus - lotStatusElement.append(optionElement) + optionElement.value = burialSiteStatus.burialSiteStatusId.toString() + optionElement.textContent = burialSiteStatus.burialSiteStatus + burialSiteStatusElement.append(optionElement) } const mapElement = modalElement.querySelector( - '#lotCreate--cemeteryId' + '#burialSiteCreate--cemeteryId' ) as HTMLSelectElement - for (const map of exports.maps as MapRecord[]) { + for (const cemetery of exports.cemeteries as Cemetery[]) { const optionElement = document.createElement('option') - optionElement.value = map.cemeteryId!.toString() + optionElement.value = cemetery.cemeteryId!.toString() optionElement.textContent = - (map.cemeteryName ?? '') === '' ? '(No Name)' : map.cemeteryName ?? '' + (cemetery.cemeteryName ?? '') === '' + ? '(No Name)' + : cemetery.cemeteryName ?? '' mapElement.append(optionElement) } ;( - modalElement.querySelector('#form--lotCreate') as HTMLFormElement - ).addEventListener('submit', createLotAndSelect) + modalElement.querySelector( + '#form--burialSiteCreate' + ) as HTMLFormElement + ).addEventListener('submit', createBurialSiteAndSelect) }, onremoved() { bulmaJS.toggleHtmlClipped() @@ -692,34 +696,34 @@ declare const exports: Record }) document - .querySelector('.is-lot-view-button') + .querySelector('.is-burial-site-view-button') ?.addEventListener('click', () => { - const lotId = ( - document.querySelector('#contract--lotId') as HTMLInputElement + const burialSiteId = ( + document.querySelector('#contract--burialSiteId') as HTMLInputElement ).value - if (lotId === '') { + if (burialSiteId === '') { bulmaJS.alert({ - message: `No ${los.escapedAliases.lot} selected.`, + message: `No burial site selected.`, contextualColorName: 'info' }) } else { - window.open(`${los.urlPrefix}/burialSites/${lotId}`) + window.open(`${sunrise.urlPrefix}/burialSites/${burialSiteId}`) } }) document - .querySelector('.is-clear-lot-button') + .querySelector('.is-clear-burial-site-button') ?.addEventListener('click', () => { - if (lotNameElement.disabled) { + if (burialSiteNameElement.disabled) { bulmaJS.alert({ message: 'You need to unlock the field before clearing it.', contextualColorName: 'info' }) } else { - lotNameElement.value = `(No ${los.escapedAliases.Lot})` + burialSiteNameElement.value = `(No Burial Site)` ;( - document.querySelector('#contract--lotId') as HTMLInputElement + document.querySelector('#contract--burialSiteId') as HTMLInputElement ).value = '' setUnsavedChanges() @@ -728,7 +732,7 @@ declare const exports: Record // Start Date - los.initializeDatePickers(formElement) + sunrise.initializeDatePickers(formElement) document .querySelector('#contract--contractStartDateString') @@ -748,704 +752,14 @@ declare const exports: Record endDatePicker.refresh() }) - los.initializeUnlockFieldButtons(formElement) - - /** - * Occupants - */ - ;(() => { - let contractOccupants = - exports.contractOccupants as LotOccupancyOccupant[] - - delete exports.contractOccupants - - function openEditLotOccupancyOccupant(clickEvent: Event): void { - const lotOccupantIndex = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset - .lotOccupantIndex ?? '', - 10 - ) - - const contractOccupant = contractOccupants.find( - (currentLotOccupancyOccupant) => { - return ( - currentLotOccupancyOccupant.lotOccupantIndex === lotOccupantIndex - ) - } - ) as LotOccupancyOccupant - - let editFormElement: HTMLFormElement - let editCloseModalFunction: () => void - - function editOccupant(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${los.urlPrefix}/contracts/doUpdateContractOccupant`, - editFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractOccupants: LotOccupancyOccupant[] - } - - if (responseJSON.success) { - contractOccupants = responseJSON.contractOccupants - editCloseModalFunction() - renderLotOccupancyOccupants() - } else { - bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Occupant}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('contract-editOccupant', { - onshow(modalElement) { - los.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#contractOccupantEdit--contractId' - ) as HTMLInputElement - ).value = contractId - ;( - modalElement.querySelector( - '#contractOccupantEdit--lotOccupantIndex' - ) as HTMLInputElement - ).value = lotOccupantIndex.toString() - - const lotOccupantTypeSelectElement = modalElement.querySelector( - '#contractOccupantEdit--lotOccupantTypeId' - ) as HTMLSelectElement - - let lotOccupantTypeSelected = false - - for (const lotOccupantType of exports.lotOccupantTypes as LotOccupantType[]) { - const optionElement = document.createElement('option') - optionElement.value = lotOccupantType.lotOccupantTypeId.toString() - optionElement.textContent = lotOccupantType.lotOccupantType - - optionElement.dataset.occupantCommentTitle = - lotOccupantType.occupantCommentTitle - - optionElement.dataset.fontAwesomeIconClass = - lotOccupantType.fontAwesomeIconClass - - if ( - lotOccupantType.lotOccupantTypeId === - contractOccupant.lotOccupantTypeId - ) { - optionElement.selected = true - lotOccupantTypeSelected = true - } - - lotOccupantTypeSelectElement.append(optionElement) - } - - if (!lotOccupantTypeSelected) { - const optionElement = document.createElement('option') - - optionElement.value = - contractOccupant.lotOccupantTypeId?.toString() ?? '' - optionElement.textContent = - contractOccupant.lotOccupantType ?? '' - - optionElement.dataset.occupantCommentTitle = - contractOccupant.occupantCommentTitle - - optionElement.dataset.fontAwesomeIconClass = - contractOccupant.fontAwesomeIconClass - - optionElement.selected = true - - lotOccupantTypeSelectElement.append(optionElement) - } - - ;( - modalElement.querySelector( - '#contractOccupantEdit--fontAwesomeIconClass' - ) as HTMLElement - ).innerHTML = - `` - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantName' - ) as HTMLInputElement - ).value = contractOccupant.occupantName ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantFamilyName' - ) as HTMLInputElement - ).value = contractOccupant.occupantFamilyName ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantAddress1' - ) as HTMLInputElement - ).value = contractOccupant.occupantAddress1 ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantAddress2' - ) as HTMLInputElement - ).value = contractOccupant.occupantAddress2 ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantCity' - ) as HTMLInputElement - ).value = contractOccupant.occupantCity ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantProvince' - ) as HTMLInputElement - ).value = contractOccupant.occupantProvince ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantPostalCode' - ) as HTMLInputElement - ).value = contractOccupant.occupantPostalCode ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantPhoneNumber' - ) as HTMLInputElement - ).value = contractOccupant.occupantPhoneNumber ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantEmailAddress' - ) as HTMLInputElement - ).value = contractOccupant.occupantEmailAddress ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantCommentTitle' - ) as HTMLLabelElement - ).textContent = - (contractOccupant.occupantCommentTitle ?? '') === '' - ? 'Comment' - : contractOccupant.occupantCommentTitle ?? '' - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantComment' - ) as HTMLTextAreaElement - ).value = contractOccupant.occupantComment ?? '' - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - - const lotOccupantTypeIdElement = modalElement.querySelector( - '#contractOccupantEdit--lotOccupantTypeId' - ) as HTMLSelectElement - - lotOccupantTypeIdElement.focus() - - lotOccupantTypeIdElement.addEventListener('change', () => { - const fontAwesomeIconClass = - lotOccupantTypeIdElement.selectedOptions[0].dataset - .fontAwesomeIconClass ?? 'user' - - ;( - modalElement.querySelector( - '#contractOccupantEdit--fontAwesomeIconClass' - ) as HTMLElement - ).innerHTML = - `` - - let occupantCommentTitle = - lotOccupantTypeIdElement.selectedOptions[0].dataset - .occupantCommentTitle ?? '' - if (occupantCommentTitle === '') { - occupantCommentTitle = 'Comment' - } - - ;( - modalElement.querySelector( - '#contractOccupantEdit--occupantCommentTitle' - ) as HTMLLabelElement - ).textContent = occupantCommentTitle - }) - - editFormElement = modalElement.querySelector( - 'form' - ) as HTMLFormElement - editFormElement.addEventListener('submit', editOccupant) - - editCloseModalFunction = closeModalFunction - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function deleteLotOccupancyOccupant(clickEvent: Event): void { - const lotOccupantIndex = ( - clickEvent.currentTarget as HTMLElement - ).closest('tr')?.dataset.lotOccupantIndex - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/contracts/doDeleteContractOccupant`, - { - contractId, - lotOccupantIndex - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractOccupants: LotOccupancyOccupant[] - } - - if (responseJSON.success) { - contractOccupants = responseJSON.contractOccupants - renderLotOccupancyOccupants() - } else { - bulmaJS.alert({ - title: `Error Removing ${los.escapedAliases.Occupant}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: `Remove ${los.escapedAliases.Occupant}?`, - message: `Are you sure you want to remove this ${los.escapedAliases.occupant}?`, - okButton: { - text: `Yes, Remove ${los.escapedAliases.Occupant}`, - callbackFunction: doDelete - }, - contextualColorName: 'warning' - }) - } - - function renderLotOccupancyOccupants(): void { - const occupantsContainer = document.querySelector( - '#container--contractOccupants' - ) as HTMLElement - - cityssm.clearElement(occupantsContainer) - - if (contractOccupants.length === 0) { - // eslint-disable-next-line no-unsanitized/property - occupantsContainer.innerHTML = `
-

There are no ${los.escapedAliases.occupants} associated with this record.

-
` - - return - } - - const tableElement = document.createElement('table') - tableElement.className = 'table is-fullwidth is-striped is-hoverable' - - // eslint-disable-next-line no-unsanitized/property - tableElement.innerHTML = `
 - - - - - - - ` - - for (const contractOccupant of contractOccupants) { - const tableRowElement = document.createElement('tr') - tableRowElement.dataset.lotOccupantIndex = - contractOccupant.lotOccupantIndex?.toString() - - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = `` - - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', openEditLotOccupancyOccupant) - - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteLotOccupancyOccupant) - - tableElement.querySelector('tbody')?.append(tableRowElement) - } - - occupantsContainer.append(tableElement) - } - - if (isCreate) { - const lotOccupantTypeIdElement = document.querySelector( - '#contract--lotOccupantTypeId' - ) as HTMLSelectElement - - lotOccupantTypeIdElement.addEventListener('change', () => { - const occupantFields: NodeListOf< - HTMLInputElement | HTMLTextAreaElement - > = formElement.querySelectorAll("[data-table='LotOccupancyOccupant']") - - for (const occupantField of occupantFields) { - occupantField.disabled = lotOccupantTypeIdElement.value === '' - } - - let occupantCommentTitle = - lotOccupantTypeIdElement.selectedOptions[0].dataset - .occupantCommentTitle ?? '' - if (occupantCommentTitle === '') { - occupantCommentTitle = 'Comment' - } - - ;( - formElement.querySelector( - '#contract--occupantCommentTitle' - ) as HTMLElement - ).textContent = occupantCommentTitle - }) - } else { - renderLotOccupancyOccupants() - } - - document - .querySelector('#button--addOccupant') - ?.addEventListener('click', () => { - let addCloseModalFunction: () => void - - let addFormElement: HTMLFormElement - - let searchFormElement: HTMLFormElement - let searchResultsElement: HTMLElement - - function addOccupant( - formOrObject: HTMLFormElement | LotOccupancyOccupant - ): void { - cityssm.postJSON( - `${los.urlPrefix}/contracts/doAddLotOccupancyOccupant`, - formOrObject, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractOccupants: LotOccupancyOccupant[] - } - - if (responseJSON.success) { - contractOccupants = responseJSON.contractOccupants - addCloseModalFunction() - renderLotOccupancyOccupants() - } else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Occupant}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function addOccupantFromForm(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - addOccupant(addFormElement) - } - - let pastOccupantSearchResults: LotOccupancyOccupant[] = [] - - function addOccupantFromCopy(clickEvent: MouseEvent): void { - clickEvent.preventDefault() - - const panelBlockElement = clickEvent.currentTarget as HTMLElement - - const occupant = - pastOccupantSearchResults[ - Number.parseInt(panelBlockElement.dataset.index ?? '', 10) - ] - - const lotOccupantTypeId = ( - panelBlockElement - .closest('.modal') - ?.querySelector( - '#contractOccupantCopy--lotOccupantTypeId' - ) as HTMLSelectElement - ).value - - if (lotOccupantTypeId === '') { - bulmaJS.alert({ - title: `No ${los.escapedAliases.Occupant} Type Selected`, - message: `Select a type to apply to the newly added ${los.escapedAliases.occupant}.`, - contextualColorName: 'warning' - }) - } else { - occupant.lotOccupantTypeId = Number.parseInt(lotOccupantTypeId, 10) - occupant.contractId = Number.parseInt(contractId, 10) - addOccupant(occupant) - } - } - - function searchOccupants(event: Event): void { - event.preventDefault() - - if ( - ( - searchFormElement.querySelector( - '#contractOccupantCopy--searchFilter' - ) as HTMLInputElement - ).value === '' - ) { - searchResultsElement.innerHTML = `
-

Enter a partial name or address in the search field above.

-
` - - return - } - - // eslint-disable-next-line no-unsanitized/property - searchResultsElement.innerHTML = - los.getLoadingParagraphHTML('Searching...') - - cityssm.postJSON( - `${los.urlPrefix}/contracts/doSearchPastOccupants`, - searchFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - occupants: LotOccupancyOccupant[] - } - - pastOccupantSearchResults = responseJSON.occupants - - const panelElement = document.createElement('div') - panelElement.className = 'panel' - - for (const [ - index, - occupant - ] of pastOccupantSearchResults.entries()) { - const panelBlockElement = document.createElement('a') - panelBlockElement.className = 'panel-block is-block' - panelBlockElement.href = '#' - panelBlockElement.dataset.index = index.toString() - - // eslint-disable-next-line no-unsanitized/property - panelBlockElement.innerHTML = ` - ${cityssm.escapeHTML(occupant.occupantName ?? '')} ${cityssm.escapeHTML(occupant.occupantFamilyName ?? '')} -
-
-
- ${cityssm.escapeHTML(occupant.occupantAddress1 ?? '')}
- ${ - (occupant.occupantAddress2 ?? '') === '' - ? '' - : `${cityssm.escapeHTML(occupant.occupantAddress2 ?? '')}
` - }${cityssm.escapeHTML(occupant.occupantCity ?? '')}, ${cityssm.escapeHTML(occupant.occupantProvince ?? '')}
- ${cityssm.escapeHTML(occupant.occupantPostalCode ?? '')} -
-
- ${ - (occupant.occupantPhoneNumber ?? '') === '' - ? '' - : `${cityssm.escapeHTML(occupant.occupantPhoneNumber ?? '')}
` - } - ${cityssm.escapeHTML(occupant.occupantEmailAddress ?? '')}
-
-
` - - panelBlockElement.addEventListener('click', addOccupantFromCopy) - - panelElement.append(panelBlockElement) - } - - searchResultsElement.innerHTML = '' - searchResultsElement.append(panelElement) - } - ) - } - - cityssm.openHtmlModal('contract-addOccupant', { - onshow(modalElement) { - los.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#contractOccupantAdd--contractId' - ) as HTMLInputElement - ).value = contractId - - const lotOccupantTypeSelectElement = modalElement.querySelector( - '#contractOccupantAdd--lotOccupantTypeId' - ) as HTMLSelectElement - - const lotOccupantTypeCopySelectElement = modalElement.querySelector( - '#contractOccupantCopy--lotOccupantTypeId' - ) as HTMLSelectElement - - for (const lotOccupantType of exports.lotOccupantTypes as LotOccupantType[]) { - const optionElement = document.createElement('option') - optionElement.value = lotOccupantType.lotOccupantTypeId.toString() - optionElement.textContent = lotOccupantType.lotOccupantType - - optionElement.dataset.occupantCommentTitle = - lotOccupantType.occupantCommentTitle - - optionElement.dataset.fontAwesomeIconClass = - lotOccupantType.fontAwesomeIconClass - - lotOccupantTypeSelectElement.append(optionElement) - - lotOccupantTypeCopySelectElement.append( - optionElement.cloneNode(true) - ) - } - - ;( - modalElement.querySelector( - '#contractOccupantAdd--occupantCity' - ) as HTMLInputElement - ).value = exports.occupantCityDefault as string - ;( - modalElement.querySelector( - '#contractOccupantAdd--occupantProvince' - ) as HTMLInputElement - ).value = exports.occupantProvinceDefault as string - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - bulmaJS.init(modalElement) - - const lotOccupantTypeIdElement = modalElement.querySelector( - '#contractOccupantAdd--lotOccupantTypeId' - ) as HTMLSelectElement - - lotOccupantTypeIdElement.focus() - - lotOccupantTypeIdElement.addEventListener('change', () => { - const fontAwesomeIconClass = - lotOccupantTypeIdElement.selectedOptions[0].dataset - .fontAwesomeIconClass ?? 'user' - - ;( - modalElement.querySelector( - '#contractOccupantAdd--fontAwesomeIconClass' - ) as HTMLElement - ).innerHTML = - `` - - let occupantCommentTitle = - lotOccupantTypeIdElement.selectedOptions[0].dataset - .occupantCommentTitle ?? '' - - if (occupantCommentTitle === '') { - occupantCommentTitle = 'Comment' - } - - ;( - modalElement.querySelector( - '#contractOccupantAdd--occupantCommentTitle' - ) as HTMLElement - ).textContent = occupantCommentTitle - }) - - addFormElement = modalElement.querySelector( - '#form--contractOccupantAdd' - ) as HTMLFormElement - addFormElement.addEventListener('submit', addOccupantFromForm) - - searchResultsElement = modalElement.querySelector( - '#contractOccupantCopy--searchResults' - ) as HTMLElement - - searchFormElement = modalElement.querySelector( - '#form--contractOccupantCopy' - ) as HTMLFormElement - searchFormElement.addEventListener('submit', (formEvent) => { - formEvent.preventDefault() - }) - ;( - modalElement.querySelector( - '#contractOccupantCopy--searchFilter' - ) as HTMLInputElement - ).addEventListener('change', searchOccupants) - - addCloseModalFunction = closeModalFunction - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - ;( - document.querySelector( - '#button--addOccupant' - ) as HTMLButtonElement - ).focus() - } - }) - }) - })() + sunrise.initializeUnlockFieldButtons(formElement) if (!isCreate) { /** * Comments */ ;(() => { - let contractComments = - exports.contractComments as LotOccupancyComment[] + let contractComments = exports.contractComments as LotOccupancyComment[] delete exports.contractComments function openEditLotOccupancyComment(clickEvent: Event): void { @@ -1458,8 +772,7 @@ declare const exports: Record const contractComment = contractComments.find( (currentLotOccupancyComment) => { return ( - currentLotOccupancyComment.contractCommentId === - contractCommentId + currentLotOccupancyComment.contractCommentId === contractCommentId ) } ) as LotOccupancyComment @@ -1471,7 +784,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/contracts/doUpdateContractComment`, + `${sunrise.urlPrefix}/contracts/doUpdateContractComment`, editFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -1497,7 +810,7 @@ declare const exports: Record cityssm.openHtmlModal('contract-editComment', { onshow(modalElement) { - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) ;( modalElement.querySelector( '#contractCommentEdit--contractId' @@ -1514,10 +827,9 @@ declare const exports: Record ) as HTMLInputElement ).value = contractComment.contractComment ?? '' - const contractCommentDateStringElement = - modalElement.querySelector( - '#contractCommentEdit--contractCommentDateString' - ) as HTMLInputElement + const contractCommentDateStringElement = modalElement.querySelector( + '#contractCommentEdit--contractCommentDateString' + ) as HTMLInputElement contractCommentDateStringElement.value = contractComment.contractCommentDateString ?? '' @@ -1525,8 +837,7 @@ declare const exports: Record const currentDateString = cityssm.dateToString(new Date()) contractCommentDateStringElement.max = - contractComment.contractCommentDateString! <= - currentDateString + contractComment.contractCommentDateString! <= currentDateString ? currentDateString : contractComment.contractCommentDateString ?? '' ;( @@ -1538,7 +849,7 @@ declare const exports: Record onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() - los.initializeDatePickers(modalElement) + sunrise.initializeDatePickers(modalElement) ;( modalElement.querySelector( '#contractCommentEdit--contractComment' @@ -1568,7 +879,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/contracts/doDeleteContractComment`, + `${sunrise.urlPrefix}/contracts/doDeleteContractComment`, { contractId, contractCommentId @@ -1634,9 +945,7 @@ declare const exports: Record tableRowElement.innerHTML = ` - <% for (const workOrder of lotOccupancy.workOrders) { %> + <% for (const workOrder of contract.workOrders) { %> - <% for (const lotOccupancyOccupant of lotOccupancy.lotOccupancyOccupants) { %> + <% for (const contractOccupant of contract.contractOccupants) { %> @@ -221,7 +221,7 @@ -<% if (lotOccupancy.lotOccupancyComments.length > 0) { %> +<% if (contract.contractComments.length > 0) { %>

Comments

@@ -234,14 +234,14 @@
- <% for (const lotOccupancyComment of lotOccupancy.lotOccupancyComments) { %> + <% for (const contractComment of contract.contractComments) { %> - + - + <% } %> @@ -250,7 +250,7 @@ <% } %> -<% if (lotOccupancy.workOrders.length > 0) { %> +<% if (contract.workOrders.length > 0) { %> <% const workOrderOpenDateAlias = configFunctions.getConfigProperty("aliases.workOrderOpenDate"); const workOrderCloseDateAlias = configFunctions.getConfigProperty("aliases.workOrderCloseDate"); @@ -267,7 +267,7 @@ - <% for (const workOrder of lotOccupancy.workOrders) { %> + <% for (const workOrder of contract.workOrders) { %> - <% for (const lotOccupancyFee of lotOccupancy.lotOccupancyFees) { %> + <% for (const contractFee of contract.contractFees) { %> <% - feeAmountTotal += (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity); - taxAmountTotal += (lotOccupancyFee.taxAmount * lotOccupancyFee.quantity); + feeAmountTotal += (contractFee.feeAmount * contractFee.quantity); + taxAmountTotal += (contractFee.taxAmount * contractFee.quantity); %> - - <% if (lotOccupancyFee.quantity !== 1) { %> - + <% if (contractFee.quantity !== 1) { %> + - + <% } %> - + <% } %> @@ -371,7 +371,7 @@

Transactions

- <% if (lotOccupancy.lotOccupancyTransactions.length === 0) { %> + <% if (contract.contractTransactions.length === 0) { %>

There are no transactions associated with this <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> record. @@ -388,34 +388,34 @@

<% let transactionTotal = 0; %> - <% for (const lotOccupancyTransaction of lotOccupancy.lotOccupancyTransactions) { %> - <% transactionTotal += lotOccupancyTransaction.transactionAmount; %> + <% for (const contractTransaction of contract.contractTransactions) { %> + <% transactionTotal += contractTransaction.transactionAmount; %> - + <% } %> diff --git a/views/dashboard.ejs b/views/dashboard.ejs index 5a6be172..5c672ede 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -72,7 +72,7 @@ if (milestone.workOrderContracts.length > 0) { for (const contract of milestone.workOrderContracts) { - for (const interment of contract.lotOccupancyInterments) { + for (const interment of contract.contractInterments) { %> @@ -163,13 +163,19 @@ <% if (user.userProperties.canUpdate) { %> - + New Contract <% } %> + + + + + Funeral Homes + diff --git a/views/funeralHome-edit.ejs b/views/funeralHome-edit.ejs new file mode 100644 index 00000000..2c24612f --- /dev/null +++ b/views/funeralHome-edit.ejs @@ -0,0 +1,162 @@ +<%- include('_header'); -%> + + + +

+ <% if (isCreate) { %> + Create a New Funeral Home + <% } else { %> + Update Funeral Home + <% } %> +

+ +
+
+ <% if (!isCreate) { %> + + <%= funeralHome.funeralHomeName || "(No Name)" %> + + <% } %> +
+
+ <% if (isCreate) { %> +
+ + Cancel + +
+ <% } else { %> +
+
+
+ +
+
+
+ + + Delete Funeral Home + +
+
+
+
+ <% } %> +
+ +
+
+ +
+ +
+ + +
+
+
+
+
+ +
+ /> +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ + +<%- include('_footerA'); -%> + + + +<%- include('_footerB'); -%> \ No newline at end of file diff --git a/views/funeralHome-search.ejs b/views/funeralHome-search.ejs new file mode 100644 index 00000000..def03323 --- /dev/null +++ b/views/funeralHome-search.ejs @@ -0,0 +1,65 @@ +<%- include('_header'); -%> + + + +
+
+

+ Find a Funeral Home +

+
+
+ + + Export + +
+
+ +<% if (user.userProperties.canUpdate) { %> +
+ + + Create a New Funeral Home + +
+<% } %> + +
+
+
+
+ + + + +
+
+ +
+ +
+ +<%- include('_footerA'); -%> + + + + +<%- include('_footerB'); -%> \ No newline at end of file diff --git a/views/funeralHome-view.ejs b/views/funeralHome-view.ejs new file mode 100644 index 00000000..d6b28be8 --- /dev/null +++ b/views/funeralHome-view.ejs @@ -0,0 +1,70 @@ +<%- include('_header'); -%> + + + +

+ <%= funeralHome.funeralHomeName || "(No Name)" %> +

+ +
+
+ + <%= funeralHome.funeralHomeName || "(No Name)" %> + +
+
+ <% if (user.userProperties.canUpdate) { %> +
+ + + Switch to Edit Mode + +
+ <% } %> +
+
+ +
+
+
+
+ Address
+ <% if (funeralHome.funeralHomeAddress1 !== "") { %> + <%= funeralHome.funeralHomeAddress1 %>
+ <% } %> + <% if (funeralHome.funeralHomeAddress2 !== "") { %> + <%= funeralHome.funeralHomeAddress2 %>
+ <% } %> + <%= funeralHome.funeralHomeCity %>, <%= funeralHome.funeralHomeProvince %>
+ <%= funeralHome.funeralHomePostalCode %> +
+ <% if (funeralHome.funeralHomePhoneNumber !== "") { %> +
+ Phone Number
+ <%= funeralHome.funeralHomePhoneNumber %> +
+ <% } %> +
+
+
+ +<%- include('_footerA'); -%> + +<%- include('_footerB'); -%> \ No newline at end of file diff --git a/views/print/pdf/ssm.cemetery.burialPermit.ejs b/views/print/pdf/ssm.cemetery.burialPermit.ejs index 77b8eea4..d88c44b4 100644 --- a/views/print/pdf/ssm.cemetery.burialPermit.ejs +++ b/views/print/pdf/ssm.cemetery.burialPermit.ejs @@ -1,9 +1,9 @@ <% const funeralDirectorLotOccupantType = "Funeral Director"; - const funeralDirectorOccupants = lotOccupancyFunctions.filterOccupantsByLotOccupantType(lotOccupancy, funeralDirectorLotOccupantType); + const funeralDirectorOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, funeralDirectorLotOccupantType); const deceasedLotOccupantType = "Deceased"; - const deceasedOccupants = lotOccupancyFunctions.filterOccupantsByLotOccupantType(lotOccupancy, deceasedLotOccupantType); + const deceasedOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, deceasedLotOccupantType); const deathDateOccupantTypeField = "Death Date"; const deathPlaceOccupantTypeField = "Death Place"; @@ -53,13 +53,13 @@ who died at   - <%= lotOccupancyFunctions.getFieldValueByOccupancyTypeField(lotOccupancy, deathPlaceOccupantTypeField); %> + <%= contractFunctions.getFieldValueByContractTypeField(contract, deathPlaceOccupantTypeField); %>   in Ontario on   - <%= lotOccupancyFunctions.getFieldValueByOccupancyTypeField(lotOccupancy, deathDateOccupantTypeField); %> + <%= contractFunctions.getFieldValueByContractTypeField(contract, deathDateOccupantTypeField); %>   . diff --git a/views/print/pdf/ssm.cemetery.contract.ejs b/views/print/pdf/ssm.cemetery.contract.ejs index e3fca6ca..d3d4b000 100644 --- a/views/print/pdf/ssm.cemetery.contract.ejs +++ b/views/print/pdf/ssm.cemetery.contract.ejs @@ -3,7 +3,7 @@ let purchaserOccupants = []; for (const purchaserLotOccupantType of purchaserLotOccupantTypes) { - purchaserOccupants = lotOccupancyFunctions.filterOccupantsByLotOccupantType(lotOccupancy, purchaserLotOccupantType); + purchaserOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, purchaserLotOccupantType); if (purchaserOccupants.length > 0) { break; } @@ -15,7 +15,7 @@ let recipientOccupants = []; for (const recipientLotOccupantType of recipientLotOccupantTypes) { - recipientOccupants = lotOccupancyFunctions.filterOccupantsByLotOccupantType(lotOccupancy, recipientLotOccupantType); + recipientOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, recipientLotOccupantType); if (recipientOccupants.length > 0) { break; } @@ -82,7 +82,7 @@

in - <%= lotOccupancy.mapName %> + <%= contract.mapName %> cemetery
operated by
@@ -92,13 +92,13 @@

Contract No. - <%= lotOccupancy.lotOccupancyId %> + <%= contract.contractId %>

Date of Purchase - <%= lotOccupancy.occupancyStartDateString %> + <%= contract.occupancyStartDateString %>

Date${los.escapedAliases.ExternalReceiptNumber}${sunrise.escapedAliases.ExternalReceiptNumber} Amount Options
${los.escapedAliases.Occupant}AddressOther ContactCommentOptions
- ${cityssm.escapeHTML( - (contractOccupant.occupantName ?? '') === '' && - (contractOccupant.occupantFamilyName ?? '') === '' - ? '(No Name)' - : `${contractOccupant.occupantName} ${contractOccupant.occupantFamilyName}` - )}
- - - ${cityssm.escapeHTML(contractOccupant.lotOccupantType ?? '')} - - 		- ${ - (contractOccupant.occupantAddress1 ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantAddress1 ?? '')}
` - } - ${ - (contractOccupant.occupantAddress2 ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantAddress2 ?? '')}
` - } - ${ - (contractOccupant.occupantCity ?? '') === '' - ? '' - : `${cityssm.escapeHTML(contractOccupant.occupantCity ?? '')}, ` - } - ${cityssm.escapeHTML(contractOccupant.occupantProvince ?? '')}
- ${cityssm.escapeHTML(contractOccupant.occupantPostalCode ?? '')} - 		- ${ - (contractOccupant.occupantPhoneNumber ?? '') === '' - ? '' - : `${cityssm.escapeHTML( - contractOccupant.occupantPhoneNumber ?? '' - )}
` - } - ${ - (contractOccupant.occupantEmailAddress ?? '') === '' - ? '' - : cityssm.escapeHTML( - contractOccupant.occupantEmailAddress ?? '' - ) - } - 		- - ${cityssm.escapeHTML(contractOccupant.occupantComment ?? '')} - - -
- - -
- 		${cityssm.escapeHTML(contractComment.recordCreate_userName ?? '')} - ${cityssm.escapeHTML( - contractComment.contractCommentDateString ?? '' - )} + ${cityssm.escapeHTML(contractComment.contractCommentDateString ?? '')} ${cityssm.escapeHTML( contractComment.contractCommentTime === 0 ? '' @@ -1681,7 +990,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/contracts/doAddContractComment`, + `${sunrise.urlPrefix}/contracts/doAddContractComment`, addFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -1707,7 +1016,7 @@ declare const exports: Record cityssm.openHtmlModal('contract-addComment', { onshow(modalElement) { - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) ;( modalElement.querySelector( '#contractCommentAdd--contractId' @@ -1760,8 +1069,7 @@ declare const exports: Record for (const contractFee of contractFees) { feeGrandTotal += - ((contractFee.feeAmount ?? 0) + - (contractFee.taxAmount ?? 0)) * + ((contractFee.feeAmount ?? 0) + (contractFee.taxAmount ?? 0)) * (contractFee.quantity ?? 0) } @@ -1785,7 +1093,7 @@ declare const exports: Record formEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/contracts/doUpdateContractFeeQuantity`, + `${sunrise.urlPrefix}/contracts/doUpdateContractFeeQuantity`, formEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -1860,7 +1168,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/contracts/doDeleteContractFee`, + `${sunrise.urlPrefix}/contracts/doDeleteContractFee`, { contractId, feeId @@ -2021,7 +1329,7 @@ declare const exports: Record ) as HTMLButtonElement addFeeButtonElement.addEventListener('click', () => { - if (los.hasUnsavedChanges()) { + if (sunrise.hasUnsavedChanges()) { bulmaJS.alert({ message: 'Please save all unsaved changes before adding fees.', contextualColorName: 'warning' @@ -2044,7 +1352,7 @@ declare const exports: Record ) cityssm.postJSON( - `${los.urlPrefix}/contracts/doAddContractFeeCategory`, + `${sunrise.urlPrefix}/contracts/doAddContractFeeCategory`, { contractId, feeCategoryId @@ -2077,7 +1385,7 @@ declare const exports: Record function doAddFee(feeId: number, quantity: number | string = 1): void { cityssm.postJSON( - `${los.urlPrefix}/contracts/doAddLotOccupancyFee`, + `${sunrise.urlPrefix}/contracts/doAddLotOccupancyFee`, { contractId, feeId, @@ -2285,7 +1593,7 @@ declare const exports: Record ) as HTMLElement cityssm.postJSON( - `${los.urlPrefix}/contracts/doGetFees`, + `${sunrise.urlPrefix}/contracts/doGetFees`, { contractId }, @@ -2342,11 +1650,9 @@ declare const exports: Record 10 ) - const transaction = contractTransactions.find( - (possibleTransaction) => { - return possibleTransaction.transactionIndex === transactionIndex - } - ) as LotOccupancyTransaction + const transaction = contractTransactions.find((possibleTransaction) => { + return possibleTransaction.transactionIndex === transactionIndex + }) as LotOccupancyTransaction let editCloseModalFunction: () => void @@ -2354,7 +1660,7 @@ declare const exports: Record formEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/contracts/doUpdateContractTransaction`, + `${sunrise.urlPrefix}/contracts/doUpdateContractTransaction`, formEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -2379,7 +1685,7 @@ declare const exports: Record cityssm.openHtmlModal('contract-editTransaction', { onshow(modalElement) { - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) ;( modalElement.querySelector( '#contractTransactionEdit--contractId' @@ -2419,7 +1725,7 @@ declare const exports: Record onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() - los.initializeDatePickers(modalElement) + sunrise.initializeDatePickers(modalElement) ;( modalElement.querySelector( '#contractTransactionEdit--transactionAmount' @@ -2447,7 +1753,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/contracts/doDeleteContractTransaction`, + `${sunrise.urlPrefix}/contracts/doDeleteContractTransaction`, { contractId, transactionIndex @@ -2498,7 +1804,7 @@ declare const exports: Record contractTransactionsContainerElement.innerHTML = ` - + @@ -2527,7 +1833,7 @@ declare const exports: Record contractTransaction.externalReceiptNumber ?? '' ) - if (los.dynamicsGPIntegrationIsEnabled) { + if (sunrise.dynamicsGPIntegrationIsEnabled) { if (contractTransaction.dynamicsGPDocument === undefined) { externalReceiptNumberHTML += ` @@ -2632,7 +1938,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/contracts/doAddLotOccupancyTransaction`, + `${sunrise.urlPrefix}/contracts/doAddLotOccupancyTransaction`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -2676,7 +1982,7 @@ declare const exports: Record } cityssm.postJSON( - `${los.urlPrefix}/contracts/doGetDynamicsGPDocument`, + `${sunrise.urlPrefix}/contracts/doGetDynamicsGPDocument`, { externalReceiptNumber }, @@ -2711,7 +2017,7 @@ declare const exports: Record cityssm.openHtmlModal('contract-addTransaction', { onshow(modalElement) { - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) ;( modalElement.querySelector( '#contractTransactionAdd--contractId' @@ -2739,7 +2045,7 @@ declare const exports: Record 0 ).toFixed(2) - if (los.dynamicsGPIntegrationIsEnabled) { + if (sunrise.dynamicsGPIntegrationIsEnabled) { externalReceiptNumberElement = modalElement.querySelector( // eslint-disable-next-line no-secrets/no-secrets '#contractTransactionAdd--externalReceiptNumber' diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js index 8fd9e10d..6a8ec7b2 100644 --- a/public/javascripts/contract.search.js +++ b/public/javascripts/contract.search.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const searchFilterFormElement = document.querySelector('#form--searchFilters'); const searchResultsContainerElement = document.querySelector('#container--searchResults'); const limit = Number.parseInt(document.querySelector('#searchFilter--limit').value, 10); diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts index c1b20883..aa1fc55e 100644 --- a/public/javascripts/contract.search.ts +++ b/public/javascripts/contract.search.ts @@ -2,13 +2,13 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { Contract } from '../../types/recordTypes.js' -import type { LOS } from './types.js' +import type { Sunrise } from './types.js' declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as Sunrise const searchFilterFormElement = document.querySelector( '#form--searchFilters' diff --git a/public/javascripts/contractTypes.admin.js b/public/javascripts/contractTypes.admin.js index 504f649a..7ed01b96 100644 --- a/public/javascripts/contractTypes.admin.js +++ b/public/javascripts/contractTypes.admin.js @@ -1,88 +1,88 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; - const occupancyTypesContainerElement = document.querySelector('#container--occupancyTypes'); - const ContractTypePrintsContainerElement = document.querySelector('#container--ContractTypePrints'); - let occupancyTypes = exports.occupancyTypes; - delete exports.occupancyTypes; + const los = exports.sunrise; + const contractTypesContainerElement = document.querySelector('#container--contractTypes'); + const contractTypePrintsContainerElement = document.querySelector('#container--contractTypePrints'); + let contractTypes = exports.contractTypes; + delete exports.contractTypes; let allContractTypeFields = exports.allContractTypeFields; delete exports.allContractTypeFields; - const expandedOccupancyTypes = new Set(); + const expandedContractTypes = new Set(); function toggleContractTypeFields(clickEvent) { const toggleButtonElement = clickEvent.currentTarget; - const occupancyTypeElement = toggleButtonElement.closest('.container--occupancyType'); - const contractTypeId = Number.parseInt(occupancyTypeElement.dataset.contractTypeId ?? '', 10); - if (expandedOccupancyTypes.has(contractTypeId)) { - expandedOccupancyTypes.delete(contractTypeId); + const contractTypeElement = toggleButtonElement.closest('.container--contractType'); + const contractTypeId = Number.parseInt(contractTypeElement.dataset.contractTypeId ?? '', 10); + if (expandedContractTypes.has(contractTypeId)) { + expandedContractTypes.delete(contractTypeId); } else { - expandedOccupancyTypes.add(contractTypeId); + expandedContractTypes.add(contractTypeId); } // eslint-disable-next-line no-unsanitized/property - toggleButtonElement.innerHTML = expandedOccupancyTypes.has(contractTypeId) + toggleButtonElement.innerHTML = expandedContractTypes.has(contractTypeId) ? '' : ''; - const panelBlockElements = occupancyTypeElement.querySelectorAll('.panel-block'); + const panelBlockElements = contractTypeElement.querySelectorAll('.panel-block'); for (const panelBlockElement of panelBlockElements) { panelBlockElement.classList.toggle('is-hidden'); } } - function occupancyTypeResponseHandler(rawResponseJSON) { + function contractTypeResponseHandler(rawResponseJSON) { const responseJSON = rawResponseJSON; if (responseJSON.success) { - occupancyTypes = responseJSON.occupancyTypes; + contractTypes = responseJSON.contractTypes; allContractTypeFields = responseJSON.allContractTypeFields; - renderOccupancyTypes(); + renderContractTypes(); } else { bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Occupancy} Type`, + title: `Error Updating Contract Type`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); } } - function deleteOccupancyType(clickEvent) { - const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--occupancyType').dataset.contractTypeId ?? '', 10); + function deleteContractType(clickEvent) { + const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--contractType').dataset.contractTypeId ?? '', 10); function doDelete() { cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteContractType`, { contractTypeId - }, occupancyTypeResponseHandler); + }, contractTypeResponseHandler); } bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Type`, - message: `Are you sure you want to delete this ${los.escapedAliases.occupancy} type?`, + title: `Delete Contract Type`, + message: `Are you sure you want to delete this contract type?`, contextualColorName: 'warning', okButton: { - text: `Yes, Delete ${los.escapedAliases.Occupancy} Type`, + text: `Yes, Delete Contract Type`, callbackFunction: doDelete } }); } - function openEditOccupancyType(clickEvent) { - const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--occupancyType').dataset.contractTypeId ?? '', 10); - const occupancyType = occupancyTypes.find((currentOccupancyType) => contractTypeId === currentOccupancyType.contractTypeId); + function openEditContractType(clickEvent) { + const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--contractType').dataset.contractTypeId ?? '', 10); + const contractType = contractTypes.find((currentContractType) => contractTypeId === currentContractType.contractTypeId); let editCloseModalFunction; function doEdit(submitEvent) { submitEvent.preventDefault(); cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateContractType`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; - occupancyTypeResponseHandler(responseJSON); + contractTypeResponseHandler(responseJSON); if (responseJSON.success) { editCloseModalFunction(); } }); } - cityssm.openHtmlModal('adminOccupancyTypes-editOccupancyType', { + cityssm.openHtmlModal('adminContractTypes-edit', { onshow(modalElement) { los.populateAliases(modalElement); - modalElement.querySelector('#occupancyTypeEdit--contractTypeId').value = contractTypeId.toString(); - modalElement.querySelector('#occupancyTypeEdit--occupancyType').value = occupancyType.occupancyType; + modalElement.querySelector('#contractTypeEdit--contractTypeId').value = contractTypeId.toString(); + modalElement.querySelector('#contractTypeEdit--contractType').value = contractType.contractType; }, onshown(modalElement, closeModalFunction) { editCloseModalFunction = closeModalFunction; - modalElement.querySelector('#occupancyTypeEdit--occupancyType').focus(); + modalElement.querySelector('#contractTypeEdit--contractType').focus(); modalElement.querySelector('form')?.addEventListener('submit', doEdit); bulmaJS.toggleHtmlClipped(); }, @@ -91,32 +91,32 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); } - function openAddOccupancyTypeField(clickEvent) { - const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--occupancyType').dataset.contractTypeId ?? '', 10); + function openAddContractTypeField(clickEvent) { + const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--contractType').dataset.contractTypeId ?? '', 10); let addCloseModalFunction; function doAdd(submitEvent) { submitEvent.preventDefault(); cityssm.postJSON(`${los.urlPrefix}/admin/doAddContractTypeField`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; - expandedOccupancyTypes.add(contractTypeId); - occupancyTypeResponseHandler(responseJSON); + expandedContractTypes.add(contractTypeId); + contractTypeResponseHandler(responseJSON); if (responseJSON.success) { addCloseModalFunction(); - openEditOccupancyTypeField(contractTypeId, responseJSON.contractTypeFieldId ?? 0); + openEditContractTypeField(contractTypeId, responseJSON.contractTypeFieldId ?? 0); } }); } - cityssm.openHtmlModal('adminOccupancyTypes-addOccupancyTypeField', { + cityssm.openHtmlModal('adminContractTypes-addField', { onshow(modalElement) { los.populateAliases(modalElement); if (contractTypeId) { ; - modalElement.querySelector('#occupancyTypeFieldAdd--contractTypeId').value = contractTypeId.toString(); + modalElement.querySelector('#contractTypeFieldAdd--contractTypeId').value = contractTypeId.toString(); } }, onshown(modalElement, closeModalFunction) { addCloseModalFunction = closeModalFunction; - modalElement.querySelector('#occupancyTypeFieldAdd--occupancyTypeField').focus(); + modalElement.querySelector('#contractTypeFieldAdd--contractTypeField').focus(); modalElement.querySelector('form')?.addEventListener('submit', doAdd); bulmaJS.toggleHtmlClipped(); }, @@ -125,29 +125,29 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); } - function moveOccupancyType(clickEvent) { + function moveContractType(clickEvent) { const buttonElement = clickEvent.currentTarget; - const contractTypeId = clickEvent.currentTarget.closest('.container--occupancyType').dataset.contractTypeId; + const contractTypeId = clickEvent.currentTarget.closest('.container--contractType').dataset.contractTypeId; cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' ? 'doMoveContractTypeUp' : 'doMoveContractTypeDown'}`, { contractTypeId, moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, occupancyTypeResponseHandler); + }, contractTypeResponseHandler); } - function openEditOccupancyTypeField(contractTypeId, contractTypeFieldId) { - let occupancyType; + function openEditContractTypeField(contractTypeId, contractTypeFieldId) { + let contractType; if (contractTypeId) { - occupancyType = occupancyTypes.find((currentOccupancyType) => currentOccupancyType.contractTypeId === contractTypeId); + contractType = contractTypes.find((currentContractType) => currentContractType.contractTypeId === contractTypeId); } - const occupancyTypeField = (occupancyType - ? occupancyType.ContractTypeFields ?? [] - : allContractTypeFields).find((currentOccupancyTypeField) => currentOccupancyTypeField.contractTypeFieldId === contractTypeFieldId); + const contractTypeField = (contractType + ? contractType.contractTypeFields ?? [] + : allContractTypeFields).find((currentContractTypeField) => currentContractTypeField.contractTypeFieldId === contractTypeFieldId); let fieldTypeElement; let minLengthInputElement; let maxLengthInputElement; let patternElement; - let occupancyTypeFieldValuesElement; + let fieldValuesElement; let editCloseModalFunction; function updateMaximumLengthMin() { maxLengthInputElement.min = minLengthInputElement.value; @@ -158,21 +158,21 @@ Object.defineProperty(exports, "__esModule", { value: true }); minLengthInputElement.disabled = true; maxLengthInputElement.disabled = true; patternElement.disabled = true; - occupancyTypeFieldValuesElement.disabled = true; + fieldValuesElement.disabled = true; break; } case 'select': { minLengthInputElement.disabled = true; maxLengthInputElement.disabled = true; patternElement.disabled = true; - occupancyTypeFieldValuesElement.disabled = false; + fieldValuesElement.disabled = false; break; } default: { minLengthInputElement.disabled = false; maxLengthInputElement.disabled = false; patternElement.disabled = false; - occupancyTypeFieldValuesElement.disabled = true; + fieldValuesElement.disabled = true; break; } } @@ -181,7 +181,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); submitEvent.preventDefault(); cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateContractTypeField`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; - occupancyTypeResponseHandler(responseJSON); + contractTypeResponseHandler(responseJSON); if (responseJSON.success) { editCloseModalFunction(); } @@ -192,7 +192,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); contractTypeFieldId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; - occupancyTypeResponseHandler(responseJSON); + contractTypeResponseHandler(responseJSON); if (responseJSON.success) { editCloseModalFunction(); } @@ -209,28 +209,27 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); } - cityssm.openHtmlModal('adminOccupancyTypes-editOccupancyTypeField', { - onshow: (modalElement) => { + cityssm.openHtmlModal('adminContractTypes-editField', { + onshow(modalElement) { los.populateAliases(modalElement); - modalElement.querySelector('#occupancyTypeFieldEdit--contractTypeFieldId').value = occupancyTypeField.contractTypeFieldId.toString(); - modalElement.querySelector('#occupancyTypeFieldEdit--occupancyTypeField').value = occupancyTypeField.occupancyTypeField ?? ''; - modalElement.querySelector('#occupancyTypeFieldEdit--isRequired').value = occupancyTypeField.isRequired ?? false ? '1' : '0'; - fieldTypeElement = modalElement.querySelector('#occupancyTypeFieldEdit--fieldType'); - fieldTypeElement.value = occupancyTypeField.fieldType; - minLengthInputElement = modalElement.querySelector('#occupancyTypeFieldEdit--minLength'); + modalElement.querySelector('#contractTypeFieldEdit--contractTypeFieldId').value = contractTypeField.contractTypeFieldId.toString(); + modalElement.querySelector('#contractTypeFieldEdit--contractTypeField').value = contractTypeField.contractTypeField ?? ''; + modalElement.querySelector('#contractTypeFieldEdit--isRequired').value = contractTypeField.isRequired ?? false ? '1' : '0'; + fieldTypeElement = modalElement.querySelector('#contractTypeFieldEdit--fieldType'); + fieldTypeElement.value = contractTypeField.fieldType; + minLengthInputElement = modalElement.querySelector('#contractTypeFieldEdit--minLength'); minLengthInputElement.value = - occupancyTypeField.minLength?.toString() ?? ''; - maxLengthInputElement = modalElement.querySelector('#occupancyTypeFieldEdit--maxLength'); + contractTypeField.minLength?.toString() ?? ''; + maxLengthInputElement = modalElement.querySelector('#contractTypeFieldEdit--maxLength'); maxLengthInputElement.value = - occupancyTypeField.maxLength?.toString() ?? ''; - patternElement = modalElement.querySelector('#occupancyTypeFieldEdit--pattern'); - patternElement.value = occupancyTypeField.pattern ?? ''; - occupancyTypeFieldValuesElement = modalElement.querySelector('#occupancyTypeFieldEdit--occupancyTypeFieldValues'); - occupancyTypeFieldValuesElement.value = - occupancyTypeField.occupancyTypeFieldValues ?? ''; + contractTypeField.maxLength?.toString() ?? ''; + patternElement = modalElement.querySelector('#contractTypeFieldEdit--pattern'); + patternElement.value = contractTypeField.pattern ?? ''; + fieldValuesElement = modalElement.querySelector('#contractTypeFieldEdit--fieldValues'); + fieldValuesElement.value = contractTypeField.fieldValues ?? ''; toggleInputFields(); }, - onshown: (modalElement, closeModalFunction) => { + onshown(modalElement, closeModalFunction) { editCloseModalFunction = closeModalFunction; bulmaJS.init(modalElement); bulmaJS.toggleHtmlClipped(); @@ -240,77 +239,78 @@ Object.defineProperty(exports, "__esModule", { value: true }); updateMaximumLengthMin(); fieldTypeElement.addEventListener('change', toggleInputFields); modalElement - .querySelector('#button--deleteOccupancyTypeField') + .querySelector('#button--deleteContractTypeField') ?.addEventListener('click', confirmDoDelete); }, - onremoved: () => { + onremoved() { bulmaJS.toggleHtmlClipped(); cityssm.disableNavBlocker(); } }); } - function openEditOccupancyTypeFieldByClick(clickEvent) { + function openEditContractTypeFieldByClick(clickEvent) { clickEvent.preventDefault(); - const contractTypeFieldId = Number.parseInt(clickEvent.currentTarget.closest('.container--occupancyTypeField').dataset.contractTypeFieldId ?? '', 10); - const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--occupancyType').dataset.contractTypeId ?? '', 10); - openEditOccupancyTypeField(contractTypeId, contractTypeFieldId); + const contractTypeFieldId = Number.parseInt(clickEvent.currentTarget.closest('.container--contractTypeField').dataset.contractTypeFieldId ?? '', 10); + const contractTypeId = Number.parseInt(clickEvent.currentTarget.closest('.container--contractType').dataset.contractTypeId ?? '', 10); + openEditContractTypeField(contractTypeId, contractTypeFieldId); } - function moveOccupancyTypeField(clickEvent) { + function moveContractTypeField(clickEvent) { const buttonElement = clickEvent.currentTarget; - const contractTypeFieldId = clickEvent.currentTarget.closest('.container--occupancyTypeField').dataset.contractTypeFieldId; + const contractTypeFieldId = clickEvent.currentTarget.closest('.container--contractTypeField').dataset.contractTypeFieldId; cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' - ? 'doMoveContractTypeFieldUp' + ? // eslint-disable-next-line no-secrets/no-secrets + 'doMoveContractTypeFieldUp' : // eslint-disable-next-line no-secrets/no-secrets 'doMoveContractTypeFieldDown'}`, { contractTypeFieldId, moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, occupancyTypeResponseHandler); + }, contractTypeResponseHandler); } - function renderContractTypeFields(panelElement, contractTypeId, ContractTypeFields) { - if (ContractTypeFields.length === 0) { + function renderContractTypeFields(panelElement, contractTypeId, contractTypeFields) { + if (contractTypeFields.length === 0) { // eslint-disable-next-line no-unsanitized/method - panelElement.insertAdjacentHTML('beforeend', `

There are no additional fields.

`); } else { - for (const occupancyTypeField of ContractTypeFields) { + for (const contractTypeField of contractTypeFields) { const panelBlockElement = document.createElement('div'); panelBlockElement.className = - 'panel-block is-block container--occupancyTypeField'; - if (contractTypeId && !expandedOccupancyTypes.has(contractTypeId)) { + 'panel-block is-block container--contractTypeField'; + if (contractTypeId && !expandedContractTypes.has(contractTypeId)) { panelBlockElement.classList.add('is-hidden'); } panelBlockElement.dataset.contractTypeFieldId = - occupancyTypeField.contractTypeFieldId.toString(); + contractTypeField.contractTypeFieldId.toString(); // eslint-disable-next-line no-unsanitized/property panelBlockElement.innerHTML = `
- - ${cityssm.escapeHTML(occupancyTypeField.occupancyTypeField ?? '')} + + ${cityssm.escapeHTML(contractTypeField.contractTypeField ?? '')}
- ${los.getMoveUpDownButtonFieldHTML('button--moveOccupancyTypeFieldUp', 'button--moveOccupancyTypeFieldDown')} + ${los.getMoveUpDownButtonFieldHTML('button--moveContractTypeFieldUp', 'button--moveContractTypeFieldDown')}
`; panelBlockElement - .querySelector('.button--editOccupancyTypeField') - ?.addEventListener('click', openEditOccupancyTypeFieldByClick); - panelBlockElement.querySelector('.button--moveOccupancyTypeFieldUp').addEventListener('click', moveOccupancyTypeField); - panelBlockElement.querySelector('.button--moveOccupancyTypeFieldDown').addEventListener('click', moveOccupancyTypeField); + .querySelector('.button--editContractTypeField') + ?.addEventListener('click', openEditContractTypeFieldByClick); + panelBlockElement.querySelector('.button--moveContractTypeFieldUp').addEventListener('click', moveContractTypeField); + panelBlockElement.querySelector('.button--moveContractTypeFieldDown').addEventListener('click', moveContractTypeField); panelElement.append(panelBlockElement); } } } - function openAddOccupancyTypePrint(clickEvent) { - const contractTypeId = clickEvent.currentTarget.closest('.container--occupancyTypePrintList').dataset.contractTypeId ?? ''; + function openAddContractTypePrint(clickEvent) { + const contractTypeId = clickEvent.currentTarget.closest('.container--contractTypePrintList').dataset.contractTypeId ?? ''; let closeAddModalFunction; function doAdd(formEvent) { formEvent.preventDefault(); @@ -319,15 +319,15 @@ Object.defineProperty(exports, "__esModule", { value: true }); if (responseJSON.success) { closeAddModalFunction(); } - occupancyTypeResponseHandler(responseJSON); + contractTypeResponseHandler(responseJSON); }); } - cityssm.openHtmlModal('adminOccupancyTypes-addOccupancyTypePrint', { + cityssm.openHtmlModal('adminContractTypes-addPrint', { onshow(modalElement) { los.populateAliases(modalElement); - modalElement.querySelector('#occupancyTypePrintAdd--contractTypeId').value = contractTypeId; - const printSelectElement = modalElement.querySelector('#occupancyTypePrintAdd--printEJS'); - for (const [printEJS, printTitle] of Object.entries(exports.occupancyTypePrintTitles)) { + modalElement.querySelector('#contractTypePrintAdd--contractTypeId').value = contractTypeId; + const printSelectElement = modalElement.querySelector('#contractTypePrintAdd--printEJS'); + for (const [printEJS, printTitle] of Object.entries(exports.contractTypePrintTitles)) { const optionElement = document.createElement('option'); optionElement.value = printEJS; optionElement.textContent = printTitle; @@ -340,29 +340,27 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); } - function moveOccupancyTypePrint(clickEvent) { + function moveContractTypePrint(clickEvent) { const buttonElement = clickEvent.currentTarget; - const printEJS = buttonElement.closest('.container--occupancyTypePrint').dataset.printEJS; - const contractTypeId = buttonElement.closest('.container--occupancyTypePrintList').dataset.contractTypeId; + const printEJS = buttonElement.closest('.container--contractTypePrint').dataset.printEJS; + const contractTypeId = buttonElement.closest('.container--contractTypePrintList').dataset.contractTypeId; cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' - ? // eslint-disable-next-line no-secrets/no-secrets - 'doMoveContractTypePrintUp' - : // eslint-disable-next-line no-secrets/no-secrets - 'doMoveContractTypePrintDown'}`, { + ? 'doMoveContractTypePrintUp' + : 'doMoveContractTypePrintDown'}`, { contractTypeId, printEJS, moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, occupancyTypeResponseHandler); + }, contractTypeResponseHandler); } - function deleteOccupancyTypePrint(clickEvent) { + function deleteContractTypePrint(clickEvent) { clickEvent.preventDefault(); - const printEJS = clickEvent.currentTarget.closest('.container--occupancyTypePrint').dataset.printEJS; - const contractTypeId = clickEvent.currentTarget.closest('.container--occupancyTypePrintList').dataset.contractTypeId; + const printEJS = clickEvent.currentTarget.closest('.container--contractTypePrint').dataset.printEJS; + const contractTypeId = clickEvent.currentTarget.closest('.container--contractTypePrintList').dataset.contractTypeId; function doDelete() { cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteContractTypePrint`, { contractTypeId, printEJS - }, occupancyTypeResponseHandler); + }, contractTypeResponseHandler); } bulmaJS.confirm({ title: 'Delete Print', @@ -374,8 +372,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); } - function renderContractTypePrints(panelElement, contractTypeId, ContractTypePrints) { - if (ContractTypePrints.length === 0) { + function renderContractTypePrints(panelElement, contractTypeId, contractTypePrints) { + if (contractTypePrints.length === 0) { panelElement.insertAdjacentHTML('beforeend', `

There are no prints associated with this record.

@@ -383,14 +381,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
`); } else { - for (const printEJS of ContractTypePrints) { + for (const printEJS of contractTypePrints) { const panelBlockElement = document.createElement('div'); panelBlockElement.className = - 'panel-block is-block container--occupancyTypePrint'; + 'panel-block is-block container--contractTypePrint'; panelBlockElement.dataset.printEJS = printEJS; const printTitle = printEJS === '*' ? '(All Available Prints)' - : exports.occupancyTypePrintTitles[printEJS]; + : exports.contractTypePrintTitles[printEJS]; let printIconClass = 'fa-star'; if (printEJS.startsWith('pdf/')) { printIconClass = 'fa-file-pdf'; @@ -410,37 +408,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
- ${los.getMoveUpDownButtonFieldHTML('button--moveOccupancyTypePrintUp', 'button--moveOccupancyTypePrintDown')} + ${los.getMoveUpDownButtonFieldHTML('button--moveContractTypePrintUp', 'button--moveContractTypePrintDown')}
-
`; - panelBlockElement.querySelector('.button--moveOccupancyTypePrintUp').addEventListener('click', moveOccupancyTypePrint); - panelBlockElement.querySelector('.button--moveOccupancyTypePrintDown').addEventListener('click', moveOccupancyTypePrint); + panelBlockElement.querySelector('.button--moveContractTypePrintUp').addEventListener('click', moveContractTypePrint); + panelBlockElement.querySelector('.button--moveContractTypePrintDown').addEventListener('click', moveContractTypePrint); panelBlockElement - .querySelector('.button--deleteOccupancyTypePrint') - ?.addEventListener('click', deleteOccupancyTypePrint); + .querySelector('.button--deleteContractTypePrint') + ?.addEventListener('click', deleteContractTypePrint); panelElement.append(panelBlockElement); } } } - function renderOccupancyTypes() { - // eslint-disable-next-line no-unsanitized/property - occupancyTypesContainerElement.innerHTML = `
+ function renderContractTypes() { + contractTypesContainerElement.innerHTML = `
-

(All ${los.escapedAliases.Occupancy} Types)

+

(All Contract Types)

- @@ -449,104 +446,102 @@ Object.defineProperty(exports, "__esModule", { value: true });
`; - ContractTypePrintsContainerElement.innerHTML = ''; - renderContractTypeFields(occupancyTypesContainerElement.querySelector('#container--allContractTypeFields'), undefined, allContractTypeFields); - occupancyTypesContainerElement - .querySelector('.button--addOccupancyTypeField') - ?.addEventListener('click', openAddOccupancyTypeField); - if (occupancyTypes.length === 0) { - // eslint-disable-next-line no-unsanitized/method - occupancyTypesContainerElement.insertAdjacentHTML('afterbegin', `
There are no active ${los.escapedAliases.occupancy} types.

+ contractTypePrintsContainerElement.innerHTML = ''; + renderContractTypeFields(contractTypesContainerElement.querySelector('#container--allContractTypeFields'), undefined, allContractTypeFields); + contractTypesContainerElement + .querySelector('.button--addContractTypeField') + ?.addEventListener('click', openAddContractTypeField); + if (contractTypes.length === 0) { + contractTypesContainerElement.insertAdjacentHTML('afterbegin', `
There are no active contract types.

`); - // eslint-disable-next-line no-unsanitized/method - ContractTypePrintsContainerElement.insertAdjacentHTML('afterbegin', `
There are no active ${los.escapedAliases.occupancy} types.

+ contractTypePrintsContainerElement.insertAdjacentHTML('afterbegin', `
There are no active contract types.

`); return; } - for (const occupancyType of occupancyTypes) { + for (const contractType of contractTypes) { /* * Types and Fields */ - const occupancyTypeContainer = document.createElement('div'); - occupancyTypeContainer.className = 'panel container--occupancyType'; - occupancyTypeContainer.dataset.contractTypeId = - occupancyType.contractTypeId.toString(); + const contractTypeContainer = document.createElement('div'); + contractTypeContainer.className = 'panel container--contractType'; + contractTypeContainer.dataset.contractTypeId = + contractType.contractTypeId.toString(); // eslint-disable-next-line no-unsanitized/property - occupancyTypeContainer.innerHTML = `
+ contractTypeContainer.innerHTML = `
-

${cityssm.escapeHTML(occupancyType.occupancyType)}

+

${cityssm.escapeHTML(contractType.contractType)}

-
-
-
- ${los.getMoveUpDownButtonFieldHTML('button--moveOccupancyTypeUp', 'button--moveOccupancyTypeDown')} + ${los.getMoveUpDownButtonFieldHTML('button--moveContractTypeUp', 'button--moveContractTypeDown')}
`; - renderContractTypeFields(occupancyTypeContainer, occupancyType.contractTypeId, occupancyType.ContractTypeFields ?? []); - occupancyTypeContainer + renderContractTypeFields(contractTypeContainer, contractType.contractTypeId, contractType.contractTypeFields ?? []); + contractTypeContainer .querySelector('.button--toggleContractTypeFields') ?.addEventListener('click', toggleContractTypeFields); - occupancyTypeContainer - .querySelector('.button--deleteOccupancyType') - ?.addEventListener('click', deleteOccupancyType); - occupancyTypeContainer - .querySelector('.button--editOccupancyType') - ?.addEventListener('click', openEditOccupancyType); - occupancyTypeContainer - .querySelector('.button--addOccupancyTypeField') - ?.addEventListener('click', openAddOccupancyTypeField); - occupancyTypeContainer.querySelector('.button--moveOccupancyTypeUp').addEventListener('click', moveOccupancyType); - occupancyTypeContainer.querySelector('.button--moveOccupancyTypeDown').addEventListener('click', moveOccupancyType); - occupancyTypesContainerElement.append(occupancyTypeContainer); + contractTypeContainer + .querySelector('.button--deleteContractType') + ?.addEventListener('click', deleteContractType); + contractTypeContainer + .querySelector('.button--editContractType') + ?.addEventListener('click', openEditContractType); + contractTypeContainer + .querySelector('.button--addContractTypeField') + ?.addEventListener('click', openAddContractTypeField); + contractTypeContainer.querySelector('.button--moveContractTypeUp').addEventListener('click', moveContractType); + contractTypeContainer.querySelector('.button--moveContractTypeDown').addEventListener('click', moveContractType); + contractTypesContainerElement.append(contractTypeContainer); /* * Prints */ - const occupancyTypePrintContainer = document.createElement('div'); - occupancyTypePrintContainer.className = - 'panel container--occupancyTypePrintList'; - occupancyTypePrintContainer.dataset.contractTypeId = - occupancyType.contractTypeId.toString(); - occupancyTypePrintContainer.innerHTML = `
+ const contractTypePrintContainer = document.createElement('div'); + contractTypePrintContainer.className = + 'panel container--contractTypePrintList'; + contractTypePrintContainer.dataset.contractTypeId = + contractType.contractTypeId.toString(); + contractTypePrintContainer.innerHTML = `
-

${cityssm.escapeHTML(occupancyType.occupancyType)}

+

${cityssm.escapeHTML(contractType.contractType)}

- @@ -554,15 +549,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
`; - renderContractTypePrints(occupancyTypePrintContainer, occupancyType.contractTypeId, occupancyType.ContractTypePrints ?? []); - occupancyTypePrintContainer - .querySelector('.button--addOccupancyTypePrint') - ?.addEventListener('click', openAddOccupancyTypePrint); - ContractTypePrintsContainerElement.append(occupancyTypePrintContainer); + renderContractTypePrints(contractTypePrintContainer, contractType.contractTypeId, contractType.contractTypePrints ?? []); + contractTypePrintContainer + .querySelector('.button--addContractTypePrint') + ?.addEventListener('click', openAddContractTypePrint); + contractTypePrintsContainerElement.append(contractTypePrintContainer); } } document - .querySelector('#button--addOccupancyType') + .querySelector('#button--addContractType') ?.addEventListener('click', () => { let addCloseModalFunction; function doAdd(submitEvent) { @@ -571,25 +566,25 @@ Object.defineProperty(exports, "__esModule", { value: true }); const responseJSON = rawResponseJSON; if (responseJSON.success) { addCloseModalFunction(); - occupancyTypes = responseJSON.occupancyTypes; - renderOccupancyTypes(); + contractTypes = responseJSON.contractTypes; + renderContractTypes(); } else { bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Occupancy} Type`, + title: `Error Adding Contract Type`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); } }); } - cityssm.openHtmlModal('adminOccupancyTypes-addOccupancyType', { + cityssm.openHtmlModal('adminContractTypes-add', { onshow(modalElement) { los.populateAliases(modalElement); }, onshown(modalElement, closeModalFunction) { addCloseModalFunction = closeModalFunction; - modalElement.querySelector('#occupancyTypeAdd--occupancyType').focus(); + modalElement.querySelector('#contractTypeAdd--contractType').focus(); modalElement.querySelector('form')?.addEventListener('submit', doAdd); bulmaJS.toggleHtmlClipped(); }, @@ -598,5 +593,5 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); }); - renderOccupancyTypes(); + renderContractTypes(); })(); diff --git a/public/javascripts/contractTypes.admin.ts b/public/javascripts/contractTypes.admin.ts index 5ffc9334..ef391039 100644 --- a/public/javascripts/contractTypes.admin.ts +++ b/public/javascripts/contractTypes.admin.ts @@ -1,12 +1,14 @@ +/* eslint-disable max-lines */ import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { LOS } from '../../types/globalTypes.js' import type { - OccupancyType, - OccupancyTypeField + ContractType, + ContractTypeField } from '../../types/recordTypes.js' +import type { Sunrise } from './types.js' + declare const cityssm: cityssmGlobal declare const bulmaJS: BulmaJS @@ -15,91 +17,86 @@ declare const exports: Record type ResponseJSON = | { success: true - occupancyTypes: OccupancyType[] - allContractTypeFields: OccupancyTypeField[] + contractTypes: ContractType[] + allContractTypeFields: ContractTypeField[] contractTypeFieldId?: number } | { success: false - errorMessage: string + errorMessage?: string } ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as Sunrise - const occupancyTypesContainerElement = document.querySelector( - '#container--occupancyTypes' + const contractTypesContainerElement = document.querySelector( + '#container--contractTypes' ) as HTMLElement - const ContractTypePrintsContainerElement = document.querySelector( - '#container--ContractTypePrints' + const contractTypePrintsContainerElement = document.querySelector( + '#container--contractTypePrints' ) as HTMLElement - let occupancyTypes = exports.occupancyTypes as OccupancyType[] - delete exports.occupancyTypes + let contractTypes = exports.contractTypes as ContractType[] + delete exports.contractTypes let allContractTypeFields = - exports.allContractTypeFields as OccupancyTypeField[] + exports.allContractTypeFields as ContractTypeField[] delete exports.allContractTypeFields - const expandedOccupancyTypes = new Set() + const expandedContractTypes = new Set() function toggleContractTypeFields(clickEvent: Event): void { const toggleButtonElement = clickEvent.currentTarget as HTMLButtonElement - const occupancyTypeElement = toggleButtonElement.closest( - '.container--occupancyType' + const contractTypeElement = toggleButtonElement.closest( + '.container--contractType' ) as HTMLElement const contractTypeId = Number.parseInt( - occupancyTypeElement.dataset.contractTypeId ?? '', + contractTypeElement.dataset.contractTypeId ?? '', 10 ) - if (expandedOccupancyTypes.has(contractTypeId)) { - expandedOccupancyTypes.delete(contractTypeId) + if (expandedContractTypes.has(contractTypeId)) { + expandedContractTypes.delete(contractTypeId) } else { - expandedOccupancyTypes.add(contractTypeId) + expandedContractTypes.add(contractTypeId) } // eslint-disable-next-line no-unsanitized/property - toggleButtonElement.innerHTML = expandedOccupancyTypes.has(contractTypeId) + toggleButtonElement.innerHTML = expandedContractTypes.has(contractTypeId) ? '' : '' const panelBlockElements = - occupancyTypeElement.querySelectorAll('.panel-block') + contractTypeElement.querySelectorAll('.panel-block') for (const panelBlockElement of panelBlockElements) { panelBlockElement.classList.toggle('is-hidden') } } - function occupancyTypeResponseHandler(rawResponseJSON: unknown): void { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - occupancyTypes: OccupancyType[] - allContractTypeFields: OccupancyTypeField[] - } + function contractTypeResponseHandler(rawResponseJSON: unknown): void { + const responseJSON = rawResponseJSON as ResponseJSON if (responseJSON.success) { - occupancyTypes = responseJSON.occupancyTypes + contractTypes = responseJSON.contractTypes allContractTypeFields = responseJSON.allContractTypeFields - renderOccupancyTypes() + renderContractTypes() } else { bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Occupancy} Type`, + title: `Error Updating Contract Type`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) } } - function deleteOccupancyType(clickEvent: Event): void { + function deleteContractType(clickEvent: Event): void { const contractTypeId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyType' + '.container--contractType' ) as HTMLElement ).dataset.contractTypeId ?? '', 10 @@ -111,35 +108,35 @@ type ResponseJSON = { contractTypeId }, - occupancyTypeResponseHandler + contractTypeResponseHandler ) } bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Type`, - message: `Are you sure you want to delete this ${los.escapedAliases.occupancy} type?`, + title: `Delete Contract Type`, + message: `Are you sure you want to delete this contract type?`, contextualColorName: 'warning', okButton: { - text: `Yes, Delete ${los.escapedAliases.Occupancy} Type`, + text: `Yes, Delete Contract Type`, callbackFunction: doDelete } }) } - function openEditOccupancyType(clickEvent: Event): void { + function openEditContractType(clickEvent: Event): void { const contractTypeId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyType' + '.container--contractType' ) as HTMLElement ).dataset.contractTypeId ?? '', 10 ) - const occupancyType = occupancyTypes.find( - (currentOccupancyType) => - contractTypeId === currentOccupancyType.contractTypeId - ) as OccupancyType + const contractType = contractTypes.find( + (currentContractType) => + contractTypeId === currentContractType.contractTypeId + ) as ContractType let editCloseModalFunction: () => void @@ -152,7 +149,7 @@ type ResponseJSON = (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON - occupancyTypeResponseHandler(responseJSON) + contractTypeResponseHandler(responseJSON) if (responseJSON.success) { editCloseModalFunction() } @@ -160,25 +157,25 @@ type ResponseJSON = ) } - cityssm.openHtmlModal('adminOccupancyTypes-editOccupancyType', { - onshow(modalElement): void { + cityssm.openHtmlModal('adminContractTypes-edit', { + onshow(modalElement) { los.populateAliases(modalElement) ;( modalElement.querySelector( - '#occupancyTypeEdit--contractTypeId' + '#contractTypeEdit--contractTypeId' ) as HTMLInputElement ).value = contractTypeId.toString() ;( modalElement.querySelector( - '#occupancyTypeEdit--occupancyType' + '#contractTypeEdit--contractType' ) as HTMLInputElement - ).value = occupancyType.occupancyType + ).value = contractType.contractType }, onshown(modalElement, closeModalFunction) { editCloseModalFunction = closeModalFunction ;( modalElement.querySelector( - '#occupancyTypeEdit--occupancyType' + '#contractTypeEdit--contractType' ) as HTMLInputElement ).focus() @@ -192,11 +189,11 @@ type ResponseJSON = }) } - function openAddOccupancyTypeField(clickEvent: Event): void { + function openAddContractTypeField(clickEvent: Event): void { const contractTypeId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyType' + '.container--contractType' ) as HTMLElement ).dataset.contractTypeId ?? '', 10 @@ -213,12 +210,12 @@ type ResponseJSON = (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON - expandedOccupancyTypes.add(contractTypeId) - occupancyTypeResponseHandler(responseJSON) + expandedContractTypes.add(contractTypeId) + contractTypeResponseHandler(responseJSON) if (responseJSON.success) { addCloseModalFunction() - openEditOccupancyTypeField( + openEditContractTypeField( contractTypeId, responseJSON.contractTypeFieldId ?? 0 ) @@ -227,14 +224,14 @@ type ResponseJSON = ) } - cityssm.openHtmlModal('adminOccupancyTypes-addOccupancyTypeField', { + cityssm.openHtmlModal('adminContractTypes-addField', { onshow(modalElement) { los.populateAliases(modalElement) if (contractTypeId) { ;( modalElement.querySelector( - '#occupancyTypeFieldAdd--contractTypeId' + '#contractTypeFieldAdd--contractTypeId' ) as HTMLInputElement ).value = contractTypeId.toString() } @@ -243,7 +240,7 @@ type ResponseJSON = addCloseModalFunction = closeModalFunction ;( modalElement.querySelector( - '#occupancyTypeFieldAdd--occupancyTypeField' + '#contractTypeFieldAdd--contractTypeField' ) as HTMLInputElement ).focus() @@ -257,12 +254,12 @@ type ResponseJSON = }) } - function moveOccupancyType(clickEvent: MouseEvent): void { + function moveContractType(clickEvent: MouseEvent): void { const buttonElement = clickEvent.currentTarget as HTMLButtonElement const contractTypeId = ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyType' + '.container--contractType' ) as HTMLElement ).dataset.contractTypeId @@ -276,37 +273,37 @@ type ResponseJSON = contractTypeId, moveToEnd: clickEvent.shiftKey ? '1' : '0' }, - occupancyTypeResponseHandler + contractTypeResponseHandler ) } - function openEditOccupancyTypeField( + function openEditContractTypeField( contractTypeId: number, contractTypeFieldId: number ): void { - let occupancyType: OccupancyType | undefined + let contractType: ContractType | undefined if (contractTypeId) { - occupancyType = occupancyTypes.find( - (currentOccupancyType) => - currentOccupancyType.contractTypeId === contractTypeId + contractType = contractTypes.find( + (currentContractType) => + currentContractType.contractTypeId === contractTypeId ) } - const occupancyTypeField = ( - occupancyType - ? occupancyType.ContractTypeFields ?? [] + const contractTypeField = ( + contractType + ? contractType.contractTypeFields ?? [] : allContractTypeFields ).find( - (currentOccupancyTypeField) => - currentOccupancyTypeField.contractTypeFieldId === contractTypeFieldId - ) as OccupancyTypeField + (currentContractTypeField) => + currentContractTypeField.contractTypeFieldId === contractTypeFieldId + ) as ContractTypeField let fieldTypeElement: HTMLSelectElement let minLengthInputElement: HTMLInputElement let maxLengthInputElement: HTMLInputElement let patternElement: HTMLInputElement - let occupancyTypeFieldValuesElement: HTMLTextAreaElement + let fieldValuesElement: HTMLTextAreaElement let editCloseModalFunction: () => void @@ -320,21 +317,21 @@ type ResponseJSON = minLengthInputElement.disabled = true maxLengthInputElement.disabled = true patternElement.disabled = true - occupancyTypeFieldValuesElement.disabled = true + fieldValuesElement.disabled = true break } case 'select': { minLengthInputElement.disabled = true maxLengthInputElement.disabled = true patternElement.disabled = true - occupancyTypeFieldValuesElement.disabled = false + fieldValuesElement.disabled = false break } default: { minLengthInputElement.disabled = false maxLengthInputElement.disabled = false patternElement.disabled = false - occupancyTypeFieldValuesElement.disabled = true + fieldValuesElement.disabled = true break } } @@ -349,7 +346,7 @@ type ResponseJSON = (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON - occupancyTypeResponseHandler(responseJSON) + contractTypeResponseHandler(responseJSON) if (responseJSON.success) { editCloseModalFunction() } @@ -366,7 +363,7 @@ type ResponseJSON = (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON - occupancyTypeResponseHandler(responseJSON) + contractTypeResponseHandler(responseJSON) if (responseJSON.success) { editCloseModalFunction() } @@ -387,61 +384,60 @@ type ResponseJSON = }) } - cityssm.openHtmlModal('adminOccupancyTypes-editOccupancyTypeField', { - onshow: (modalElement) => { + cityssm.openHtmlModal('adminContractTypes-editField', { + onshow(modalElement) { los.populateAliases(modalElement) ;( modalElement.querySelector( - '#occupancyTypeFieldEdit--contractTypeFieldId' + '#contractTypeFieldEdit--contractTypeFieldId' ) as HTMLInputElement - ).value = occupancyTypeField.contractTypeFieldId.toString() + ).value = contractTypeField.contractTypeFieldId.toString() ;( modalElement.querySelector( - '#occupancyTypeFieldEdit--occupancyTypeField' + '#contractTypeFieldEdit--contractTypeField' ) as HTMLInputElement - ).value = occupancyTypeField.occupancyTypeField ?? '' + ).value = contractTypeField.contractTypeField ?? '' ;( modalElement.querySelector( - '#occupancyTypeFieldEdit--isRequired' + '#contractTypeFieldEdit--isRequired' ) as HTMLSelectElement - ).value = occupancyTypeField.isRequired ?? false ? '1' : '0' + ).value = contractTypeField.isRequired ?? false ? '1' : '0' fieldTypeElement = modalElement.querySelector( - '#occupancyTypeFieldEdit--fieldType' + '#contractTypeFieldEdit--fieldType' ) as HTMLSelectElement - fieldTypeElement.value = occupancyTypeField.fieldType + fieldTypeElement.value = contractTypeField.fieldType minLengthInputElement = modalElement.querySelector( - '#occupancyTypeFieldEdit--minLength' + '#contractTypeFieldEdit--minLength' ) as HTMLInputElement minLengthInputElement.value = - occupancyTypeField.minLength?.toString() ?? '' + contractTypeField.minLength?.toString() ?? '' maxLengthInputElement = modalElement.querySelector( - '#occupancyTypeFieldEdit--maxLength' + '#contractTypeFieldEdit--maxLength' ) as HTMLInputElement maxLengthInputElement.value = - occupancyTypeField.maxLength?.toString() ?? '' + contractTypeField.maxLength?.toString() ?? '' patternElement = modalElement.querySelector( - '#occupancyTypeFieldEdit--pattern' + '#contractTypeFieldEdit--pattern' ) as HTMLInputElement - patternElement.value = occupancyTypeField.pattern ?? '' + patternElement.value = contractTypeField.pattern ?? '' - occupancyTypeFieldValuesElement = modalElement.querySelector( - '#occupancyTypeFieldEdit--occupancyTypeFieldValues' + fieldValuesElement = modalElement.querySelector( + '#contractTypeFieldEdit--fieldValues' ) as HTMLTextAreaElement - occupancyTypeFieldValuesElement.value = - occupancyTypeField.occupancyTypeFieldValues ?? '' + fieldValuesElement.value = contractTypeField.fieldValues ?? '' toggleInputFields() }, - onshown: (modalElement, closeModalFunction) => { + onshown(modalElement, closeModalFunction) { editCloseModalFunction = closeModalFunction bulmaJS.init(modalElement) @@ -456,23 +452,23 @@ type ResponseJSON = fieldTypeElement.addEventListener('change', toggleInputFields) modalElement - .querySelector('#button--deleteOccupancyTypeField') + .querySelector('#button--deleteContractTypeField') ?.addEventListener('click', confirmDoDelete) }, - onremoved: () => { + onremoved() { bulmaJS.toggleHtmlClipped() cityssm.disableNavBlocker() } }) } - function openEditOccupancyTypeFieldByClick(clickEvent: Event): void { + function openEditContractTypeFieldByClick(clickEvent: Event): void { clickEvent.preventDefault() const contractTypeFieldId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyTypeField' + '.container--contractTypeField' ) as HTMLElement ).dataset.contractTypeFieldId ?? '', 10 @@ -481,28 +477,29 @@ type ResponseJSON = const contractTypeId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyType' + '.container--contractType' ) as HTMLElement ).dataset.contractTypeId ?? '', 10 ) - openEditOccupancyTypeField(contractTypeId, contractTypeFieldId) + openEditContractTypeField(contractTypeId, contractTypeFieldId) } - function moveOccupancyTypeField(clickEvent: MouseEvent): void { + function moveContractTypeField(clickEvent: MouseEvent): void { const buttonElement = clickEvent.currentTarget as HTMLButtonElement const contractTypeFieldId = ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyTypeField' + '.container--contractTypeField' ) as HTMLElement ).dataset.contractTypeFieldId cityssm.postJSON( `${los.urlPrefix}/admin/${ buttonElement.dataset.direction === 'up' - ? 'doMoveContractTypeFieldUp' + ? // eslint-disable-next-line no-secrets/no-secrets + 'doMoveContractTypeFieldUp' : // eslint-disable-next-line no-secrets/no-secrets 'doMoveContractTypeFieldDown' }`, @@ -510,21 +507,21 @@ type ResponseJSON = contractTypeFieldId, moveToEnd: clickEvent.shiftKey ? '1' : '0' }, - occupancyTypeResponseHandler + contractTypeResponseHandler ) } function renderContractTypeFields( panelElement: HTMLElement, contractTypeId: number | undefined, - ContractTypeFields: OccupancyTypeField[] + contractTypeFields: ContractTypeField[] ): void { - if (ContractTypeFields.length === 0) { + if (contractTypeFields.length === 0) { // eslint-disable-next-line no-unsanitized/method panelElement.insertAdjacentHTML( 'beforeend', `
@@ -532,61 +529,61 @@ type ResponseJSON =
` ) } else { - for (const occupancyTypeField of ContractTypeFields) { + for (const contractTypeField of contractTypeFields) { const panelBlockElement = document.createElement('div') panelBlockElement.className = - 'panel-block is-block container--occupancyTypeField' + 'panel-block is-block container--contractTypeField' - if (contractTypeId && !expandedOccupancyTypes.has(contractTypeId)) { + if (contractTypeId && !expandedContractTypes.has(contractTypeId)) { panelBlockElement.classList.add('is-hidden') } panelBlockElement.dataset.contractTypeFieldId = - occupancyTypeField.contractTypeFieldId.toString() + contractTypeField.contractTypeFieldId.toString() // eslint-disable-next-line no-unsanitized/property panelBlockElement.innerHTML = `
- - ${cityssm.escapeHTML(occupancyTypeField.occupancyTypeField ?? '')} + + ${cityssm.escapeHTML(contractTypeField.contractTypeField ?? '')}
${los.getMoveUpDownButtonFieldHTML( - 'button--moveOccupancyTypeFieldUp', - 'button--moveOccupancyTypeFieldDown' + 'button--moveContractTypeFieldUp', + 'button--moveContractTypeFieldDown' )}
` panelBlockElement - .querySelector('.button--editOccupancyTypeField') - ?.addEventListener('click', openEditOccupancyTypeFieldByClick) + .querySelector('.button--editContractTypeField') + ?.addEventListener('click', openEditContractTypeFieldByClick) ;( panelBlockElement.querySelector( - '.button--moveOccupancyTypeFieldUp' + '.button--moveContractTypeFieldUp' ) as HTMLButtonElement - ).addEventListener('click', moveOccupancyTypeField) + ).addEventListener('click', moveContractTypeField) ;( panelBlockElement.querySelector( - '.button--moveOccupancyTypeFieldDown' + '.button--moveContractTypeFieldDown' ) as HTMLButtonElement - ).addEventListener('click', moveOccupancyTypeField) + ).addEventListener('click', moveContractTypeField) panelElement.append(panelBlockElement) } } } - function openAddOccupancyTypePrint(clickEvent: Event): void { + function openAddContractTypePrint(clickEvent: Event): void { const contractTypeId = ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyTypePrintList' + '.container--contractTypePrintList' ) as HTMLElement ).dataset.contractTypeId ?? '' @@ -605,26 +602,26 @@ type ResponseJSON = closeAddModalFunction() } - occupancyTypeResponseHandler(responseJSON) + contractTypeResponseHandler(responseJSON) } ) } - cityssm.openHtmlModal('adminOccupancyTypes-addOccupancyTypePrint', { + cityssm.openHtmlModal('adminContractTypes-addPrint', { onshow(modalElement) { los.populateAliases(modalElement) ;( modalElement.querySelector( - '#occupancyTypePrintAdd--contractTypeId' + '#contractTypePrintAdd--contractTypeId' ) as HTMLInputElement ).value = contractTypeId const printSelectElement = modalElement.querySelector( - '#occupancyTypePrintAdd--printEJS' + '#contractTypePrintAdd--printEJS' ) as HTMLSelectElement for (const [printEJS, printTitle] of Object.entries( - exports.occupancyTypePrintTitles as Record + exports.contractTypePrintTitles as Record )) { const optionElement = document.createElement('option') optionElement.value = printEJS @@ -640,46 +637,44 @@ type ResponseJSON = }) } - function moveOccupancyTypePrint(clickEvent: MouseEvent): void { + function moveContractTypePrint(clickEvent: MouseEvent): void { const buttonElement = clickEvent.currentTarget as HTMLButtonElement const printEJS = ( - buttonElement.closest('.container--occupancyTypePrint') as HTMLElement + buttonElement.closest('.container--contractTypePrint') as HTMLElement ).dataset.printEJS const contractTypeId = ( - buttonElement.closest('.container--occupancyTypePrintList') as HTMLElement + buttonElement.closest('.container--contractTypePrintList') as HTMLElement ).dataset.contractTypeId cityssm.postJSON( `${los.urlPrefix}/admin/${ buttonElement.dataset.direction === 'up' - ? // eslint-disable-next-line no-secrets/no-secrets - 'doMoveContractTypePrintUp' - : // eslint-disable-next-line no-secrets/no-secrets - 'doMoveContractTypePrintDown' + ? 'doMoveContractTypePrintUp' + : 'doMoveContractTypePrintDown' }`, { contractTypeId, printEJS, moveToEnd: clickEvent.shiftKey ? '1' : '0' }, - occupancyTypeResponseHandler + contractTypeResponseHandler ) } - function deleteOccupancyTypePrint(clickEvent: Event): void { + function deleteContractTypePrint(clickEvent: Event): void { clickEvent.preventDefault() const printEJS = ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyTypePrint' + '.container--contractTypePrint' ) as HTMLElement ).dataset.printEJS const contractTypeId = ( (clickEvent.currentTarget as HTMLElement).closest( - '.container--occupancyTypePrintList' + '.container--contractTypePrintList' ) as HTMLElement ).dataset.contractTypeId @@ -690,7 +685,7 @@ type ResponseJSON = contractTypeId, printEJS }, - occupancyTypeResponseHandler + contractTypeResponseHandler ) } @@ -708,9 +703,9 @@ type ResponseJSON = function renderContractTypePrints( panelElement: HTMLElement, contractTypeId: number, - ContractTypePrints: string[] + contractTypePrints: string[] ): void { - if (ContractTypePrints.length === 0) { + if (contractTypePrints.length === 0) { panelElement.insertAdjacentHTML( 'beforeend', `
@@ -720,17 +715,17 @@ type ResponseJSON =
` ) } else { - for (const printEJS of ContractTypePrints) { + for (const printEJS of contractTypePrints) { const panelBlockElement = document.createElement('div') panelBlockElement.className = - 'panel-block is-block container--occupancyTypePrint' + 'panel-block is-block container--contractTypePrint' panelBlockElement.dataset.printEJS = printEJS const printTitle = printEJS === '*' ? '(All Available Prints)' - : ((exports.occupancyTypePrintTitles as string[])[ + : ((exports.contractTypePrintTitles as string[])[ printEJS ] as string) @@ -755,12 +750,12 @@ type ResponseJSON =
${los.getMoveUpDownButtonFieldHTML( - 'button--moveOccupancyTypePrintUp', - 'button--moveOccupancyTypePrintDown' + 'button--moveContractTypePrintUp', + 'button--moveContractTypePrintDown' )}
-
@@ -768,37 +763,36 @@ type ResponseJSON =
` ;( panelBlockElement.querySelector( - '.button--moveOccupancyTypePrintUp' + '.button--moveContractTypePrintUp' ) as HTMLButtonElement - ).addEventListener('click', moveOccupancyTypePrint) + ).addEventListener('click', moveContractTypePrint) ;( panelBlockElement.querySelector( - '.button--moveOccupancyTypePrintDown' + '.button--moveContractTypePrintDown' ) as HTMLButtonElement - ).addEventListener('click', moveOccupancyTypePrint) + ).addEventListener('click', moveContractTypePrint) panelBlockElement - .querySelector('.button--deleteOccupancyTypePrint') - ?.addEventListener('click', deleteOccupancyTypePrint) + .querySelector('.button--deleteContractTypePrint') + ?.addEventListener('click', deleteContractTypePrint) panelElement.append(panelBlockElement) } } } - function renderOccupancyTypes(): void { - // eslint-disable-next-line no-unsanitized/property - occupancyTypesContainerElement.innerHTML = `
+ function renderContractTypes(): void { + contractTypesContainerElement.innerHTML = `
-

(All ${los.escapedAliases.Occupancy} Types)

+

(All Contract Types)

- @@ -808,92 +802,90 @@ type ResponseJSON =
` - ContractTypePrintsContainerElement.innerHTML = '' + contractTypePrintsContainerElement.innerHTML = '' renderContractTypeFields( - occupancyTypesContainerElement.querySelector( + contractTypesContainerElement.querySelector( '#container--allContractTypeFields' ) as HTMLElement, undefined, allContractTypeFields ) - occupancyTypesContainerElement - .querySelector('.button--addOccupancyTypeField') - ?.addEventListener('click', openAddOccupancyTypeField) + contractTypesContainerElement + .querySelector('.button--addContractTypeField') + ?.addEventListener('click', openAddContractTypeField) - if (occupancyTypes.length === 0) { - // eslint-disable-next-line no-unsanitized/method - occupancyTypesContainerElement.insertAdjacentHTML( + if (contractTypes.length === 0) { + contractTypesContainerElement.insertAdjacentHTML( 'afterbegin', `
There are no active ${los.escapedAliases.occupancy} types.

+

There are no active contract types.

` ) - // eslint-disable-next-line no-unsanitized/method - ContractTypePrintsContainerElement.insertAdjacentHTML( + contractTypePrintsContainerElement.insertAdjacentHTML( 'afterbegin', `
There are no active ${los.escapedAliases.occupancy} types.

+

There are no active contract types.

` ) return } - for (const occupancyType of occupancyTypes) { + for (const contractType of contractTypes) { /* * Types and Fields */ - const occupancyTypeContainer = document.createElement('div') + const contractTypeContainer = document.createElement('div') - occupancyTypeContainer.className = 'panel container--occupancyType' + contractTypeContainer.className = 'panel container--contractType' - occupancyTypeContainer.dataset.contractTypeId = - occupancyType.contractTypeId.toString() + contractTypeContainer.dataset.contractTypeId = + contractType.contractTypeId.toString() // eslint-disable-next-line no-unsanitized/property - occupancyTypeContainer.innerHTML = `
+ contractTypeContainer.innerHTML = `
-

${cityssm.escapeHTML(occupancyType.occupancyType)}

+

${cityssm.escapeHTML(contractType.contractType)}

-
-
-
${los.getMoveUpDownButtonFieldHTML( - 'button--moveOccupancyTypeUp', - 'button--moveOccupancyTypeDown' + 'button--moveContractTypeUp', + 'button--moveContractTypeDown' )}
@@ -901,61 +893,61 @@ type ResponseJSON =
` renderContractTypeFields( - occupancyTypeContainer, - occupancyType.contractTypeId, - occupancyType.ContractTypeFields ?? [] + contractTypeContainer, + contractType.contractTypeId, + contractType.contractTypeFields ?? [] ) - occupancyTypeContainer + contractTypeContainer .querySelector('.button--toggleContractTypeFields') ?.addEventListener('click', toggleContractTypeFields) - occupancyTypeContainer - .querySelector('.button--deleteOccupancyType') - ?.addEventListener('click', deleteOccupancyType) + contractTypeContainer + .querySelector('.button--deleteContractType') + ?.addEventListener('click', deleteContractType) - occupancyTypeContainer - .querySelector('.button--editOccupancyType') - ?.addEventListener('click', openEditOccupancyType) + contractTypeContainer + .querySelector('.button--editContractType') + ?.addEventListener('click', openEditContractType) - occupancyTypeContainer - .querySelector('.button--addOccupancyTypeField') - ?.addEventListener('click', openAddOccupancyTypeField) + contractTypeContainer + .querySelector('.button--addContractTypeField') + ?.addEventListener('click', openAddContractTypeField) ;( - occupancyTypeContainer.querySelector( - '.button--moveOccupancyTypeUp' + contractTypeContainer.querySelector( + '.button--moveContractTypeUp' ) as HTMLButtonElement - ).addEventListener('click', moveOccupancyType) + ).addEventListener('click', moveContractType) ;( - occupancyTypeContainer.querySelector( - '.button--moveOccupancyTypeDown' + contractTypeContainer.querySelector( + '.button--moveContractTypeDown' ) as HTMLButtonElement - ).addEventListener('click', moveOccupancyType) + ).addEventListener('click', moveContractType) - occupancyTypesContainerElement.append(occupancyTypeContainer) + contractTypesContainerElement.append(contractTypeContainer) /* * Prints */ - const occupancyTypePrintContainer = document.createElement('div') + const contractTypePrintContainer = document.createElement('div') - occupancyTypePrintContainer.className = - 'panel container--occupancyTypePrintList' + contractTypePrintContainer.className = + 'panel container--contractTypePrintList' - occupancyTypePrintContainer.dataset.contractTypeId = - occupancyType.contractTypeId.toString() + contractTypePrintContainer.dataset.contractTypeId = + contractType.contractTypeId.toString() - occupancyTypePrintContainer.innerHTML = `
+ contractTypePrintContainer.innerHTML = `
-

${cityssm.escapeHTML(occupancyType.occupancyType)}

+

${cityssm.escapeHTML(contractType.contractType)}

- @@ -965,21 +957,21 @@ type ResponseJSON =
` renderContractTypePrints( - occupancyTypePrintContainer, - occupancyType.contractTypeId, - occupancyType.ContractTypePrints ?? [] + contractTypePrintContainer, + contractType.contractTypeId, + contractType.contractTypePrints ?? [] ) - occupancyTypePrintContainer - .querySelector('.button--addOccupancyTypePrint') - ?.addEventListener('click', openAddOccupancyTypePrint) + contractTypePrintContainer + .querySelector('.button--addContractTypePrint') + ?.addEventListener('click', openAddContractTypePrint) - ContractTypePrintsContainerElement.append(occupancyTypePrintContainer) + contractTypePrintsContainerElement.append(contractTypePrintContainer) } } document - .querySelector('#button--addOccupancyType') + .querySelector('#button--addContractType') ?.addEventListener('click', () => { let addCloseModalFunction: () => void @@ -994,11 +986,11 @@ type ResponseJSON = if (responseJSON.success) { addCloseModalFunction() - occupancyTypes = responseJSON.occupancyTypes - renderOccupancyTypes() + contractTypes = responseJSON.contractTypes + renderContractTypes() } else { bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Occupancy} Type`, + title: `Error Adding Contract Type`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) @@ -1007,7 +999,7 @@ type ResponseJSON = ) } - cityssm.openHtmlModal('adminOccupancyTypes-addOccupancyType', { + cityssm.openHtmlModal('adminContractTypes-add', { onshow(modalElement) { los.populateAliases(modalElement) }, @@ -1015,7 +1007,7 @@ type ResponseJSON = addCloseModalFunction = closeModalFunction ;( modalElement.querySelector( - '#occupancyTypeAdd--occupancyType' + '#contractTypeAdd--contractType' ) as HTMLInputElement ).focus() @@ -1029,5 +1021,5 @@ type ResponseJSON = }) }) - renderOccupancyTypes() + renderContractTypes() })() diff --git a/public/javascripts/dashboard.js b/public/javascripts/dashboard.js index 8fb9fdf3..f073d194 100644 --- a/public/javascripts/dashboard.js +++ b/public/javascripts/dashboard.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const workOrderNumberCircleElements = document.querySelectorAll('.fa-circle[data-work-order-number]'); for (const workOrderNumberCircleElement of workOrderNumberCircleElements) { workOrderNumberCircleElement.style.color = los.getRandomColor(workOrderNumberCircleElement.dataset.workOrderNumber ?? ''); diff --git a/public/javascripts/dashboard.ts b/public/javascripts/dashboard.ts index aa25e63a..96b4e044 100644 --- a/public/javascripts/dashboard.ts +++ b/public/javascripts/dashboard.ts @@ -2,7 +2,7 @@ import type { LOS } from '../../types/globalTypes.js' declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const workOrderNumberCircleElements: NodeListOf = document.querySelectorAll('.fa-circle[data-work-order-number]') diff --git a/public/javascripts/database.admin.js b/public/javascripts/database.admin.js index 29220e32..1d9ee699 100644 --- a/public/javascripts/database.admin.js +++ b/public/javascripts/database.admin.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; function doBackup() { cityssm.postJSON(`${los.urlPrefix}/admin/doBackupDatabase`, {}, (rawResponseJSON) => { const responseJSON = rawResponseJSON; diff --git a/public/javascripts/database.admin.ts b/public/javascripts/database.admin.ts index 8115f8c6..bee2872f 100644 --- a/public/javascripts/database.admin.ts +++ b/public/javascripts/database.admin.ts @@ -8,7 +8,7 @@ declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS function doBackup(): void { cityssm.postJSON( diff --git a/public/javascripts/fees.admin.js b/public/javascripts/fees.admin.js index 9daae9f7..63baafcf 100644 --- a/public/javascripts/fees.admin.js +++ b/public/javascripts/fees.admin.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const feeCategoriesContainerElement = document.querySelector('#container--feeCategories'); let feeCategories = exports.feeCategories; delete exports.feeCategories; @@ -108,7 +108,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ? '' : ` - ${cityssm.escapeHTML(fee.occupancyType ?? '')} + ${cityssm.escapeHTML(fee.contractType ?? '')} `} ${(fee.burialSiteTypeId ?? -1) === -1 ? '' @@ -344,12 +344,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); } feeCategoryElement.append(optionElement); } - const occupancyTypeElement = modalElement.querySelector('#feeAdd--contractTypeId'); - for (const occupancyType of exports.occupancyTypes) { + const contractTypeElement = modalElement.querySelector('#feeAdd--contractTypeId'); + for (const contractType of exports.contractTypes) { const optionElement = document.createElement('option'); - optionElement.value = occupancyType.contractTypeId.toString(); - optionElement.textContent = occupancyType.occupancyType; - occupancyTypeElement.append(optionElement); + optionElement.value = contractType.contractTypeId.toString(); + optionElement.textContent = contractType.contractType; + contractTypeElement.append(optionElement); } const lotTypeElement = modalElement.querySelector('#feeAdd--burialSiteTypeId'); for (const lotType of exports.lotTypes) { @@ -566,15 +566,15 @@ Object.defineProperty(exports, "__esModule", { value: true }); modalElement.querySelector('#feeEdit--feeName').value = fee.feeName ?? ''; modalElement.querySelector('#feeEdit--feeAccount').value = fee.feeAccount ?? ''; modalElement.querySelector('#feeEdit--feeDescription').value = fee.feeDescription ?? ''; - const occupancyTypeElement = modalElement.querySelector('#feeEdit--contractTypeId'); - for (const occupancyType of exports.occupancyTypes) { + const contractTypeElement = modalElement.querySelector('#feeEdit--contractTypeId'); + for (const contractType of exports.contractTypes) { const optionElement = document.createElement('option'); - optionElement.value = occupancyType.contractTypeId.toString(); - optionElement.textContent = occupancyType.occupancyType; - if (occupancyType.contractTypeId === fee.contractTypeId) { + optionElement.value = contractType.contractTypeId.toString(); + optionElement.textContent = contractType.contractType; + if (contractType.contractTypeId === fee.contractTypeId) { optionElement.selected = true; } - occupancyTypeElement.append(optionElement); + contractTypeElement.append(optionElement); } const lotTypeElement = modalElement.querySelector('#feeEdit--burialSiteTypeId'); for (const lotType of exports.lotTypes) { diff --git a/public/javascripts/fees.admin.ts b/public/javascripts/fees.admin.ts index a039527a..a79bdbe4 100644 --- a/public/javascripts/fees.admin.ts +++ b/public/javascripts/fees.admin.ts @@ -6,7 +6,7 @@ import type { Fee, FeeCategory, LotType, - OccupancyType + ContractType } from '../../types/recordTypes.js' declare const cityssm: cityssmGlobal @@ -14,7 +14,7 @@ declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const feeCategoriesContainerElement = document.querySelector( '#container--feeCategories' @@ -172,7 +172,7 @@ declare const exports: Record ? '' : ` - ${cityssm.escapeHTML(fee.occupancyType ?? '')} + ${cityssm.escapeHTML(fee.contractType ?? '')} ` } ${ @@ -542,15 +542,15 @@ declare const exports: Record feeCategoryElement.append(optionElement) } - const occupancyTypeElement = modalElement.querySelector( + const contractTypeElement = modalElement.querySelector( '#feeAdd--contractTypeId' ) as HTMLSelectElement - for (const occupancyType of exports.occupancyTypes as OccupancyType[]) { + for (const contractType of exports.contractTypes as ContractType[]) { const optionElement = document.createElement('option') - optionElement.value = occupancyType.contractTypeId.toString() - optionElement.textContent = occupancyType.occupancyType - occupancyTypeElement.append(optionElement) + optionElement.value = contractType.contractTypeId.toString() + optionElement.textContent = contractType.contractType + contractTypeElement.append(optionElement) } const lotTypeElement = modalElement.querySelector( @@ -906,20 +906,20 @@ declare const exports: Record ) as HTMLTextAreaElement ).value = fee.feeDescription ?? '' - const occupancyTypeElement = modalElement.querySelector( + const contractTypeElement = modalElement.querySelector( '#feeEdit--contractTypeId' ) as HTMLSelectElement - for (const occupancyType of exports.occupancyTypes as OccupancyType[]) { + for (const contractType of exports.contractTypes as ContractType[]) { const optionElement = document.createElement('option') - optionElement.value = occupancyType.contractTypeId.toString() - optionElement.textContent = occupancyType.occupancyType + optionElement.value = contractType.contractTypeId.toString() + optionElement.textContent = contractType.contractType - if (occupancyType.contractTypeId === fee.contractTypeId) { + if (contractType.contractTypeId === fee.contractTypeId) { optionElement.selected = true } - occupancyTypeElement.append(optionElement) + contractTypeElement.append(optionElement) } const lotTypeElement = modalElement.querySelector( diff --git a/public/javascripts/funeralHome.edit.d.ts b/public/javascripts/funeralHome.edit.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/funeralHome.edit.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/funeralHome.edit.js b/public/javascripts/funeralHome.edit.js new file mode 100644 index 00000000..8ac323c7 --- /dev/null +++ b/public/javascripts/funeralHome.edit.js @@ -0,0 +1,81 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const funeralHomeId = document.querySelector('#funeralHome--funeralHomeId').value; + const isCreate = funeralHomeId === ''; + const funeralHomeForm = document.querySelector('#form--funeralHome'); + function setUnsavedChanges() { + sunrise.setUnsavedChanges(); + document + .querySelector("button[type='submit'][form='form--funeralHome']") + ?.classList.remove('is-light'); + } + function clearUnsavedChanges() { + sunrise.clearUnsavedChanges(); + document + .querySelector("button[type='submit'][form='form--funeralHome']") + ?.classList.add('is-light'); + } + function updateFuneralHome(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/funeralHomes/${isCreate ? 'doCreateFuneralHome' : 'doUpdateFuneralHome'}`, funeralHomeForm, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + clearUnsavedChanges(); + if (isCreate) { + globalThis.location.href = sunrise.getFuneralHomeURL(responseJSON.funeralHomeId, true); + } + else { + bulmaJS.alert({ + message: `Funeral Home Updated Successfully`, + contextualColorName: 'success' + }); + } + } + else { + bulmaJS.alert({ + title: `Error Updating Funeral Home`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + funeralHomeForm.addEventListener('submit', updateFuneralHome); + const inputElements = funeralHomeForm.querySelectorAll('input, select'); + for (const inputElement of inputElements) { + inputElement.addEventListener('change', setUnsavedChanges); + } + document + .querySelector('#button--deleteFuneralHome') + ?.addEventListener('click', (clickEvent) => { + clickEvent.preventDefault(); + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/funeralHomes/doDeleteFuneralHome`, { + funeralHomeId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + globalThis.location.href = sunrise.getFuneralHomeURL(); + } + else { + bulmaJS.alert({ + title: `Error Deleting Funeral Home`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: `Delete Funeral Home`, + message: `Are you sure you want to delete this funeral home?`, + contextualColorName: 'warning', + okButton: { + text: `Yes, Delete Funeral Home`, + callbackFunction: doDelete + } + }); + }); +})(); diff --git a/public/javascripts/funeralHome.edit.ts b/public/javascripts/funeralHome.edit.ts new file mode 100644 index 00000000..88e6b4f1 --- /dev/null +++ b/public/javascripts/funeralHome.edit.ts @@ -0,0 +1,123 @@ +import type { BulmaJS } from '@cityssm/bulma-js/types.js' +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { Sunrise } from './types.js' + +declare const cityssm: cityssmGlobal +declare const bulmaJS: BulmaJS + +declare const exports: Record +;(() => { + const sunrise = exports.sunrise as Sunrise + + const funeralHomeId = ( + document.querySelector('#funeralHome--funeralHomeId') as HTMLInputElement + ).value + const isCreate = funeralHomeId === '' + + const funeralHomeForm = document.querySelector( + '#form--funeralHome' + ) as HTMLFormElement + + function setUnsavedChanges(): void { + sunrise.setUnsavedChanges() + document + .querySelector("button[type='submit'][form='form--funeralHome']") + ?.classList.remove('is-light') + } + + function clearUnsavedChanges(): void { + sunrise.clearUnsavedChanges() + document + .querySelector("button[type='submit'][form='form--funeralHome']") + ?.classList.add('is-light') + } + + function updateFuneralHome(formEvent: SubmitEvent): void { + formEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/funeralHomes/${isCreate ? 'doCreateFuneralHome' : 'doUpdateFuneralHome'}`, + funeralHomeForm, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + funeralHomeId?: number + errorMessage?: string + } + + if (responseJSON.success) { + clearUnsavedChanges() + + if (isCreate) { + globalThis.location.href = sunrise.getFuneralHomeURL( + responseJSON.funeralHomeId, + true + ) + } else { + bulmaJS.alert({ + message: `Funeral Home Updated Successfully`, + contextualColorName: 'success' + }) + } + } else { + bulmaJS.alert({ + title: `Error Updating Funeral Home`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + funeralHomeForm.addEventListener('submit', updateFuneralHome) + + const inputElements: NodeListOf = + funeralHomeForm.querySelectorAll('input, select') + + for (const inputElement of inputElements) { + inputElement.addEventListener('change', setUnsavedChanges) + } + + document + .querySelector('#button--deleteFuneralHome') + ?.addEventListener('click', (clickEvent) => { + clickEvent.preventDefault() + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/funeralHomes/doDeleteFuneralHome`, + { + funeralHomeId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + } + + if (responseJSON.success) { + globalThis.location.href = sunrise.getFuneralHomeURL() + } else { + bulmaJS.alert({ + title: `Error Deleting Funeral Home`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: `Delete Funeral Home`, + message: `Are you sure you want to delete this funeral home?`, + contextualColorName: 'warning', + okButton: { + text: `Yes, Delete Funeral Home`, + callbackFunction: doDelete + } + }) + }) +})() diff --git a/public/javascripts/funeralHome.search.d.ts b/public/javascripts/funeralHome.search.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/funeralHome.search.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/funeralHome.search.js b/public/javascripts/funeralHome.search.js new file mode 100644 index 00000000..75ec79b0 --- /dev/null +++ b/public/javascripts/funeralHome.search.js @@ -0,0 +1,82 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const funeralHomes = exports.funeralHomes; + const searchFilterElement = document.querySelector('#searchFilter--funeralHome'); + const searchResultsContainerElement = document.querySelector('#container--searchResults'); + // eslint-disable-next-line complexity + function renderResults() { + // eslint-disable-next-line no-unsanitized/property + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML(`Loading Funeral Homes...`); + let searchResultCount = 0; + const searchResultsTbodyElement = document.createElement('tbody'); + const filterStringSplit = searchFilterElement.value + .trim() + .toLowerCase() + .split(' '); + for (const funeralHome of funeralHomes) { + const searchString = `${funeralHome.funeralHomeName ?? ''} ${funeralHome.funeralHomeAddress1 ?? ''} ${funeralHome.funeralHomeAddress2 ?? ''}`.toLowerCase(); + let showRecord = true; + for (const filterStringPiece of filterStringSplit) { + if (!searchString.includes(filterStringPiece)) { + showRecord = false; + break; + } + } + if (!showRecord) { + continue; + } + searchResultCount += 1; + // eslint-disable-next-line no-unsanitized/method + searchResultsTbodyElement.insertAdjacentHTML('beforeend', `
 + + `); + } + searchResultsContainerElement.innerHTML = ''; + if (searchResultCount === 0) { + searchResultsContainerElement.innerHTML = `
+

There are no funeral homes that meet the search criteria.

+
`; + } + else { + const searchResultsTableElement = document.createElement('table'); + searchResultsTableElement.className = + 'table is-fullwidth is-striped is-hoverable has-sticky-header'; + searchResultsTableElement.innerHTML = ` + + + + `; + searchResultsTableElement.append(searchResultsTbodyElement); + searchResultsContainerElement.append(searchResultsTableElement); + } + } + searchFilterElement.addEventListener('keyup', renderResults); + document + .querySelector('#form--searchFilters') + ?.addEventListener('submit', (formEvent) => { + formEvent.preventDefault(); + renderResults(); + }); + renderResults(); +})(); diff --git a/public/javascripts/funeralHome.search.ts b/public/javascripts/funeralHome.search.ts new file mode 100644 index 00000000..da1330c8 --- /dev/null +++ b/public/javascripts/funeralHome.search.ts @@ -0,0 +1,128 @@ +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { FuneralHome } from '../../types/recordTypes.js' + +import type { Sunrise } from './types.js' + +declare const cityssm: cityssmGlobal + +declare const exports: Record +;(() => { + const sunrise = exports.sunrise as Sunrise + + const funeralHomes = exports.funeralHomes as FuneralHome[] + + const searchFilterElement = document.querySelector( + '#searchFilter--funeralHome' + ) as HTMLInputElement + + const searchResultsContainerElement = document.querySelector( + '#container--searchResults' + ) as HTMLElement + + // eslint-disable-next-line complexity + function renderResults(): void { + // eslint-disable-next-line no-unsanitized/property + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( + `Loading Funeral Homes...` + ) + + let searchResultCount = 0 + const searchResultsTbodyElement = document.createElement('tbody') + + const filterStringSplit = searchFilterElement.value + .trim() + .toLowerCase() + .split(' ') + + for (const funeralHome of funeralHomes) { + const searchString = `${funeralHome.funeralHomeName ?? ''} ${funeralHome.funeralHomeAddress1 ?? ''} ${funeralHome.funeralHomeAddress2 ?? ''}`.toLowerCase() + + let showRecord = true + + for (const filterStringPiece of filterStringSplit) { + if (!searchString.includes(filterStringPiece)) { + showRecord = false + break + } + } + + if (!showRecord) { + continue + } + + searchResultCount += 1 + + // eslint-disable-next-line no-unsanitized/method + searchResultsTbodyElement.insertAdjacentHTML( + 'beforeend', + ` + + ` + ) + } + + searchResultsContainerElement.innerHTML = '' + + if (searchResultCount === 0) { + searchResultsContainerElement.innerHTML = `
+

There are no funeral homes that meet the search criteria.

+
` + } else { + const searchResultsTableElement = document.createElement('table') + + searchResultsTableElement.className = + 'table is-fullwidth is-striped is-hoverable has-sticky-header' + + searchResultsTableElement.innerHTML = ` + + + + ` + + searchResultsTableElement.append(searchResultsTbodyElement) + + searchResultsContainerElement.append(searchResultsTableElement) + } + } + + searchFilterElement.addEventListener('keyup', renderResults) + + document + .querySelector('#form--searchFilters') + ?.addEventListener('submit', (formEvent) => { + formEvent.preventDefault() + renderResults() + }) + + renderResults() +})() diff --git a/public/javascripts/main.js b/public/javascripts/main.js index 998e14cc..1782fa41 100644 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -251,6 +251,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); function getCemeteryURL(cemeteryId = '', edit = false, time = false) { return getRecordURL('cemeteries', cemeteryId, edit, time); } + function getFuneralHomeURL(funeralHomeId = '', edit = false, time = false) { + return getRecordURL('funeralHomes', funeralHomeId, edit, time); + } function getBurialSiteURL(burialSiteId = '', edit = false, time = false) { return getRecordURL('burialSites', burialSiteId, edit, time); } @@ -265,9 +268,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); */ const dynamicsGPIntegrationIsEnabled = exports.dynamicsGPIntegrationIsEnabled; /* - * Declare LOS + * Declare sunrise */ - const los = { + const sunrise = { urlPrefix, apiKey: document.querySelector('main')?.dataset.apiKey ?? '', dynamicsGPIntegrationIsEnabled, @@ -285,8 +288,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); getSearchResultsPagerHTML, getCemeteryURL, getBurialSiteURL, + getFuneralHomeURL, getContractURL, getWorkOrderURL }; - exports.los = los; + exports.sunrise = sunrise; })(); diff --git a/public/javascripts/main.ts b/public/javascripts/main.ts index 2d9d8152..7662206f 100644 --- a/public/javascripts/main.ts +++ b/public/javascripts/main.ts @@ -2,7 +2,7 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { Options as BulmaCalendarOptions } from 'bulma-calendar' -import type { LOS } from './types.js' +import type { Sunrise } from './types.js' type RandomColorHue = | 'red' @@ -372,7 +372,12 @@ declare const exports: Record & { const urlPrefix = document.querySelector('main')?.dataset.urlPrefix ?? '' function getRecordURL( - recordTypePlural: 'cemeteries' | 'burialSites' | 'contracts' | 'workOrders', + recordTypePlural: + | 'cemeteries' + | 'burialSites' + | 'funeralHomes' + | 'contracts' + | 'workOrders', recordId: number | string, edit: boolean, time: boolean @@ -395,6 +400,14 @@ declare const exports: Record & { return getRecordURL('cemeteries', cemeteryId, edit, time) } + function getFuneralHomeURL( + funeralHomeId: number | string = '', + edit = false, + time = false + ): string { + return getRecordURL('funeralHomes', funeralHomeId, edit, time) + } + function getBurialSiteURL( burialSiteId: number | string = '', edit = false, @@ -427,10 +440,10 @@ declare const exports: Record & { exports.dynamicsGPIntegrationIsEnabled as boolean /* - * Declare LOS + * Declare sunrise */ - const los: LOS = { + const sunrise: Sunrise = { urlPrefix, apiKey: document.querySelector('main')?.dataset.apiKey ?? '', dynamicsGPIntegrationIsEnabled, @@ -453,9 +466,10 @@ declare const exports: Record & { getCemeteryURL, getBurialSiteURL, + getFuneralHomeURL, getContractURL, getWorkOrderURL } - exports.los = los + exports.sunrise = sunrise })() diff --git a/public/javascripts/tables.admin.js b/public/javascripts/tables.admin.js index 9e40ee02..ec2e0b57 100644 --- a/public/javascripts/tables.admin.js +++ b/public/javascripts/tables.admin.js @@ -1,123 +1,115 @@ "use strict"; +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable max-lines */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; - function refreshFontAwesomeIcon(changeEvent) { - const inputElement = changeEvent.currentTarget; - const fontAwesomeIconClass = inputElement.value; - (inputElement - .closest('.field') - ?.querySelectorAll('.button.is-static'))[1].innerHTML = - ``; - } + const sunrise = exports.sunrise; /** * Work Order Types */ - ; - (() => { - let workOrderTypes = exports.workOrderTypes; - delete exports.workOrderTypes; - function updateWorkOrderType(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateWorkOrderType`, submitEvent.currentTarget, (rawResponseJSON) => { + let workOrderTypes = exports.workOrderTypes; + delete exports.workOrderTypes; + function updateWorkOrderType(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doUpdateWorkOrderType`, submitEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderTypes = responseJSON.workOrderTypes; + bulmaJS.alert({ + message: 'Work Order Type Updated Successfully', + contextualColorName: 'success' + }); + } + else { + bulmaJS.alert({ + title: 'Error Updating Work Order Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + function deleteWorkOrderType(clickEvent) { + const tableRowElement = clickEvent.currentTarget.closest('tr'); + const workOrderTypeId = tableRowElement.dataset.workOrderTypeId; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doDeleteWorkOrderType`, { + workOrderTypeId + }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { workOrderTypes = responseJSON.workOrderTypes; + if (workOrderTypes.length === 0) { + renderWorkOrderTypes(); + } + else { + tableRowElement.remove(); + } bulmaJS.alert({ - message: 'Work Order Type Updated Successfully', + message: 'Work Order Type Deleted Successfully', contextualColorName: 'success' }); } else { bulmaJS.alert({ - title: 'Error Updating Work Order Type', + title: 'Error Deleting Work Order Type', message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); } }); } - function deleteWorkOrderType(clickEvent) { - const tableRowElement = clickEvent.currentTarget.closest('tr'); - const workOrderTypeId = tableRowElement.dataset.workOrderTypeId; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteWorkOrderType`, { - workOrderTypeId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderTypes = responseJSON.workOrderTypes; - if (workOrderTypes.length === 0) { - renderWorkOrderTypes(); - } - else { - tableRowElement.remove(); - } - bulmaJS.alert({ - message: 'Work Order Type Deleted Successfully', - contextualColorName: 'success' - }); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Work Order Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } + bulmaJS.confirm({ + title: 'Delete Work Order Type', + message: `Are you sure you want to delete this work order type?
+ Note that no work orders will be removed.`, + messageIsHtml: true, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Work Order Type', + callbackFunction: doDelete + } + }); + } + function moveWorkOrderType(clickEvent) { + const buttonElement = clickEvent.currentTarget; + const tableRowElement = buttonElement.closest('tr'); + const workOrderTypeId = tableRowElement.dataset.workOrderTypeId; + cityssm.postJSON(`${sunrise.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' + ? 'doMoveWorkOrderTypeUp' + : 'doMoveWorkOrderTypeDown'}`, { + workOrderTypeId, + moveToEnd: clickEvent.shiftKey ? '1' : '0' + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderTypes = responseJSON.workOrderTypes; + renderWorkOrderTypes(); + } + else { + bulmaJS.alert({ + title: 'Error Moving Work Order Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' }); } - bulmaJS.confirm({ - title: 'Delete Work Order Type', - message: `Are you sure you want to delete this work order type?
- Note that no work orders will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Work Order Type', - callbackFunction: doDelete - } - }); - } - function moveWorkOrderType(clickEvent) { - const buttonElement = clickEvent.currentTarget; - const tableRowElement = buttonElement.closest('tr'); - const workOrderTypeId = tableRowElement.dataset.workOrderTypeId; - cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' - ? 'doMoveWorkOrderTypeUp' - : 'doMoveWorkOrderTypeDown'}`, { - workOrderTypeId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderTypes = responseJSON.workOrderTypes; - renderWorkOrderTypes(); - } - else { - bulmaJS.alert({ - title: 'Error Moving Work Order Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function renderWorkOrderTypes() { - const containerElement = document.querySelector('#container--workOrderTypes'); - if (workOrderTypes.length === 0) { - containerElement.innerHTML = ``; - return; - } - containerElement.innerHTML = ''; - for (const workOrderType of workOrderTypes) { - const tableRowElement = document.createElement('tr'); - tableRowElement.dataset.workOrderTypeId = - workOrderType.workOrderTypeId.toString(); - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ``; - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateWorkOrderType); - tableRowElement.querySelector('.button--moveWorkOrderTypeUp').addEventListener('click', moveWorkOrderType); - tableRowElement.querySelector('.button--moveWorkOrderTypeDown').addEventListener('click', moveWorkOrderType); - tableRowElement - .querySelector('.button--deleteWorkOrderType') - ?.addEventListener('click', deleteWorkOrderType); - containerElement.append(tableRowElement); - } + tableRowElement + .querySelector('form') + ?.addEventListener('submit', updateWorkOrderType); + tableRowElement.querySelector('.button--moveWorkOrderTypeUp').addEventListener('click', moveWorkOrderType); + tableRowElement.querySelector('.button--moveWorkOrderTypeDown').addEventListener('click', moveWorkOrderType); + tableRowElement + .querySelector('.button--deleteWorkOrderType') + ?.addEventListener('click', deleteWorkOrderType); + containerElement.append(tableRowElement); } - ; - document.querySelector('#form--addWorkOrderType').addEventListener('submit', (submitEvent) => { - submitEvent.preventDefault(); - const formElement = submitEvent.currentTarget; - cityssm.postJSON(`${los.urlPrefix}/admin/doAddWorkOrderType`, formElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderTypes = responseJSON.workOrderTypes; - renderWorkOrderTypes(); - formElement.reset(); - formElement.querySelector('input')?.focus(); - } - else { - bulmaJS.alert({ - title: 'Error Adding Work Order Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); + } + ; + document.querySelector('#form--addWorkOrderType').addEventListener('submit', (submitEvent) => { + submitEvent.preventDefault(); + const formElement = submitEvent.currentTarget; + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doAddWorkOrderType`, formElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderTypes = responseJSON.workOrderTypes; + renderWorkOrderTypes(); + formElement.reset(); + formElement.querySelector('input')?.focus(); + } + else { + bulmaJS.alert({ + title: 'Error Adding Work Order Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } }); - renderWorkOrderTypes(); - })(); - (() => { - let workOrderMilestoneTypes = exports.workOrderMilestoneTypes; - delete exports.workOrderMilestoneTypes; - function updateWorkOrderMilestoneType(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateWorkOrderMilestoneType`, submitEvent.currentTarget, (rawResponseJSON) => { + }); + renderWorkOrderTypes(); + /** + * Work Order Milestone Types + */ + let workOrderMilestoneTypes = exports.workOrderMilestoneTypes; + delete exports.workOrderMilestoneTypes; + function updateWorkOrderMilestoneType(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doUpdateWorkOrderMilestoneType`, submitEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; + bulmaJS.alert({ + message: 'Work Order Milestone Type Updated Successfully', + contextualColorName: 'success' + }); + } + else { + bulmaJS.alert({ + title: 'Error Updating Work Order Milestone Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + function deleteWorkOrderMilestoneType(clickEvent) { + const tableRowElement = clickEvent.currentTarget.closest('tr'); + const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doDeleteWorkOrderMilestoneType`, { + workOrderMilestoneTypeId + }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; + if (workOrderMilestoneTypes.length === 0) { + renderWorkOrderMilestoneTypes(); + } + else { + tableRowElement.remove(); + } bulmaJS.alert({ - message: 'Work Order Milestone Type Updated Successfully', + message: 'Work Order Milestone Type Deleted Successfully', contextualColorName: 'success' }); } else { bulmaJS.alert({ - title: 'Error Updating Work Order Milestone Type', + title: 'Error Deleting Work Order Milestone Type', message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); } }); } - function deleteWorkOrderMilestoneType(clickEvent) { - const tableRowElement = clickEvent.currentTarget.closest('tr'); - const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteWorkOrderMilestoneType`, { - workOrderMilestoneTypeId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; - if (workOrderMilestoneTypes.length === 0) { - renderWorkOrderMilestoneTypes(); - } - else { - tableRowElement.remove(); - } - bulmaJS.alert({ - message: 'Work Order Milestone Type Deleted Successfully', - contextualColorName: 'success' - }); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Work Order Milestone Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } + bulmaJS.confirm({ + title: 'Delete Work Order Milestone Type', + message: `Are you sure you want to delete this work order milestone type?
+ Note that no work orders will be removed.`, + messageIsHtml: true, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Work Order Milestone Type', + callbackFunction: doDelete + } + }); + } + function moveWorkOrderMilestoneType(clickEvent) { + const buttonElement = clickEvent.currentTarget; + const tableRowElement = buttonElement.closest('tr'); + const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId; + cityssm.postJSON(`${sunrise.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' + ? 'doMoveWorkOrderMilestoneTypeUp' + : 'doMoveWorkOrderMilestoneTypeDown'}`, { + workOrderMilestoneTypeId, + moveToEnd: clickEvent.shiftKey ? '1' : '0' + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; + renderWorkOrderMilestoneTypes(); + } + else { + bulmaJS.alert({ + title: 'Error Moving Work Order Milestone Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' }); } - bulmaJS.confirm({ - title: 'Delete Work Order Milestone Type', - message: `Are you sure you want to delete this work order milestone type?
- Note that no work orders will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Work Order Milestone Type', - callbackFunction: doDelete - } - }); - } - function moveWorkOrderMilestoneType(clickEvent) { - const buttonElement = clickEvent.currentTarget; - const tableRowElement = buttonElement.closest('tr'); - const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId; - cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' - ? 'doMoveWorkOrderMilestoneTypeUp' - : 'doMoveWorkOrderMilestoneTypeDown'}`, { - workOrderMilestoneTypeId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; - renderWorkOrderMilestoneTypes(); - } - else { - bulmaJS.alert({ - title: 'Error Moving Work Order Milestone Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function renderWorkOrderMilestoneTypes() { - const containerElement = document.querySelector('#container--workOrderMilestoneTypes'); - if (workOrderMilestoneTypes.length === 0) { - containerElement.innerHTML = ``; - return; - } - containerElement.innerHTML = ''; - for (const workOrderMilestoneType of workOrderMilestoneTypes) { - const tableRowElement = document.createElement('tr'); - tableRowElement.dataset.workOrderMilestoneTypeId = - workOrderMilestoneType.workOrderMilestoneTypeId.toString(); - // eslint-disable-next-line no-unsanitized/property, no-secrets/no-secrets - tableRowElement.innerHTML = ``; - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateWorkOrderMilestoneType); - tableRowElement.querySelector('.button--moveWorkOrderMilestoneTypeUp').addEventListener('click', moveWorkOrderMilestoneType); - tableRowElement.querySelector('.button--moveWorkOrderMilestoneTypeDown').addEventListener('click', moveWorkOrderMilestoneType); - tableRowElement - .querySelector('.button--deleteWorkOrderMilestoneType') - ?.addEventListener('click', deleteWorkOrderMilestoneType); - containerElement.append(tableRowElement); - } + tableRowElement + .querySelector('form') + ?.addEventListener('submit', updateWorkOrderMilestoneType); + tableRowElement.querySelector('.button--moveWorkOrderMilestoneTypeUp').addEventListener('click', moveWorkOrderMilestoneType); + tableRowElement.querySelector('.button--moveWorkOrderMilestoneTypeDown').addEventListener('click', moveWorkOrderMilestoneType); + tableRowElement + .querySelector('.button--deleteWorkOrderMilestoneType') + ?.addEventListener('click', deleteWorkOrderMilestoneType); + containerElement.append(tableRowElement); } - ; - document.querySelector('#form--addWorkOrderMilestoneType').addEventListener('submit', (submitEvent) => { - submitEvent.preventDefault(); - const formElement = submitEvent.currentTarget; - cityssm.postJSON(`${los.urlPrefix}/admin/doAddWorkOrderMilestoneType`, formElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; - renderWorkOrderMilestoneTypes(); - formElement.reset(); - formElement.querySelector('input')?.focus(); - } - else { - bulmaJS.alert({ - title: 'Error Adding Work Order Milestone Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); + } + ; + document.querySelector('#form--addWorkOrderMilestoneType').addEventListener('submit', (submitEvent) => { + submitEvent.preventDefault(); + const formElement = submitEvent.currentTarget; + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doAddWorkOrderMilestoneType`, formElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes; + renderWorkOrderMilestoneTypes(); + formElement.reset(); + formElement.querySelector('input')?.focus(); + } + else { + bulmaJS.alert({ + title: 'Error Adding Work Order Milestone Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } }); - renderWorkOrderMilestoneTypes(); - })(); - (() => { - let lotStatuses = exports.lotStatuses; - delete exports.lotStatuses; - function updateBurialSiteStatus(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateBurialSiteStatus`, submitEvent.currentTarget, (rawResponseJSON) => { + }); + renderWorkOrderMilestoneTypes(); + /** + * Burial Site Statuses + */ + let burialSiteStatuses = exports.burialSiteStatuses; + delete exports.burialSiteStatuses; + function updateBurialSiteStatus(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doUpdateBurialSiteStatus`, submitEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + burialSiteStatuses = responseJSON.burialSiteStatuses; + bulmaJS.alert({ + message: `Burial Site Status Updated Successfully`, + contextualColorName: 'success' + }); + } + else { + bulmaJS.alert({ + title: `Error Updating Burial Site Status`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + function deleteBurialSiteStatus(clickEvent) { + const tableRowElement = clickEvent.currentTarget.closest('tr'); + const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doDeleteBurialSiteStatus`, { + burialSiteStatusId + }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses; + burialSiteStatuses = responseJSON.burialSiteStatuses; + if (burialSiteStatuses.length === 0) { + renderBurialSiteStatuses(); + } + else { + tableRowElement.remove(); + } bulmaJS.alert({ - message: `${los.escapedAliases.Lot} Status Updated Successfully`, + message: `Burial Site Status Deleted Successfully`, contextualColorName: 'success' }); } else { bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Lot} Status`, + title: `Error Deleting Burial Site Status`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }); } }); } - function deleteLotStatus(clickEvent) { - const tableRowElement = clickEvent.currentTarget.closest('tr'); - const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteBurialSiteStatus`, { - burialSiteStatusId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses; - if (lotStatuses.length === 0) { - renderLotStatuses(); - } - else { - tableRowElement.remove(); - } - bulmaJS.alert({ - message: `${los.escapedAliases.Lot} Status Deleted Successfully`, - contextualColorName: 'success' - }); - } - else { - bulmaJS.alert({ - title: `Error Deleting ${los.escapedAliases.Lot} Status`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } + bulmaJS.confirm({ + title: `Delete Burial Site Status`, + message: `Are you sure you want to delete this status?
+ Note that no burial sites will be removed.`, + messageIsHtml: true, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Status', + callbackFunction: doDelete + } + }); + } + function moveBurialSiteStatus(clickEvent) { + const buttonElement = clickEvent.currentTarget; + const tableRowElement = buttonElement.closest('tr'); + const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId; + cityssm.postJSON(`${sunrise.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' + ? 'doMoveBurialSiteStatusUp' + : 'doMoveBurialSiteStatusDown'}`, { + burialSiteStatusId, + moveToEnd: clickEvent.shiftKey ? '1' : '0' + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + burialSiteStatuses = responseJSON.burialSiteStatuses; + renderBurialSiteStatuses(); + } + else { + bulmaJS.alert({ + title: `Error Moving Burial Site Status`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' }); } - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Lot} Status`, - message: `Are you sure you want to delete this status?
- Note that no ${los.escapedAliases.lot} will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Status', - callbackFunction: doDelete - } - }); - } - function moveLotStatus(clickEvent) { - const buttonElement = clickEvent.currentTarget; - const tableRowElement = buttonElement.closest('tr'); - const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId; - cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' - ? 'doMoveBurialSiteStatusUp' - : 'doMoveBurialSiteStatusDown'}`, { - burialSiteStatusId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses; - renderLotStatuses(); - } - else { - bulmaJS.alert({ - title: `Error Moving ${los.escapedAliases.Lot} Status`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function renderLotStatuses() { - const containerElement = document.querySelector('#container--lotStatuses'); - if (lotStatuses.length === 0) { - // eslint-disable-next-line no-unsanitized/property - containerElement.innerHTML = ``; - return; - } - containerElement.innerHTML = ''; - for (const lotStatus of lotStatuses) { - const tableRowElement = document.createElement('tr'); - tableRowElement.dataset.burialSiteStatusId = lotStatus.burialSiteStatusId.toString(); - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ``; - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateBurialSiteStatus); - tableRowElement.querySelector('.button--moveLotStatusUp').addEventListener('click', moveLotStatus); - tableRowElement.querySelector('.button--moveLotStatusDown').addEventListener('click', moveLotStatus); - tableRowElement - .querySelector('.button--deleteLotStatus') - ?.addEventListener('click', deleteLotStatus); - containerElement.append(tableRowElement); + tableRowElement + .querySelector('form') + ?.addEventListener('submit', updateBurialSiteStatus); + tableRowElement.querySelector('.button--moveBurialSiteStatusUp').addEventListener('click', moveBurialSiteStatus); + tableRowElement.querySelector('.button--moveBurialSiteStatusDown').addEventListener('click', moveBurialSiteStatus); + tableRowElement + .querySelector('.button--deleteBurialSiteStatus') + ?.addEventListener('click', deleteBurialSiteStatus); + containerElement.append(tableRowElement); + } + } + ; + document.querySelector('#form--addBurialSiteStatus').addEventListener('submit', (submitEvent) => { + submitEvent.preventDefault(); + const formElement = submitEvent.currentTarget; + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doAddBurialSiteStatus`, formElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + burialSiteStatuses = responseJSON.burialSiteStatuses; + renderBurialSiteStatuses(); + formElement.reset(); + formElement.querySelector('input')?.focus(); } - } - ; - document.querySelector('#form--addBurialSiteStatus').addEventListener('submit', (submitEvent) => { - submitEvent.preventDefault(); - const formElement = submitEvent.currentTarget; - cityssm.postJSON(`${los.urlPrefix}/admin/doAddBurialSiteStatus`, formElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses; - renderLotStatuses(); - formElement.reset(); - formElement.querySelector('input')?.focus(); - } - else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Lot} Status`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - }); - renderLotStatuses(); - })(); - (() => { - let lotOccupantTypes = exports.lotOccupantTypes; - delete exports.lotOccupantTypes; - function updateBurialSiteOccupantType(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateBurialSiteOccupantType`, submitEvent.currentTarget, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes; - bulmaJS.alert({ - message: `${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type Updated Successfully`, - contextualColorName: 'success' - }); - } - else { - bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function deleteLotOccupantType(clickEvent) { - const tableRowElement = clickEvent.currentTarget.closest('tr'); - const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteBurialSiteOccupantType`, { - lotOccupantTypeId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes; - if (lotOccupantTypes.length === 0) { - renderLotOccupantTypes(); - } - else { - tableRowElement.remove(); - } - bulmaJS.alert({ - message: `${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type Deleted Successfully`, - contextualColorName: 'success' - }); - } - else { - bulmaJS.alert({ - title: `Error Deleting ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } + else { + bulmaJS.alert({ + title: `Error Adding Burial Site Status`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' }); } - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: `Are you sure you want to delete this ${los.escapedAliases.lot} ${los.escapedAliases.occupant} type?
- Note that no ${los.escapedAliases.lot} ${los.escapedAliases.occupants} will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: `Yes, Delete ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - callbackFunction: doDelete - } - }); - } - function moveLotOccupantType(clickEvent) { - const buttonElement = clickEvent.currentTarget; - const tableRowElement = buttonElement.closest('tr'); - const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId; - cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' - ? 'doMoveLotOccupantTypeUp' - : 'doMoveLotOccupantTypeDown'}`, { - lotOccupantTypeId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes; - renderLotOccupantTypes(); - } - else { - bulmaJS.alert({ - title: `Error Moving ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function renderLotOccupantTypes() { - const containerElement = document.querySelector('#container--lotOccupantTypes'); - if (lotOccupantTypes.length === 0) { - // eslint-disable-next-line no-unsanitized/property - containerElement.innerHTML = ``; - return; - } - containerElement.innerHTML = ''; - for (const lotOccupantType of lotOccupantTypes) { - const tableRowElement = document.createElement('tr'); - tableRowElement.dataset.lotOccupantTypeId = - lotOccupantType.lotOccupantTypeId.toString(); - const formId = `form--lotOccupantType-${lotOccupantType.lotOccupantTypeId.toString()}`; - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ``; - const fontAwesomeInputElement = tableRowElement.querySelector("input[name='fontAwesomeIconClass']"); - fontAwesomeInputElement.addEventListener('keyup', refreshFontAwesomeIcon); - fontAwesomeInputElement.addEventListener('change', refreshFontAwesomeIcon); - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateBurialSiteOccupantType); - tableRowElement.querySelector('.button--moveLotOccupantTypeUp').addEventListener('click', moveLotOccupantType); - tableRowElement.querySelector('.button--moveLotOccupantTypeDown').addEventListener('click', moveLotOccupantType); - tableRowElement - .querySelector('.button--deleteLotOccupantType') - ?.addEventListener('click', deleteLotOccupantType); - containerElement.append(tableRowElement); - } - } - ; - document.querySelector('#form--addBurialSiteOccupantType').addEventListener('submit', (submitEvent) => { - submitEvent.preventDefault(); - const formElement = submitEvent.currentTarget; - cityssm.postJSON(`${los.urlPrefix}/admin/doAddLotOccupantType`, formElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes; - renderLotOccupantTypes(); - formElement.reset(); - formElement.querySelector('input')?.focus(); - } - else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); }); - renderLotOccupantTypes(); - })(); + }); + renderBurialSiteStatuses(); })(); diff --git a/public/javascripts/tables.admin.ts b/public/javascripts/tables.admin.ts index 9104526c..5e5e3570 100644 --- a/public/javascripts/tables.admin.ts +++ b/public/javascripts/tables.admin.ts @@ -1,71 +1,100 @@ +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable max-lines */ + import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { LOS } from '../../types/globalTypes.js' import type { - LotOccupantType, - LotStatus, + BurialSiteStatus, WorkOrderMilestoneType, WorkOrderType } from '../../types/recordTypes.js' +import type { Sunrise } from './types.js' + declare const exports: Record declare const cityssm: cityssmGlobal declare const bulmaJS: BulmaJS ;(() => { - const los = exports.los as LOS - - function refreshFontAwesomeIcon(changeEvent: Event): void { - const inputElement = changeEvent.currentTarget as HTMLInputElement - - const fontAwesomeIconClass = inputElement.value - - // eslint-disable-next-line no-unsanitized/property - ;( - inputElement - .closest('.field') - ?.querySelectorAll('.button.is-static') as NodeListOf - )[1].innerHTML = - `` - } + const sunrise = exports.sunrise as Sunrise /** * Work Order Types */ - ;(() => { - let workOrderTypes = exports.workOrderTypes as WorkOrderType[] - delete exports.workOrderTypes - type ResponseJSON = - | { - success: true - workOrderTypes: WorkOrderType[] - } - | { - success: false - errorMessage: string + let workOrderTypes = exports.workOrderTypes as WorkOrderType[] + delete exports.workOrderTypes + + type WorkOrderTypeResponseJSON = + | { + success: true + workOrderTypes: WorkOrderType[] + } + | { + success: false + errorMessage?: string + } + + function updateWorkOrderType(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/doUpdateWorkOrderType`, + submitEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as WorkOrderTypeResponseJSON + + if (responseJSON.success) { + workOrderTypes = responseJSON.workOrderTypes + + bulmaJS.alert({ + message: 'Work Order Type Updated Successfully', + contextualColorName: 'success' + }) + } else { + bulmaJS.alert({ + title: 'Error Updating Work Order Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } + } + ) + } - function updateWorkOrderType(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() + function deleteWorkOrderType(clickEvent: Event): void { + const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + ) as HTMLTableRowElement + const workOrderTypeId = tableRowElement.dataset.workOrderTypeId + + function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateWorkOrderType`, - submitEvent.currentTarget, + `${sunrise.urlPrefix}/admin/doDeleteWorkOrderType`, + { + workOrderTypeId + }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON + const responseJSON = rawResponseJSON as WorkOrderTypeResponseJSON if (responseJSON.success) { workOrderTypes = responseJSON.workOrderTypes + if (workOrderTypes.length === 0) { + renderWorkOrderTypes() + } else { + tableRowElement.remove() + } + bulmaJS.alert({ - message: 'Work Order Type Updated Successfully', + message: 'Work Order Type Deleted Successfully', contextualColorName: 'success' }) } else { bulmaJS.alert({ - title: 'Error Updating Work Order Type', + title: 'Error Deleting Work Order Type', message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) @@ -74,116 +103,76 @@ declare const bulmaJS: BulmaJS ) } - function deleteWorkOrderType(clickEvent: Event): void { - const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( - 'tr' - ) as HTMLTableRowElement - - const workOrderTypeId = tableRowElement.dataset.workOrderTypeId - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/admin/doDeleteWorkOrderType`, - { - workOrderTypeId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - workOrderTypes = responseJSON.workOrderTypes - - if (workOrderTypes.length === 0) { - renderWorkOrderTypes() - } else { - tableRowElement.remove() - } - - bulmaJS.alert({ - message: 'Work Order Type Deleted Successfully', - contextualColorName: 'success' - }) - } else { - bulmaJS.alert({ - title: 'Error Deleting Work Order Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Delete Work Order Type', - message: `Are you sure you want to delete this work order type?
+ bulmaJS.confirm({ + title: 'Delete Work Order Type', + message: `Are you sure you want to delete this work order type?
Note that no work orders will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Work Order Type', - callbackFunction: doDelete + messageIsHtml: true, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Work Order Type', + callbackFunction: doDelete + } + }) + } + + function moveWorkOrderType(clickEvent: MouseEvent): void { + const buttonElement = clickEvent.currentTarget as HTMLButtonElement + + const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement + + const workOrderTypeId = tableRowElement.dataset.workOrderTypeId + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/${ + buttonElement.dataset.direction === 'up' + ? 'doMoveWorkOrderTypeUp' + : 'doMoveWorkOrderTypeDown' + }`, + { + workOrderTypeId, + moveToEnd: clickEvent.shiftKey ? '1' : '0' + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as WorkOrderTypeResponseJSON + + if (responseJSON.success) { + workOrderTypes = responseJSON.workOrderTypes + renderWorkOrderTypes() + } else { + bulmaJS.alert({ + title: 'Error Moving Work Order Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } - }) - } + } + ) + } - function moveWorkOrderType(clickEvent: MouseEvent): void { - const buttonElement = clickEvent.currentTarget as HTMLButtonElement + function renderWorkOrderTypes(): void { + const containerElement = document.querySelector( + '#container--workOrderTypes' + ) as HTMLTableSectionElement - const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement - - const workOrderTypeId = tableRowElement.dataset.workOrderTypeId - - cityssm.postJSON( - `${los.urlPrefix}/admin/${ - buttonElement.dataset.direction === 'up' - ? 'doMoveWorkOrderTypeUp' - : 'doMoveWorkOrderTypeDown' - }`, - { - workOrderTypeId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - workOrderTypes = responseJSON.workOrderTypes - renderWorkOrderTypes() - } else { - bulmaJS.alert({ - title: 'Error Moving Work Order Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function renderWorkOrderTypes(): void { - const containerElement = document.querySelector( - '#container--workOrderTypes' - ) as HTMLTableSectionElement - - if (workOrderTypes.length === 0) { - containerElement.innerHTML = `` - return - } + return + } - containerElement.innerHTML = '' + containerElement.innerHTML = '' - for (const workOrderType of workOrderTypes) { - const tableRowElement = document.createElement('tr') + for (const workOrderType of workOrderTypes) { + const tableRowElement = document.createElement('tr') - tableRowElement.dataset.workOrderTypeId = - workOrderType.workOrderTypeId.toString() + tableRowElement.dataset.workOrderTypeId = + workOrderType.workOrderTypeId.toString() - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = `` - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateWorkOrderType) - ;( - tableRowElement.querySelector( - '.button--moveWorkOrderTypeUp' - ) as HTMLButtonElement - ).addEventListener('click', moveWorkOrderType) - ;( - tableRowElement.querySelector( - '.button--moveWorkOrderTypeDown' - ) as HTMLButtonElement - ).addEventListener('click', moveWorkOrderType) + tableRowElement + .querySelector('form') + ?.addEventListener('submit', updateWorkOrderType) + ;( + tableRowElement.querySelector( + '.button--moveWorkOrderTypeUp' + ) as HTMLButtonElement + ).addEventListener('click', moveWorkOrderType) + ;( + tableRowElement.querySelector( + '.button--moveWorkOrderTypeDown' + ) as HTMLButtonElement + ).addEventListener('click', moveWorkOrderType) - tableRowElement - .querySelector('.button--deleteWorkOrderType') - ?.addEventListener('click', deleteWorkOrderType) + tableRowElement + .querySelector('.button--deleteWorkOrderType') + ?.addEventListener('click', deleteWorkOrderType) - containerElement.append(tableRowElement) - } + containerElement.append(tableRowElement) } - ;( - document.querySelector('#form--addWorkOrderType') as HTMLFormElement - ).addEventListener('submit', (submitEvent: SubmitEvent) => { - submitEvent.preventDefault() + } - const formElement = submitEvent.currentTarget as HTMLFormElement + ;( + document.querySelector('#form--addWorkOrderType') as HTMLFormElement + ).addEventListener('submit', (submitEvent: SubmitEvent) => { + submitEvent.preventDefault() - cityssm.postJSON( - `${los.urlPrefix}/admin/doAddWorkOrderType`, - formElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON + const formElement = submitEvent.currentTarget as HTMLFormElement - if (responseJSON.success) { - workOrderTypes = responseJSON.workOrderTypes - renderWorkOrderTypes() - formElement.reset() - formElement.querySelector('input')?.focus() - } else { - bulmaJS.alert({ - title: 'Error Adding Work Order Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/doAddWorkOrderType`, + formElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as WorkOrderTypeResponseJSON + + if (responseJSON.success) { + workOrderTypes = responseJSON.workOrderTypes + renderWorkOrderTypes() + formElement.reset() + formElement.querySelector('input')?.focus() + } else { + bulmaJS.alert({ + title: 'Error Adding Work Order Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } - ) - }) + } + ) + }) - renderWorkOrderTypes() - })() + renderWorkOrderTypes() /** * Work Order Milestone Types */ - ;(() => { - let workOrderMilestoneTypes = - exports.workOrderMilestoneTypes as WorkOrderMilestoneType[] - delete exports.workOrderMilestoneTypes - type ResponseJSON = - | { - success: true - workOrderMilestoneTypes: WorkOrderMilestoneType[] - } - | { - success: false - errorMessage: string + let workOrderMilestoneTypes = + exports.workOrderMilestoneTypes as WorkOrderMilestoneType[] + delete exports.workOrderMilestoneTypes + + type WorkOrderMilestoneTypeResponseJSON = + | { + success: true + workOrderMilestoneTypes: WorkOrderMilestoneType[] + } + | { + success: false + errorMessage?: string + } + + function updateWorkOrderMilestoneType(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/doUpdateWorkOrderMilestoneType`, + submitEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = + rawResponseJSON as WorkOrderMilestoneTypeResponseJSON + + if (responseJSON.success) { + workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes + + bulmaJS.alert({ + message: 'Work Order Milestone Type Updated Successfully', + contextualColorName: 'success' + }) + } else { + bulmaJS.alert({ + title: 'Error Updating Work Order Milestone Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } + } + ) + } - function updateWorkOrderMilestoneType(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() + function deleteWorkOrderMilestoneType(clickEvent: Event): void { + const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + ) as HTMLTableRowElement + const workOrderMilestoneTypeId = + tableRowElement.dataset.workOrderMilestoneTypeId + + function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateWorkOrderMilestoneType`, - submitEvent.currentTarget, + `${sunrise.urlPrefix}/admin/doDeleteWorkOrderMilestoneType`, + { + workOrderMilestoneTypeId + }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON + const responseJSON = + rawResponseJSON as WorkOrderMilestoneTypeResponseJSON if (responseJSON.success) { workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes + if (workOrderMilestoneTypes.length === 0) { + renderWorkOrderMilestoneTypes() + } else { + tableRowElement.remove() + } + bulmaJS.alert({ - message: 'Work Order Milestone Type Updated Successfully', + message: 'Work Order Milestone Type Deleted Successfully', contextualColorName: 'success' }) } else { bulmaJS.alert({ - title: 'Error Updating Work Order Milestone Type', + title: 'Error Deleting Work Order Milestone Type', message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) @@ -313,126 +345,90 @@ declare const bulmaJS: BulmaJS ) } - function deleteWorkOrderMilestoneType(clickEvent: Event): void { - const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( - 'tr' - ) as HTMLTableRowElement - - const workOrderMilestoneTypeId = - tableRowElement.dataset.workOrderMilestoneTypeId - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/admin/doDeleteWorkOrderMilestoneType`, - { - workOrderMilestoneTypeId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes - - if (workOrderMilestoneTypes.length === 0) { - renderWorkOrderMilestoneTypes() - } else { - tableRowElement.remove() - } - - bulmaJS.alert({ - message: 'Work Order Milestone Type Deleted Successfully', - contextualColorName: 'success' - }) - } else { - bulmaJS.alert({ - title: 'Error Deleting Work Order Milestone Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Delete Work Order Milestone Type', - message: `Are you sure you want to delete this work order milestone type?
+ bulmaJS.confirm({ + title: 'Delete Work Order Milestone Type', + message: `Are you sure you want to delete this work order milestone type?
Note that no work orders will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Work Order Milestone Type', - callbackFunction: doDelete + messageIsHtml: true, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Work Order Milestone Type', + callbackFunction: doDelete + } + }) + } + + function moveWorkOrderMilestoneType(clickEvent: MouseEvent): void { + const buttonElement = clickEvent.currentTarget as HTMLButtonElement + + const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement + + const workOrderMilestoneTypeId = + tableRowElement.dataset.workOrderMilestoneTypeId + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/${ + buttonElement.dataset.direction === 'up' + ? 'doMoveWorkOrderMilestoneTypeUp' + : 'doMoveWorkOrderMilestoneTypeDown' + }`, + { + workOrderMilestoneTypeId, + moveToEnd: clickEvent.shiftKey ? '1' : '0' + }, + (rawResponseJSON) => { + const responseJSON = + rawResponseJSON as WorkOrderMilestoneTypeResponseJSON + + if (responseJSON.success) { + workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes + renderWorkOrderMilestoneTypes() + } else { + bulmaJS.alert({ + title: 'Error Moving Work Order Milestone Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } - }) - } + } + ) + } - function moveWorkOrderMilestoneType(clickEvent: MouseEvent): void { - const buttonElement = clickEvent.currentTarget as HTMLButtonElement + function renderWorkOrderMilestoneTypes(): void { + const containerElement = document.querySelector( + '#container--workOrderMilestoneTypes' + ) as HTMLTableSectionElement - const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement - - const workOrderMilestoneTypeId = - tableRowElement.dataset.workOrderMilestoneTypeId - - cityssm.postJSON( - `${los.urlPrefix}/admin/${ - buttonElement.dataset.direction === 'up' - ? 'doMoveWorkOrderMilestoneTypeUp' - : 'doMoveWorkOrderMilestoneTypeDown' - }`, - { - workOrderMilestoneTypeId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes - renderWorkOrderMilestoneTypes() - } else { - bulmaJS.alert({ - title: 'Error Moving Work Order Milestone Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function renderWorkOrderMilestoneTypes(): void { - const containerElement = document.querySelector( - '#container--workOrderMilestoneTypes' - ) as HTMLTableSectionElement - - if (workOrderMilestoneTypes.length === 0) { - containerElement.innerHTML = `` - return - } + return + } - containerElement.innerHTML = '' + containerElement.innerHTML = '' - for (const workOrderMilestoneType of workOrderMilestoneTypes) { - const tableRowElement = document.createElement('tr') + for (const workOrderMilestoneType of workOrderMilestoneTypes) { + const tableRowElement = document.createElement('tr') - tableRowElement.dataset.workOrderMilestoneTypeId = - workOrderMilestoneType.workOrderMilestoneTypeId.toString() + tableRowElement.dataset.workOrderMilestoneTypeId = + workOrderMilestoneType.workOrderMilestoneTypeId.toString() - // eslint-disable-next-line no-unsanitized/property, no-secrets/no-secrets - tableRowElement.innerHTML = `` - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateWorkOrderMilestoneType) - ;( - tableRowElement.querySelector( - '.button--moveWorkOrderMilestoneTypeUp' - ) as HTMLButtonElement - ).addEventListener('click', moveWorkOrderMilestoneType) - ;( - tableRowElement.querySelector( - '.button--moveWorkOrderMilestoneTypeDown' - ) as HTMLButtonElement - ).addEventListener('click', moveWorkOrderMilestoneType) + tableRowElement + .querySelector('form') + ?.addEventListener('submit', updateWorkOrderMilestoneType) + ;( + tableRowElement.querySelector( + '.button--moveWorkOrderMilestoneTypeUp' + ) as HTMLButtonElement + ).addEventListener('click', moveWorkOrderMilestoneType) + ;( + tableRowElement.querySelector( + '.button--moveWorkOrderMilestoneTypeDown' + ) as HTMLButtonElement + ).addEventListener('click', moveWorkOrderMilestoneType) - tableRowElement - .querySelector('.button--deleteWorkOrderMilestoneType') - ?.addEventListener('click', deleteWorkOrderMilestoneType) + tableRowElement + .querySelector('.button--deleteWorkOrderMilestoneType') + ?.addEventListener('click', deleteWorkOrderMilestoneType) - containerElement.append(tableRowElement) - } + containerElement.append(tableRowElement) } - ;( - document.querySelector( - '#form--addWorkOrderMilestoneType' - ) as HTMLFormElement - ).addEventListener('submit', (submitEvent: SubmitEvent) => { - submitEvent.preventDefault() + } + ;( + document.querySelector( + '#form--addWorkOrderMilestoneType' + ) as HTMLFormElement + ).addEventListener('submit', (submitEvent: SubmitEvent) => { + submitEvent.preventDefault() - const formElement = submitEvent.currentTarget as HTMLFormElement + const formElement = submitEvent.currentTarget as HTMLFormElement - cityssm.postJSON( - `${los.urlPrefix}/admin/doAddWorkOrderMilestoneType`, - formElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/doAddWorkOrderMilestoneType`, + formElement, + (rawResponseJSON) => { + const responseJSON = + rawResponseJSON as WorkOrderMilestoneTypeResponseJSON - if (responseJSON.success) { - workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes - renderWorkOrderMilestoneTypes() - formElement.reset() - formElement.querySelector('input')?.focus() - } else { - bulmaJS.alert({ - title: 'Error Adding Work Order Milestone Type', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } + if (responseJSON.success) { + workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes + renderWorkOrderMilestoneTypes() + formElement.reset() + formElement.querySelector('input')?.focus() + } else { + bulmaJS.alert({ + title: 'Error Adding Work Order Milestone Type', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } - ) - }) + } + ) + }) - renderWorkOrderMilestoneTypes() - })() + renderWorkOrderMilestoneTypes() /** - * Lot Statuses + * Burial Site Statuses */ - ;(() => { - let lotStatuses = exports.lotStatuses as LotStatus[] - delete exports.lotStatuses - type ResponseJSON = - | { - success: true - lotStatuses: LotStatus[] - } - | { - success: false - errorMessage: string + let burialSiteStatuses = exports.burialSiteStatuses as BurialSiteStatus[] + delete exports.burialSiteStatuses + + type BurialSiteStatusResponseJSON = + | { + success: true + burialSiteStatuses: BurialSiteStatus[] + } + | { + success: false + errorMessage?: string + } + + function updateBurialSiteStatus(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/doUpdateBurialSiteStatus`, + submitEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as BurialSiteStatusResponseJSON + + if (responseJSON.success) { + burialSiteStatuses = responseJSON.burialSiteStatuses + + bulmaJS.alert({ + message: `Burial Site Status Updated Successfully`, + contextualColorName: 'success' + }) + } else { + bulmaJS.alert({ + title: `Error Updating Burial Site Status`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } + } + ) + } - function updateBurialSiteStatus(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() + function deleteBurialSiteStatus(clickEvent: Event): void { + const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + ) as HTMLTableRowElement + const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId + + function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateBurialSiteStatus`, - submitEvent.currentTarget, + `${sunrise.urlPrefix}/admin/doDeleteBurialSiteStatus`, + { + burialSiteStatusId + }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON + const responseJSON = rawResponseJSON as BurialSiteStatusResponseJSON if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses + burialSiteStatuses = responseJSON.burialSiteStatuses + + if (burialSiteStatuses.length === 0) { + renderBurialSiteStatuses() + } else { + tableRowElement.remove() + } bulmaJS.alert({ - message: `${los.escapedAliases.Lot} Status Updated Successfully`, + message: `Burial Site Status Deleted Successfully`, contextualColorName: 'success' }) } else { bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Lot} Status`, + title: `Error Deleting Burial Site Status`, message: responseJSON.errorMessage ?? '', contextualColorName: 'danger' }) @@ -557,125 +593,85 @@ declare const bulmaJS: BulmaJS ) } - function deleteLotStatus(clickEvent: Event): void { - const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( - 'tr' - ) as HTMLTableRowElement - - const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/admin/doDeleteBurialSiteStatus`, - { - burialSiteStatusId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses - - if (lotStatuses.length === 0) { - renderLotStatuses() - } else { - tableRowElement.remove() - } - - bulmaJS.alert({ - message: `${los.escapedAliases.Lot} Status Deleted Successfully`, - contextualColorName: 'success' - }) - } else { - bulmaJS.alert({ - title: `Error Deleting ${los.escapedAliases.Lot} Status`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) + bulmaJS.confirm({ + title: `Delete Burial Site Status`, + message: `Are you sure you want to delete this status?
+ Note that no burial sites will be removed.`, + messageIsHtml: true, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Status', + callbackFunction: doDelete } + }) + } - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Lot} Status`, - message: `Are you sure you want to delete this status?
- Note that no ${los.escapedAliases.lot} will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Status', - callbackFunction: doDelete + function moveBurialSiteStatus(clickEvent: MouseEvent): void { + const buttonElement = clickEvent.currentTarget as HTMLButtonElement + + const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement + + const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/${ + buttonElement.dataset.direction === 'up' + ? 'doMoveBurialSiteStatusUp' + : 'doMoveBurialSiteStatusDown' + }`, + { + burialSiteStatusId, + moveToEnd: clickEvent.shiftKey ? '1' : '0' + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as BurialSiteStatusResponseJSON + + if (responseJSON.success) { + burialSiteStatuses = responseJSON.burialSiteStatuses + renderBurialSiteStatuses() + } else { + bulmaJS.alert({ + title: `Error Moving Burial Site Status`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) } - }) - } + } + ) + } - function moveLotStatus(clickEvent: MouseEvent): void { - const buttonElement = clickEvent.currentTarget as HTMLButtonElement + function renderBurialSiteStatuses(): void { + const containerElement = document.querySelector( + '#container--burialSiteStatuses' + ) as HTMLTableSectionElement - const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement - - const burialSiteStatusId = tableRowElement.dataset.burialSiteStatusId - - cityssm.postJSON( - `${los.urlPrefix}/admin/${ - buttonElement.dataset.direction === 'up' - ? 'doMoveBurialSiteStatusUp' - : 'doMoveBurialSiteStatusDown' - }`, - { - burialSiteStatusId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses - renderLotStatuses() - } else { - bulmaJS.alert({ - title: `Error Moving ${los.escapedAliases.Lot} Status`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function renderLotStatuses(): void { - const containerElement = document.querySelector( - '#container--lotStatuses' - ) as HTMLTableSectionElement - - if (lotStatuses.length === 0) { - // eslint-disable-next-line no-unsanitized/property - containerElement.innerHTML = `` - return - } + return + } - containerElement.innerHTML = '' + containerElement.innerHTML = '' - for (const lotStatus of lotStatuses) { - const tableRowElement = document.createElement('tr') + for (const burialSiteStatus of burialSiteStatuses) { + const tableRowElement = document.createElement('tr') - tableRowElement.dataset.burialSiteStatusId = lotStatus.burialSiteStatusId.toString() + tableRowElement.dataset.burialSiteStatusId = + burialSiteStatus.burialSiteStatusId.toString() - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = `` - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateBurialSiteStatus) - ;( - tableRowElement.querySelector( - '.button--moveLotStatusUp' - ) as HTMLButtonElement - ).addEventListener('click', moveLotStatus) - ;( - tableRowElement.querySelector( - '.button--moveLotStatusDown' - ) as HTMLButtonElement - ).addEventListener('click', moveLotStatus) + tableRowElement + .querySelector('form') + ?.addEventListener('submit', updateBurialSiteStatus) + ;( + tableRowElement.querySelector( + '.button--moveBurialSiteStatusUp' + ) as HTMLButtonElement + ).addEventListener('click', moveBurialSiteStatus) + ;( + tableRowElement.querySelector( + '.button--moveBurialSiteStatusDown' + ) as HTMLButtonElement + ).addEventListener('click', moveBurialSiteStatus) - tableRowElement - .querySelector('.button--deleteLotStatus') - ?.addEventListener('click', deleteLotStatus) + tableRowElement + .querySelector('.button--deleteBurialSiteStatus') + ?.addEventListener('click', deleteBurialSiteStatus) - containerElement.append(tableRowElement) + containerElement.append(tableRowElement) + } + } + ;( + document.querySelector('#form--addBurialSiteStatus') as HTMLFormElement + ).addEventListener('submit', (submitEvent: SubmitEvent) => { + submitEvent.preventDefault() + + const formElement = submitEvent.currentTarget as HTMLFormElement + + cityssm.postJSON( + `${sunrise.urlPrefix}/admin/doAddBurialSiteStatus`, + formElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as BurialSiteStatusResponseJSON + + if (responseJSON.success) { + burialSiteStatuses = responseJSON.burialSiteStatuses + renderBurialSiteStatuses() + formElement.reset() + formElement.querySelector('input')?.focus() + } else { + bulmaJS.alert({ + title: `Error Adding Burial Site Status`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } } - } - ;( - document.querySelector('#form--addBurialSiteStatus') as HTMLFormElement - ).addEventListener('submit', (submitEvent: SubmitEvent) => { - submitEvent.preventDefault() + ) + }) - const formElement = submitEvent.currentTarget as HTMLFormElement - - cityssm.postJSON( - `${los.urlPrefix}/admin/doAddBurialSiteStatus`, - formElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotStatuses = responseJSON.lotStatuses - renderLotStatuses() - formElement.reset() - formElement.querySelector('input')?.focus() - } else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Lot} Status`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - }) - - renderLotStatuses() - })() - - /** - * Lot Occupant Types - */ - ;(() => { - let lotOccupantTypes = exports.lotOccupantTypes as LotOccupantType[] - delete exports.lotOccupantTypes - - type ResponseJSON = - | { - success: true - lotOccupantTypes: LotOccupantType[] - } - | { - success: false - errorMessage: string - } - - function updateBurialSiteOccupantType(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateBurialSiteOccupantType`, - submitEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes - - bulmaJS.alert({ - message: `${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type Updated Successfully`, - contextualColorName: 'success' - }) - } else { - bulmaJS.alert({ - title: `Error Updating ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function deleteLotOccupantType(clickEvent: Event): void { - const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest( - 'tr' - ) as HTMLTableRowElement - - const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/admin/doDeleteBurialSiteOccupantType`, - { - lotOccupantTypeId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes - - if (lotOccupantTypes.length === 0) { - renderLotOccupantTypes() - } else { - tableRowElement.remove() - } - - bulmaJS.alert({ - message: `${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type Deleted Successfully`, - contextualColorName: 'success' - }) - } else { - bulmaJS.alert({ - title: `Error Deleting ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: `Are you sure you want to delete this ${los.escapedAliases.lot} ${los.escapedAliases.occupant} type?
- Note that no ${los.escapedAliases.lot} ${los.escapedAliases.occupants} will be removed.`, - messageIsHtml: true, - contextualColorName: 'warning', - okButton: { - text: `Yes, Delete ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - callbackFunction: doDelete - } - }) - } - - function moveLotOccupantType(clickEvent: MouseEvent): void { - const buttonElement = clickEvent.currentTarget as HTMLButtonElement - - const tableRowElement = buttonElement.closest('tr') as HTMLTableRowElement - - const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId - - cityssm.postJSON( - `${los.urlPrefix}/admin/${ - buttonElement.dataset.direction === 'up' - ? 'doMoveLotOccupantTypeUp' - : 'doMoveLotOccupantTypeDown' - }`, - { - lotOccupantTypeId, - moveToEnd: clickEvent.shiftKey ? '1' : '0' - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes - renderLotOccupantTypes() - } else { - bulmaJS.alert({ - title: `Error Moving ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function renderLotOccupantTypes(): void { - const containerElement = document.querySelector( - '#container--lotOccupantTypes' - ) as HTMLTableSectionElement - - if (lotOccupantTypes.length === 0) { - // eslint-disable-next-line no-unsanitized/property - containerElement.innerHTML = `` - - return - } - - containerElement.innerHTML = '' - - for (const lotOccupantType of lotOccupantTypes) { - const tableRowElement = document.createElement('tr') - - tableRowElement.dataset.lotOccupantTypeId = - lotOccupantType.lotOccupantTypeId.toString() - - const formId = `form--lotOccupantType-${lotOccupantType.lotOccupantTypeId.toString()}` - - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = `` - - const fontAwesomeInputElement = tableRowElement.querySelector( - "input[name='fontAwesomeIconClass']" - ) as HTMLInputElement - - fontAwesomeInputElement.addEventListener( - 'keyup', - refreshFontAwesomeIcon - ) - fontAwesomeInputElement.addEventListener( - 'change', - refreshFontAwesomeIcon - ) - - tableRowElement - .querySelector('form') - ?.addEventListener('submit', updateBurialSiteOccupantType) - ;( - tableRowElement.querySelector( - '.button--moveLotOccupantTypeUp' - ) as HTMLButtonElement - ).addEventListener('click', moveLotOccupantType) - ;( - tableRowElement.querySelector( - '.button--moveLotOccupantTypeDown' - ) as HTMLButtonElement - ).addEventListener('click', moveLotOccupantType) - - tableRowElement - .querySelector('.button--deleteLotOccupantType') - ?.addEventListener('click', deleteLotOccupantType) - - containerElement.append(tableRowElement) - } - } - ;( - document.querySelector('#form--addBurialSiteOccupantType') as HTMLFormElement - ).addEventListener('submit', (submitEvent: SubmitEvent) => { - submitEvent.preventDefault() - - const formElement = submitEvent.currentTarget as HTMLFormElement - - cityssm.postJSON( - `${los.urlPrefix}/admin/doAddLotOccupantType`, - formElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as ResponseJSON - - if (responseJSON.success) { - lotOccupantTypes = responseJSON.lotOccupantTypes - renderLotOccupantTypes() - formElement.reset() - formElement.querySelector('input')?.focus() - } else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Lot} ${los.escapedAliases.Occupant} Type`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - }) - - renderLotOccupantTypes() - })() + renderBurialSiteStatuses() })() diff --git a/public/javascripts/types.d.ts b/public/javascripts/types.d.ts index 410eee68..cad30279 100644 --- a/public/javascripts/types.d.ts +++ b/public/javascripts/types.d.ts @@ -1,4 +1,4 @@ -export interface LOS { +export interface Sunrise { urlPrefix: string; apiKey: string; highlightMap: (mapContainerElement: HTMLElement, mapKey: string, contextualClass: 'success' | 'danger') => void; @@ -21,6 +21,7 @@ export interface LOS { getMoveUpDownButtonFieldHTML: (upButtonClassNames: string, downButtonClassNames: string, isSmall?: boolean) => string; getLoadingParagraphHTML: (captionText?: string) => string; getSearchResultsPagerHTML: (limit: number, offset: number, count: number) => string; + getFuneralHomeURL: (funeralHomeId?: number | string, edit?: boolean, time?: boolean) => string; getCemeteryURL: (cemeteryId?: number | string, edit?: boolean, time?: boolean) => string; getBurialSiteURL: (burialSiteId?: number | string, edit?: boolean, time?: boolean) => string; getContractURL: (contractId?: number | string, edit?: boolean, time?: boolean) => string; diff --git a/public/javascripts/types.ts b/public/javascripts/types.ts index bee570ff..fd8aa3aa 100644 --- a/public/javascripts/types.ts +++ b/public/javascripts/types.ts @@ -1,4 +1,4 @@ -export interface LOS { +export interface Sunrise { urlPrefix: string apiKey: string @@ -44,6 +44,7 @@ export interface LOS { count: number ) => string + getFuneralHomeURL: (funeralHomeId?: number | string, edit?: boolean, time?: boolean) => string getCemeteryURL: (cemeteryId?: number | string, edit?: boolean, time?: boolean) => string getBurialSiteURL: (burialSiteId?: number | string, edit?: boolean, time?: boolean) => string getContractURL: ( diff --git a/public/javascripts/workOrder.edit.js b/public/javascripts/workOrder.edit.js index 5363d292..a9be9ddb 100644 --- a/public/javascripts/workOrder.edit.js +++ b/public/javascripts/workOrder.edit.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const workOrderId = document.querySelector('#workOrderEdit--workOrderId').value; const isCreate = workOrderId === ''; const workOrderFormElement = document.querySelector('#form--workOrderEdit'); @@ -272,7 +272,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); : ``} `; @@ -539,7 +539,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); `; if (contract.lotId) { rowElement.insertAdjacentHTML('beforeend', ``); diff --git a/public/javascripts/workOrder.edit.ts b/public/javascripts/workOrder.edit.ts index 9c8f6d84..f33771f6 100644 --- a/public/javascripts/workOrder.edit.ts +++ b/public/javascripts/workOrder.edit.ts @@ -16,7 +16,7 @@ declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const workOrderId = ( document.querySelector('#workOrderEdit--workOrderId') as HTMLInputElement @@ -406,7 +406,7 @@ declare const exports: Record } ` @@ -797,7 +797,7 @@ declare const exports: Record ` if (contract.lotId) { diff --git a/public/javascripts/workOrder.milestoneCalendar.js b/public/javascripts/workOrder.milestoneCalendar.js index 2eb21286..cfc80d15 100644 --- a/public/javascripts/workOrder.milestoneCalendar.js +++ b/public/javascripts/workOrder.milestoneCalendar.js @@ -3,7 +3,7 @@ /* eslint-disable unicorn/prefer-module */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const workOrderSearchFiltersFormElement = document.querySelector('#form--searchFilters'); const workOrderMilestoneDateFilterElement = workOrderSearchFiltersFormElement.querySelector('#searchFilter--workOrderMilestoneDateFilter'); const workOrderMilestoneDateStringElement = workOrderSearchFiltersFormElement.querySelector('#searchFilter--workOrderMilestoneDateString'); diff --git a/public/javascripts/workOrder.milestoneCalendar.ts b/public/javascripts/workOrder.milestoneCalendar.ts index 99c93e32..c8630265 100644 --- a/public/javascripts/workOrder.milestoneCalendar.ts +++ b/public/javascripts/workOrder.milestoneCalendar.ts @@ -10,7 +10,7 @@ declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const workOrderSearchFiltersFormElement = document.querySelector( '#form--searchFilters' diff --git a/public/javascripts/workOrder.outlook.js b/public/javascripts/workOrder.outlook.js index 2313ce94..a8b3782a 100644 --- a/public/javascripts/workOrder.outlook.js +++ b/public/javascripts/workOrder.outlook.js @@ -3,7 +3,7 @@ /* eslint-disable unicorn/prefer-module */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const workOrderTypeIdsElement = document.querySelector('#icsFilters--workOrderTypeIds'); const workOrderMilestoneTypeIdsElement = document.querySelector('#icsFilters--workOrderMilestoneTypeIds'); const calendarLinkElement = document.querySelector('#icsFilters--calendarURL'); diff --git a/public/javascripts/workOrder.outlook.ts b/public/javascripts/workOrder.outlook.ts index a7ce818c..343b0cf6 100644 --- a/public/javascripts/workOrder.outlook.ts +++ b/public/javascripts/workOrder.outlook.ts @@ -5,7 +5,7 @@ import type { LOS } from '../../types/globalTypes.js' declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const workOrderTypeIdsElement = document.querySelector( '#icsFilters--workOrderTypeIds' diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js index 8307f492..e8f96c95 100644 --- a/public/javascripts/workOrder.search.js +++ b/public/javascripts/workOrder.search.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const workOrderPrints = exports.workOrderPrints; const searchFilterFormElement = document.querySelector('#form--searchFilters'); los.initializeDatePickers(searchFilterFormElement); diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts index 6cd87b87..2c9eb74f 100644 --- a/public/javascripts/workOrder.search.ts +++ b/public/javascripts/workOrder.search.ts @@ -7,7 +7,7 @@ declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const workOrderPrints = exports.workOrderPrints as string[] diff --git a/public/javascripts/workOrder.view.js b/public/javascripts/workOrder.view.js index e9929751..bc120421 100644 --- a/public/javascripts/workOrder.view.js +++ b/public/javascripts/workOrder.view.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.los; + const los = exports.sunrise; const reopenWorkOrderButtonElement = document.querySelector('#button--reopenWorkOrder'); if (reopenWorkOrderButtonElement !== null) { const workOrderId = reopenWorkOrderButtonElement.dataset.workOrderId ?? ''; diff --git a/public/javascripts/workOrder.view.ts b/public/javascripts/workOrder.view.ts index ec972b38..c4e3feba 100644 --- a/public/javascripts/workOrder.view.ts +++ b/public/javascripts/workOrder.view.ts @@ -8,7 +8,7 @@ declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.los as LOS + const los = exports.sunrise as LOS const reopenWorkOrderButtonElement: HTMLButtonElement | null = document.querySelector('#button--reopenWorkOrder') diff --git a/routes/funeralHomes.d.ts b/routes/funeralHomes.d.ts new file mode 100644 index 00000000..433ab333 --- /dev/null +++ b/routes/funeralHomes.d.ts @@ -0,0 +1,2 @@ +export declare const router: import("express-serve-static-core").Router; +export default router; diff --git a/routes/funeralHomes.js b/routes/funeralHomes.js new file mode 100644 index 00000000..6e883d9c --- /dev/null +++ b/routes/funeralHomes.js @@ -0,0 +1,18 @@ +import { Router } from 'express'; +import handler_edit from '../handlers/funeralHomes-get/edit.js'; +import handler_new from '../handlers/funeralHomes-get/new.js'; +import handler_search from '../handlers/funeralHomes-get/search.js'; +import handler_view from '../handlers/funeralHomes-get/view.js'; +import handler_doCreateFuneralHome from '../handlers/funeralHomes-post/doCreateFuneralHome.js'; +import handler_doDeleteFuneralHome from '../handlers/funeralHomes-post/doDeleteFuneralHome.js'; +import handler_doUpdateFuneralHome from '../handlers/funeralHomes-post/doUpdateFuneralHome.js'; +import { updateGetHandler, updatePostHandler } from '../handlers/permissions.js'; +export const router = Router(); +router.get('/', handler_search); +router.get('/:funeralHomeId', handler_view); +router.get('/new', updateGetHandler, handler_new); +router.post('/doCreateFuneralHome', updatePostHandler, handler_doCreateFuneralHome); +router.get('/:funeralHomeId/edit', updateGetHandler, handler_edit); +router.post('/doUpdateFuneralHome', updatePostHandler, handler_doUpdateFuneralHome); +router.post('/doDeleteFuneralHome', updatePostHandler, handler_doDeleteFuneralHome); +export default router; diff --git a/routes/funeralHomes.ts b/routes/funeralHomes.ts new file mode 100644 index 00000000..efa88b83 --- /dev/null +++ b/routes/funeralHomes.ts @@ -0,0 +1,40 @@ +import { Router } from 'express' + +import handler_edit from '../handlers/funeralHomes-get/edit.js' +import handler_new from '../handlers/funeralHomes-get/new.js' +import handler_search from '../handlers/funeralHomes-get/search.js' +import handler_view from '../handlers/funeralHomes-get/view.js' +import handler_doCreateFuneralHome from '../handlers/funeralHomes-post/doCreateFuneralHome.js' +import handler_doDeleteFuneralHome from '../handlers/funeralHomes-post/doDeleteFuneralHome.js' +import handler_doUpdateFuneralHome from '../handlers/funeralHomes-post/doUpdateFuneralHome.js' +import { updateGetHandler, updatePostHandler } from '../handlers/permissions.js' + +export const router = Router() + +router.get('/', handler_search) + +router.get('/:funeralHomeId', handler_view) + +router.get('/new', updateGetHandler, handler_new) + +router.post( + '/doCreateFuneralHome', + updatePostHandler, + handler_doCreateFuneralHome +) + +router.get('/:funeralHomeId/edit', updateGetHandler, handler_edit) + +router.post( + '/doUpdateFuneralHome', + updatePostHandler, + handler_doUpdateFuneralHome +) + +router.post( + '/doDeleteFuneralHome', + updatePostHandler, + handler_doDeleteFuneralHome +) + +export default router diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 7abbb008..fa1f6eaa 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -198,7 +198,7 @@ async function importFromMasterCSV() { preneedcontractStartDateString = '0001-01-01'; } preneedcontractId = await addContract({ - contractTypeId: importIds.preneedOccupancyType.contractTypeId, + contractTypeId: importIds.preneedContractType.contractTypeId, lotId: burialSiteId ?? '', contractStartDateString: preneedcontractStartDateString, contractEndDateString, @@ -263,11 +263,11 @@ async function importFromMasterCSV() { const deceasedcontractEndDateString = burialSiteId ? '' : deceasedcontractStartDateString; - const occupancyType = burialSiteId - ? importIds.deceasedOccupancyType - : importIds.cremationOccupancyType; + const contractType = burialSiteId + ? importIds.deceasedContractType + : importIds.cremationContractType; deceasedcontractId = await addContract({ - contractTypeId: occupancyType.contractTypeId, + contractTypeId: contractType.contractTypeId, lotId: burialSiteId ?? '', contractStartDateString: deceasedcontractStartDateString, contractEndDateString: deceasedcontractEndDateString, @@ -291,14 +291,14 @@ async function importFromMasterCSV() { const contractFieldValue = formatDateString(masterRow.CM_DEATH_YR, masterRow.CM_DEATH_MON, masterRow.CM_DEATH_DAY); await addOrUpdateContractField({ contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Date').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Date').contractTypeFieldId, contractFieldValue }, user); } if (masterRow.CM_AGE !== '') { await addOrUpdateContractField({ contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Age').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Age').contractTypeFieldId, contractFieldValue: masterRow.CM_AGE }, user); } @@ -306,7 +306,7 @@ async function importFromMasterCSV() { const period = importData.getDeathAgePeriod(masterRow.CM_PERIOD); await addOrUpdateContractField({ contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Age Period').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Age Period').contractTypeFieldId, contractFieldValue: period }, user); } @@ -330,8 +330,8 @@ async function importFromMasterCSV() { { contractId: deceasedcontractId, contractTypeFieldId: allContractTypeFields.find( - (occupancyTypeField) => { - return occupancyTypeField.occupancyTypeField === "Funeral Home"; + (contractTypeField) => { + return contractTypeField.contractTypeField === "Funeral Home"; } ).contractTypeFieldId, contractFieldValue: masterRow.CM_FUNERAL_HOME @@ -344,15 +344,15 @@ async function importFromMasterCSV() { const contractFieldValue = formatDateString(masterRow.CM_FUNERAL_YR, masterRow.CM_FUNERAL_MON, masterRow.CM_FUNERAL_DAY); await addOrUpdateContractField({ contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Funeral Date').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Funeral Date').contractTypeFieldId, contractFieldValue }, user); } - if (occupancyType.occupancyType !== 'Cremation') { + if (contractType.contractType !== 'Cremation') { if (masterRow.CM_CONTAINER_TYPE !== '') { await addOrUpdateContractField({ contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Container Type').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Container Type').contractTypeFieldId, contractFieldValue: masterRow.CM_CONTAINER_TYPE }, user); } @@ -363,7 +363,7 @@ async function importFromMasterCSV() { } await addOrUpdateContractField({ contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Committal Type').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Committal Type').contractTypeFieldId, contractFieldValue: commitalType }, user); } @@ -480,7 +480,7 @@ async function importFromPrepaidCSV() { if (lot) { const possibleLotOccupancies = await getContracts({ lotId: lot.lotId, - contractTypeId: importIds.preneedOccupancyType.contractTypeId, + contractTypeId: importIds.preneedContractType.contractTypeId, occupantName: prepaidRow.CMPP_PREPAID_FOR_NAME, contractStartDateString }, { @@ -497,7 +497,7 @@ async function importFromPrepaidCSV() { } contractId ||= await addContract({ lotId: lot ? lot.lotId : '', - contractTypeId: importIds.preneedOccupancyType.contractTypeId, + contractTypeId: importIds.preneedContractType.contractTypeId, contractStartDateString, contractEndDateString: '' }, user); @@ -735,12 +735,12 @@ async function importFromWorkOrderCSV() { if (workOrderRow.WO_INTERMENT_YR) { contractStartDateString = formatDateString(workOrderRow.WO_INTERMENT_YR, workOrderRow.WO_INTERMENT_MON, workOrderRow.WO_INTERMENT_DAY); } - const occupancyType = lot - ? importIds.deceasedOccupancyType - : importIds.cremationOccupancyType; + const contractType = lot + ? importIds.deceasedContractType + : importIds.cremationContractType; const contractId = await addContract({ lotId: lot ? lot.lotId : '', - contractTypeId: occupancyType.contractTypeId, + contractTypeId: contractType.contractTypeId, contractStartDateString, contractEndDateString: '' }, user); @@ -761,21 +761,21 @@ async function importFromWorkOrderCSV() { const contractFieldValue = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY); await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Date').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Date').contractTypeFieldId, contractFieldValue }, user); } if (workOrderRow.WO_DEATH_PLACE !== '') { await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Place').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Place').contractTypeFieldId, contractFieldValue: workOrderRow.WO_DEATH_PLACE }, user); } if (workOrderRow.WO_AGE !== '') { await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Age').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Age').contractTypeFieldId, contractFieldValue: workOrderRow.WO_AGE }, user); } @@ -783,7 +783,7 @@ async function importFromWorkOrderCSV() { const period = importData.getDeathAgePeriod(workOrderRow.WO_PERIOD); await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Death Age Period').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Death Age Period').contractTypeFieldId, contractFieldValue: period }, user); } @@ -806,8 +806,8 @@ async function importFromWorkOrderCSV() { addOrUpdateContractField( { contractId: contractId, - contractTypeFieldId: allContractTypeFields.find((occupancyTypeField) => { - return occupancyTypeField.occupancyTypeField === "Funeral Home"; + contractTypeFieldId: allContractTypeFields.find((contractTypeField) => { + return contractTypeField.contractTypeField === "Funeral Home"; }).contractTypeFieldId, contractFieldValue: workOrderRow.WO_FUNERAL_HOME }, @@ -819,15 +819,15 @@ async function importFromWorkOrderCSV() { const contractFieldValue = formatDateString(workOrderRow.WO_FUNERAL_YR, workOrderRow.WO_FUNERAL_MON, workOrderRow.WO_FUNERAL_DAY); await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Funeral Date').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Funeral Date').contractTypeFieldId, contractFieldValue }, user); } - if (occupancyType.occupancyType !== 'Cremation') { + if (contractType.contractType !== 'Cremation') { if (workOrderRow.WO_CONTAINER_TYPE !== '') { await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Container Type').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Container Type').contractTypeFieldId, contractFieldValue: workOrderRow.WO_CONTAINER_TYPE }, user); } @@ -838,7 +838,7 @@ async function importFromWorkOrderCSV() { } await addOrUpdateContractField({ contractId, - contractTypeFieldId: occupancyType.ContractTypeFields.find((occupancyTypeField) => occupancyTypeField.occupancyTypeField === 'Committal Type').contractTypeFieldId, + contractTypeFieldId: contractType.ContractTypeFields.find((contractTypeField) => contractTypeField.contractTypeField === 'Committal Type').contractTypeFieldId, contractFieldValue: commitalType }, user); } diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index a6894b8c..8c6a6fb8 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -440,7 +440,7 @@ async function importFromMasterCSV(): Promise { preneedcontractId = await addContract( { - contractTypeId: importIds.preneedOccupancyType.contractTypeId, + contractTypeId: importIds.preneedContractType.contractTypeId, lotId: burialSiteId ?? '', contractStartDateString: preneedcontractStartDateString, contractEndDateString, @@ -551,13 +551,13 @@ async function importFromMasterCSV(): Promise { ? '' : deceasedcontractStartDateString - const occupancyType = burialSiteId - ? importIds.deceasedOccupancyType - : importIds.cremationOccupancyType + const contractType = burialSiteId + ? importIds.deceasedContractType + : importIds.cremationContractType deceasedcontractId = await addContract( { - contractTypeId: occupancyType.contractTypeId, + contractTypeId: contractType.contractTypeId, lotId: burialSiteId ?? '', contractStartDateString: deceasedcontractStartDateString, contractEndDateString: deceasedcontractEndDateString, @@ -596,9 +596,9 @@ async function importFromMasterCSV(): Promise { await addOrUpdateContractField( { contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Date' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Date' )!.contractTypeFieldId!, contractFieldValue }, @@ -610,9 +610,9 @@ async function importFromMasterCSV(): Promise { await addOrUpdateContractField( { contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Age' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Age' )!.contractTypeFieldId!, contractFieldValue: masterRow.CM_AGE }, @@ -626,9 +626,9 @@ async function importFromMasterCSV(): Promise { await addOrUpdateContractField( { contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Age Period' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Age Period' )!.contractTypeFieldId!, contractFieldValue: period }, @@ -666,8 +666,8 @@ async function importFromMasterCSV(): Promise { { contractId: deceasedcontractId, contractTypeFieldId: allContractTypeFields.find( - (occupancyTypeField) => { - return occupancyTypeField.occupancyTypeField === "Funeral Home"; + (contractTypeField) => { + return contractTypeField.contractTypeField === "Funeral Home"; } ).contractTypeFieldId, contractFieldValue: masterRow.CM_FUNERAL_HOME @@ -687,9 +687,9 @@ async function importFromMasterCSV(): Promise { await addOrUpdateContractField( { contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Funeral Date' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Funeral Date' )!.contractTypeFieldId!, contractFieldValue }, @@ -697,14 +697,14 @@ async function importFromMasterCSV(): Promise { ) } - if (occupancyType.occupancyType !== 'Cremation') { + if (contractType.contractType !== 'Cremation') { if (masterRow.CM_CONTAINER_TYPE !== '') { await addOrUpdateContractField( { contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Container Type' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Container Type' )!.contractTypeFieldId!, contractFieldValue: masterRow.CM_CONTAINER_TYPE }, @@ -722,9 +722,9 @@ async function importFromMasterCSV(): Promise { await addOrUpdateContractField( { contractId: deceasedcontractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Committal Type' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Committal Type' )!.contractTypeFieldId!, contractFieldValue: commitalType }, @@ -901,7 +901,7 @@ async function importFromPrepaidCSV(): Promise { const possibleLotOccupancies = await getContracts( { lotId: lot.lotId, - contractTypeId: importIds.preneedOccupancyType.contractTypeId, + contractTypeId: importIds.preneedContractType.contractTypeId, occupantName: prepaidRow.CMPP_PREPAID_FOR_NAME, contractStartDateString }, @@ -923,7 +923,7 @@ async function importFromPrepaidCSV(): Promise { contractId ||= await addContract( { lotId: lot ? lot.lotId : '', - contractTypeId: importIds.preneedOccupancyType.contractTypeId, + contractTypeId: importIds.preneedContractType.contractTypeId, contractStartDateString, contractEndDateString: '' }, @@ -1267,14 +1267,14 @@ async function importFromWorkOrderCSV(): Promise { ) } - const occupancyType = lot - ? importIds.deceasedOccupancyType - : importIds.cremationOccupancyType + const contractType = lot + ? importIds.deceasedContractType + : importIds.cremationContractType const contractId = await addContract( { lotId: lot ? lot.lotId : '', - contractTypeId: occupancyType.contractTypeId, + contractTypeId: contractType.contractTypeId, contractStartDateString, contractEndDateString: '' }, @@ -1308,9 +1308,9 @@ async function importFromWorkOrderCSV(): Promise { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Date' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Date' )!.contractTypeFieldId!, contractFieldValue }, @@ -1322,9 +1322,9 @@ async function importFromWorkOrderCSV(): Promise { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Place' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Place' )!.contractTypeFieldId!, contractFieldValue: workOrderRow.WO_DEATH_PLACE }, @@ -1336,9 +1336,9 @@ async function importFromWorkOrderCSV(): Promise { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Age' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Age' )!.contractTypeFieldId!, contractFieldValue: workOrderRow.WO_AGE }, @@ -1352,9 +1352,9 @@ async function importFromWorkOrderCSV(): Promise { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Death Age Period' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Death Age Period' )!.contractTypeFieldId!, contractFieldValue: period }, @@ -1389,8 +1389,8 @@ async function importFromWorkOrderCSV(): Promise { addOrUpdateContractField( { contractId: contractId, - contractTypeFieldId: allContractTypeFields.find((occupancyTypeField) => { - return occupancyTypeField.occupancyTypeField === "Funeral Home"; + contractTypeFieldId: allContractTypeFields.find((contractTypeField) => { + return contractTypeField.contractTypeField === "Funeral Home"; }).contractTypeFieldId, contractFieldValue: workOrderRow.WO_FUNERAL_HOME }, @@ -1409,9 +1409,9 @@ async function importFromWorkOrderCSV(): Promise { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Funeral Date' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Funeral Date' )!.contractTypeFieldId!, contractFieldValue }, @@ -1419,14 +1419,14 @@ async function importFromWorkOrderCSV(): Promise { ) } - if (occupancyType.occupancyType !== 'Cremation') { + if (contractType.contractType !== 'Cremation') { if (workOrderRow.WO_CONTAINER_TYPE !== '') { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Container Type' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Container Type' )!.contractTypeFieldId!, contractFieldValue: workOrderRow.WO_CONTAINER_TYPE }, @@ -1444,9 +1444,9 @@ async function importFromWorkOrderCSV(): Promise { await addOrUpdateContractField( { contractId, - contractTypeFieldId: occupancyType.ContractTypeFields!.find( - (occupancyTypeField) => - occupancyTypeField.occupancyTypeField === 'Committal Type' + contractTypeFieldId: contractType.ContractTypeFields!.find( + (contractTypeField) => + contractTypeField.contractTypeField === 'Committal Type' )!.contractTypeFieldId!, contractFieldValue: commitalType }, diff --git a/temp/legacy.importFromCsv.ids.d.ts b/temp/legacy.importFromCsv.ids.d.ts index 14c2fd6d..ff9675b6 100644 --- a/temp/legacy.importFromCsv.ids.d.ts +++ b/temp/legacy.importFromCsv.ids.d.ts @@ -9,9 +9,9 @@ export declare const takenburialSiteStatusId: any; export declare function getburialSiteTypeId(dataRow: { cemetery: string; }): number; -export declare const preneedOccupancyType: import("../types/recordTypes.js").ContractType; -export declare const deceasedOccupancyType: import("../types/recordTypes.js").ContractType; -export declare const cremationOccupancyType: import("../types/recordTypes.js").ContractType; +export declare const preneedContractType: import("../types/recordTypes.js").ContractType; +export declare const deceasedContractType: import("../types/recordTypes.js").ContractType; +export declare const cremationContractType: import("../types/recordTypes.js").ContractType; export declare const acknowledgedWorkOrderMilestoneTypeId: number | undefined; export declare const deathWorkOrderMilestoneTypeId: number | undefined; export declare const funeralWorkOrderMilestoneTypeId: number | undefined; diff --git a/temp/legacy.importFromCsv.ids.js b/temp/legacy.importFromCsv.ids.js index 2cb30094..0fcfc4d0 100644 --- a/temp/legacy.importFromCsv.ids.js +++ b/temp/legacy.importFromCsv.ids.js @@ -72,9 +72,9 @@ export function getburialSiteTypeId(dataRow) { /* * Occupancy Type IDs */ -export const preneedOccupancyType = (await cacheFunctions.getContractTypeByContractType('Preneed')); -export const deceasedOccupancyType = (await cacheFunctions.getContractTypeByContractType('Interment')); -export const cremationOccupancyType = (await cacheFunctions.getContractTypeByContractType('Cremation')); +export const preneedContractType = (await cacheFunctions.getContractTypeByContractType('Preneed')); +export const deceasedContractType = (await cacheFunctions.getContractTypeByContractType('Interment')); +export const cremationContractType = (await cacheFunctions.getContractTypeByContractType('Cremation')); /* * Work Order Milestone Type IDs */ diff --git a/temp/legacy.importFromCsv.ids.ts b/temp/legacy.importFromCsv.ids.ts index d1fa206b..755ec4be 100644 --- a/temp/legacy.importFromCsv.ids.ts +++ b/temp/legacy.importFromCsv.ids.ts @@ -121,13 +121,13 @@ export function getburialSiteTypeId(dataRow: { cemetery: string }): number { * Occupancy Type IDs */ -export const preneedOccupancyType = +export const preneedContractType = (await cacheFunctions.getContractTypeByContractType('Preneed'))! -export const deceasedOccupancyType = +export const deceasedContractType = (await cacheFunctions.getContractTypeByContractType('Interment'))! -export const cremationOccupancyType = +export const cremationContractType = (await cacheFunctions.getContractTypeByContractType('Cremation'))! /* diff --git a/test/functions.js b/test/functions.js index cbbdeade..5dc25fe2 100644 --- a/test/functions.js +++ b/test/functions.js @@ -57,21 +57,21 @@ describe('functions.cache', () => { }); describe('Occupancy Types', () => { it('returns Occupancy Types', async () => { - cacheFunctions.clearCacheByTableName('OccupancyTypes'); - const occupancyTypes = await cacheFunctions.getContractTypes(); - assert.ok(occupancyTypes.length > 0); - for (const occupancyType of occupancyTypes) { - const byId = await cacheFunctions.getContractTypeById(occupancyType.contractTypeId); - assert.strictEqual(occupancyType.contractTypeId, byId?.contractTypeId); - const byName = await cacheFunctions.getContractTypeByContractType(occupancyType.occupancyType); - assert.strictEqual(occupancyType.occupancyType, byName?.occupancyType); + cacheFunctions.clearCacheByTableName('ContractTypes'); + const contractTypes = await cacheFunctions.getContractTypes(); + assert.ok(contractTypes.length > 0); + for (const contractType of contractTypes) { + const byId = await cacheFunctions.getContractTypeById(contractType.contractTypeId); + assert.strictEqual(contractType.contractTypeId, byId?.contractTypeId); + const byName = await cacheFunctions.getContractTypeByContractType(contractType.contractType); + assert.strictEqual(contractType.contractType, byName?.contractType); } }); it('returns undefined with a bad contractTypeId', async () => { const byBadId = await cacheFunctions.getContractTypeById(badId); assert.ok(byBadId === undefined); }); - it('returns undefined with a bad occupancyType', async () => { + it('returns undefined with a bad contractType', async () => { const byBadName = await cacheFunctions.getContractTypeByContractType(badName); assert.ok(byBadName === undefined); }); diff --git a/test/functions.ts b/test/functions.ts index b012be1a..7f727ef1 100644 --- a/test/functions.ts +++ b/test/functions.ts @@ -81,22 +81,22 @@ describe('functions.cache', () => { describe('Occupancy Types', () => { it('returns Occupancy Types', async () => { - cacheFunctions.clearCacheByTableName('OccupancyTypes') + cacheFunctions.clearCacheByTableName('ContractTypes') - const occupancyTypes = await cacheFunctions.getContractTypes() + const contractTypes = await cacheFunctions.getContractTypes() - assert.ok(occupancyTypes.length > 0) + assert.ok(contractTypes.length > 0) - for (const occupancyType of occupancyTypes) { + for (const contractType of contractTypes) { const byId = await cacheFunctions.getContractTypeById( - occupancyType.contractTypeId + contractType.contractTypeId ) - assert.strictEqual(occupancyType.contractTypeId, byId?.contractTypeId) + assert.strictEqual(contractType.contractTypeId, byId?.contractTypeId) const byName = await cacheFunctions.getContractTypeByContractType( - occupancyType.occupancyType + contractType.contractType ) - assert.strictEqual(occupancyType.occupancyType, byName?.occupancyType) + assert.strictEqual(contractType.contractType, byName?.contractType) } }) @@ -105,7 +105,7 @@ describe('functions.cache', () => { assert.ok(byBadId === undefined) }) - it('returns undefined with a bad occupancyType', async () => { + it('returns undefined with a bad contractType', async () => { const byBadName = await cacheFunctions.getContractTypeByContractType( badName ) diff --git a/types/configTypes.d.ts b/types/configTypes.d.ts index 772d04d0..6243ef5e 100644 --- a/types/configTypes.d.ts +++ b/types/configTypes.d.ts @@ -20,20 +20,17 @@ export interface Config { workOrderCloseDate?: string; }; settings: { + cityDefault?: string; + provinceDefault?: string; fees: { taxPercentageDefault?: number; }; - cemeteries: { - cityDefault?: string; - provinceDefault?: string; - }; burialSites: { burialSiteNameSegments?: ConfigBurialSiteNameSegments; }; contracts: { burialSiteIdIsRequired?: boolean; - cityDefault?: string; - provinceDefault?: string; + contractEndDateIsRequired?: boolean; prints?: string[]; }; workOrders: { diff --git a/types/configTypes.ts b/types/configTypes.ts index 9f081ef8..ac3a6e4b 100644 --- a/types/configTypes.ts +++ b/types/configTypes.ts @@ -21,20 +21,17 @@ export interface Config { workOrderCloseDate?: string } settings: { + cityDefault?: string + provinceDefault?: string fees: { taxPercentageDefault?: number } - cemeteries: { - cityDefault?: string - provinceDefault?: string - } burialSites: { burialSiteNameSegments?: ConfigBurialSiteNameSegments } contracts: { burialSiteIdIsRequired?: boolean - cityDefault?: string - provinceDefault?: string + contractEndDateIsRequired?: boolean prints?: string[] } workOrders: { diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts index 21d9e661..7c85ce79 100644 --- a/types/recordTypes.d.ts +++ b/types/recordTypes.d.ts @@ -26,6 +26,16 @@ export interface Cemetery extends Record { cemeteryPhoneNumber?: string; burialSiteCount?: number; } +export interface FuneralHome extends Record { + funeralHomeId?: number; + funeralHomeName?: string; + funeralHomeAddress1?: string; + funeralHomeAddress2?: string; + funeralHomeCity?: string; + funeralHomeProvince?: string; + funeralHomePostalCode?: string; + funeralHomePhoneNumber?: string; +} export interface BurialSiteType extends Record { burialSiteTypeId: number; burialSiteType: string; diff --git a/types/recordTypes.ts b/types/recordTypes.ts index 3cef8a2b..7ba680f2 100644 --- a/types/recordTypes.ts +++ b/types/recordTypes.ts @@ -37,6 +37,17 @@ export interface Cemetery extends Record { burialSiteCount?: number } +export interface FuneralHome extends Record { + funeralHomeId?: number + funeralHomeName?: string + funeralHomeAddress1?: string + funeralHomeAddress2?: string + funeralHomeCity?: string + funeralHomeProvince?: string + funeralHomePostalCode?: string + funeralHomePhoneNumber?: string +} + export interface BurialSiteType extends Record { burialSiteTypeId: number burialSiteType: string diff --git a/views/_header.ejs b/views/_header.ejs index b10d3524..2574ecc7 100644 --- a/views/_header.ejs +++ b/views/_header.ejs @@ -63,6 +63,12 @@
+ + + + + Funeral Homes + diff --git a/views/_menu-admin.ejs b/views/_menu-admin.ejs index fa86dbb9..f4886f5c 100644 --- a/views/_menu-admin.ejs +++ b/views/_menu-admin.ejs @@ -12,16 +12,16 @@
  • - " - href="<%= urlPrefix %>/admin/occupancyTypes" - aria-label="<%= configFunctions.getConfigProperty("aliases.occupancy") %> Type Management"> + " + href="<%= urlPrefix %>/admin/contractTypes" + aria-label="Contract Type Management"> - <%= configFunctions.getConfigProperty("aliases.occupancy") %> Type Management + Contract Type Management
  • - " - href="<%= urlPrefix %>/admin/lotTypes" + " + href="<%= urlPrefix %>/admin/burialSiteTypes" aria-label="Burial Site Type Management"> Burial Site Type Management diff --git a/views/admin-contractTypes.ejs b/views/admin-contractTypes.ejs index aff7a36b..b2d0f944 100644 --- a/views/admin-contractTypes.ejs +++ b/views/admin-contractTypes.ejs @@ -16,7 +16,7 @@
  • - <%= configFunctions.getConfigProperty("aliases.occupancy") %> Type Management + Contract Type Management
    • @@ -25,13 +25,13 @@

    - <%= configFunctions.getConfigProperty("aliases.occupancy") %> Type Management + Contract Type Management

    -
    @@ -39,13 +39,13 @@
    -
    -
    +
    +
    -
    Date${los.escapedAliases.ExternalReceiptNumber}${sunrise.escapedAliases.ExternalReceiptNumber} Amount Options
    + + ${cityssm.escapeHTML((funeralHome.funeralHomeName ?? '') === '' ? '(No Name)' : funeralHome.funeralHomeName ?? '')} + + + ${(funeralHome.funeralHomeAddress1 ?? '') === '' + ? '' + : `${cityssm.escapeHTML(funeralHome.funeralHomeAddress1 ?? '')}
    `} + ${(funeralHome.funeralHomeAddress2 ?? '') === '' + ? '' + : `${cityssm.escapeHTML(funeralHome.funeralHomeAddress2 ?? '')}
    `} + ${funeralHome.funeralHomeCity || funeralHome.funeralHomeProvince + ? `${cityssm.escapeHTML(funeralHome.funeralHomeCity ?? '')}, ${cityssm.escapeHTML(funeralHome.funeralHomeProvince ?? '')}
    ` + : ''} + ${(funeralHome.funeralHomePostalCode ?? '') === '' + ? '' + : cityssm.escapeHTML(funeralHome.funeralHomePostalCode ?? '')} +     		+ ${cityssm.escapeHTML(funeralHome.funeralHomePhoneNumber ?? '')} +
    Funeral HomeAddressPhone Number
    + + ${cityssm.escapeHTML( + (funeralHome.funeralHomeName ?? '') === '' ? '(No Name)' : funeralHome.funeralHomeName ?? '' + )} + + + ${ + (funeralHome.funeralHomeAddress1 ?? '') === '' + ? '' + : `${cityssm.escapeHTML(funeralHome.funeralHomeAddress1 ?? '')}
    ` + } + ${ + (funeralHome.funeralHomeAddress2 ?? '') === '' + ? '' + : `${cityssm.escapeHTML(funeralHome.funeralHomeAddress2 ?? '')}
    ` + } + ${ + funeralHome.funeralHomeCity || funeralHome.funeralHomeProvince + ? `${cityssm.escapeHTML(funeralHome.funeralHomeCity ?? '')}, ${cityssm.escapeHTML(funeralHome.funeralHomeProvince ?? '')}
    ` + : '' + } + ${ + (funeralHome.funeralHomePostalCode ?? '') === '' + ? '' + : cityssm.escapeHTML(funeralHome.funeralHomePostalCode ?? '') + } +     		+ ${cityssm.escapeHTML(funeralHome.funeralHomePhoneNumber ?? '')} +
    Funeral HomeAddressPhone Number
    + }); + } + function renderWorkOrderTypes() { + const containerElement = document.querySelector('#container--workOrderTypes'); + if (workOrderTypes.length === 0) { + containerElement.innerHTML = `

    There are no active work order types.

    + return; + } + containerElement.innerHTML = ''; + for (const workOrderType of workOrderTypes) { + const tableRowElement = document.createElement('tr'); + tableRowElement.dataset.workOrderTypeId = + workOrderType.workOrderTypeId.toString(); + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = `
    @@ -135,7 +127,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
    - ${los.getMoveUpDownButtonFieldHTML('button--moveWorkOrderTypeUp', 'button--moveWorkOrderTypeDown', false)} + ${sunrise.getMoveUpDownButtonFieldHTML('button--moveWorkOrderTypeUp', 'button--moveWorkOrderTypeDown', false)}
    + }); + } + function renderWorkOrderMilestoneTypes() { + const containerElement = document.querySelector('#container--workOrderMilestoneTypes'); + if (workOrderMilestoneTypes.length === 0) { + containerElement.innerHTML = `

    There are no active work order milestone types.

    + return; + } + containerElement.innerHTML = ''; + for (const workOrderMilestoneType of workOrderMilestoneTypes) { + const tableRowElement = document.createElement('tr'); + tableRowElement.dataset.workOrderMilestoneTypeId = + workOrderMilestoneType.workOrderMilestoneTypeId.toString(); + // eslint-disable-next-line no-unsanitized/property, no-secrets/no-secrets + tableRowElement.innerHTML = ` - +
    - +
    - ${los.getMoveUpDownButtonFieldHTML('button--moveWorkOrderMilestoneTypeUp', 'button--moveWorkOrderMilestoneTypeDown', false)} + ${sunrise.getMoveUpDownButtonFieldHTML('button--moveWorkOrderMilestoneTypeUp', 'button--moveWorkOrderMilestoneTypeDown', false)}
    -
    + }); + } + function renderBurialSiteStatuses() { + const containerElement = document.querySelector('#container--burialSiteStatuses'); + if (burialSiteStatuses.length === 0) { + containerElement.innerHTML = `
    -

    There are no active ${los.escapedAliases.lot} statuses.

    +

    There are no active burial site statuses.

    + return; + } + containerElement.innerHTML = ''; + for (const burialSiteStatus of burialSiteStatuses) { + const tableRowElement = document.createElement('tr'); + tableRowElement.dataset.burialSiteStatusId = + burialSiteStatus.burialSiteStatusId.toString(); + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` - +
    - +
    - ${los.getMoveUpDownButtonFieldHTML('button--moveLotStatusUp', 'button--moveLotStatusDown', false)} + ${sunrise.getMoveUpDownButtonFieldHTML('button--moveBurialSiteStatusUp', 'button--moveBurialSiteStatusDown', false)}
    -
    -
    -

    There are no active ${los.escapedAliases.lot} ${los.escapedAliases.occupant} types.

    -
    -
    -
    -
    - -
    -
    -     		-
    -
    - fa- -
    -
    - -
    -
    - - - -
    -
    -     		-
    -
    - -
    -
    -     		- - - - - -
    -
    - ${los.getMoveUpDownButtonFieldHTML('button--moveLotOccupantTypeUp', 'button--moveLotOccupantTypeDown', false)} -
    -
    - -
    -
    -
    + if (workOrderTypes.length === 0) { + containerElement.innerHTML = `

    There are no active work order types.

    + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = `
    @@ -201,7 +190,7 @@ declare const bulmaJS: BulmaJS
    - ${los.getMoveUpDownButtonFieldHTML( + ${sunrise.getMoveUpDownButtonFieldHTML( 'button--moveWorkOrderTypeUp', 'button--moveWorkOrderTypeDown', false @@ -215,96 +204,139 @@ declare const bulmaJS: BulmaJS
    + if (workOrderMilestoneTypes.length === 0) { + containerElement.innerHTML = `

    There are no active work order milestone types.

    + // eslint-disable-next-line no-unsanitized/property, no-secrets/no-secrets + tableRowElement.innerHTML = ` - +
    - +
    - ${los.getMoveUpDownButtonFieldHTML( + ${sunrise.getMoveUpDownButtonFieldHTML( 'button--moveWorkOrderMilestoneTypeUp', 'button--moveWorkOrderMilestoneTypeDown', false )}
    -
    + if (burialSiteStatuses.length === 0) { + containerElement.innerHTML = `
    -

    There are no active ${los.escapedAliases.lot} statuses.

    +

    There are no active burial site statuses.

    + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` - +
    - +
    - ${los.getMoveUpDownButtonFieldHTML( - 'button--moveLotStatusUp', - 'button--moveLotStatusDown', + ${sunrise.getMoveUpDownButtonFieldHTML( + 'button--moveBurialSiteStatusUp', + 'button--moveBurialSiteStatusDown', false )}
    -
    -
    -

    There are no active ${los.escapedAliases.lot} ${los.escapedAliases.occupant} types.

    -
    -
    -
    -
    - -
    -
    -     		-
    -
    - fa- -
    -
    - -
    -
    - - - -
    -
    -     		-
    -
    - -
    -
    -     		- - - - - -
    -
    - ${los.getMoveUpDownButtonFieldHTML( - 'button--moveLotOccupantTypeUp', - 'button--moveLotOccupantTypeDown', - false - )} -
    -
    - -
    -
    -     		- ${cityssm.escapeHTML(contract.occupancyType ?? '')} + ${cityssm.escapeHTML(contract.contractType ?? '')}
    #${contract.contractId}     		- ${cityssm.escapeHTML(contract.occupancyType ?? '')} + ${cityssm.escapeHTML(contract.contractType ?? '')} ${cityssm.escapeHTML(contract.lotName ?? '')} - ${cityssm.escapeHTML(contract.occupancyType ?? '')} + ${cityssm.escapeHTML(contract.contractType ?? '')}
    #${contract.contractId}     		- ${cityssm.escapeHTML(contract.occupancyType ?? '')} + ${cityssm.escapeHTML(contract.contractType ?? '')}
    - - - - - - - - - <% for (const burialSiteStatus of burialSiteStatusSummary) { %> - - - - - - <% } %> - + + + + + + + + + <% for (const burialSiteStatus of burialSiteStatusSummary) { %> + + + + + + <% } %> +
    Status - Burial Site Count - Percentage
    - - <%= burialSiteStatus.burialSiteStatus %> - - - <%= burialSiteStatus.burialSiteCount %> - - <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% -
    Status + Burial Site Count + Percentage
    + + <%= burialSiteStatus.burialSiteStatus %> + + + <%= burialSiteStatus.burialSiteCount %> + + <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% +
    diff --git a/views/contract-edit.ejs b/views/contract-edit.ejs index 100dec15..10b497e5 100644 --- a/views/contract-edit.ejs +++ b/views/contract-edit.ejs @@ -4,29 +4,29 @@
    • Home
    • - + - <%= configFunctions.getConfigProperty("aliases.occupancies") %> + Contracts
      • <% if (!isCreate) { %>
    • - - <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= lotOccupancy.lotOccupancyId %>: <%= lotOccupancy.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %> + + Contract #<%= contract.contractId %>: <%= contract.burialSiteName || ("(No Burial Site)") %>
      • <% } %>
    • <% if (isCreate) { %> - Create a New <%= configFunctions.getConfigProperty("aliases.occupancy") %> Record + Create a New Contract <% } else { %> - Update <%= configFunctions.getConfigProperty("aliases.occupancy") %> + Update Contract <% } %>
      • @@ -35,11 +35,11 @@ <% if (isCreate) { %>

      - Create a New <%= configFunctions.getConfigProperty("aliases.occupancy") %> Record + Create a New Contract

      <% } else { %>

      - Update <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= lotOccupancy.lotOccupancyId %> + Update Contract #<%= contract.contractId %>

      <% } %> @@ -47,16 +47,16 @@
      <% if (!isCreate) { %> - <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= lotOccupancy.lotOccupancyId %>: - <%= lotOccupancy.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %> + Contract #<%= contract.contractId %>: + <%= contract.burialSiteName || ("(No Burial Site)") %> <% } %>
      - <% if (!isCreate && ContractTypePrints.length > 0) { %> - <% if (ContractTypePrints.length === 1) { %> + <% if (!isCreate && contractTypePrints.length > 0) { %> + <% if (contractTypePrints.length === 1) { %>
      - + Print @@ -73,10 +73,10 @@
      - <% for (const printName of ContractTypePrints) { %> + <% for (const printName of contractTypePrints) { %> <% const printConfig = printFunctions.getPrintConfig(printName); %> <% if (printConfig) { %> - + <%= printConfig.title %> @@ -90,7 +90,7 @@ <% } %> <% if (isCreate) { %>
      - + Cancel
      @@ -110,13 +110,13 @@
      - + - Copy <%= configFunctions.getConfigProperty("aliases.occupancy") %> Record as New + Copy Contract as New - + - Delete <%= configFunctions.getConfigProperty("aliases.occupancy") %> Record + Delete Contract
      @@ -124,12 +124,12 @@
      <% } %>
      - @@ -137,332 +137,273 @@
      -
      - + +
      - -
      -
      -
      - -
      -
      -
      - -
      + +
      +
      +
      + +
      +
      + +
      +
      - - -
      -
      - " id="lotOccupancy--lotName" type="button" value="<%= lotOccupancy.lotName || "(No " + configFunctions.getConfigProperty("aliases.lot") + ")" %>" - <%= (configFunctions.getConfigProperty("settings.lotOccupancy.lotIdIsRequired") ? " required" : "") %> - <%= (isCreate ? "" : " disabled readonly") %> /> -
      -
      - -
      -
      - -
      -
      - -
      + + +
      +
      + " + id="contract--burialSiteName" type="button" + value="<%= contract.burialSiteName || "(No Burial Site)" %>" + <%= (configFunctions.getConfigProperty("settings.contracts.burialSiteIdIsRequired") ? " required" : "") %> + <%= (isCreate ? "" : " disabled readonly") %> />
      +
      + +
      +
      + +
      +
      + +
      +
      -
      - -
      - - - - -
      +
      + +
      + + + +
      -
      - -
      - /> - - - -
      +
      +
      + +
      + /> + + +
      +
      -
      - <% if (isCreate) { %> -
      -

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

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

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

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

      + Select the contract type to load the available fields. +

      +
      + <% } else if (contract.contractFields.length === 0) { %> +
      +

      + The current contract type has no additional fields. +

      +
      + <% } else { %> + <% let contractTypeFieldIds = ""; %> + <% for (const contractField of contract.contractFields) { %> + <% contractTypeFieldIds += "," + contractField.contractTypeFieldId; %> +
      + +
      + <% if (contractField.fieldType === 'select' || (contractField.fieldValues ?? '') !== "") { %> + <% + const fieldValues = contractField.fieldValues.split("\n"); + let valueFound = false; + %> +
      +
      -
      - <% } %> - + <% } else { %> + + pattern="<%= contractField.pattern %>" + <% } %> + minlength="<%= contractField.minLength %>" + maxlength="<%= contractField.maxLength %>" + <%= contractField.isRequired ? " required" : "" %> /> + <% } %> +
      +
      <% } %> + + <% } %>
      - <% if (isCreate) { %> -
      -

      <%= configFunctions.getConfigProperty("aliases.occupant") %>

      -
      +
      + +
      +
      +
      +

      Purchaser

      +
      +
      + +
      + +
      +
      + +
      + +
      + +
      +
      +
      +
      + +
      +
      +
      -
      - -
      -
      - -
      -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      - -
      -
      -
      -
      -
      - -
      - " disabled /> -
      -
      -
      -
      -
      - -
      - " disabled /> -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      -
      - -
      - -
      +
      + +
      +
      +
      -
      -

      Additional <%= configFunctions.getConfigProperty("aliases.occupants").toLowerCase() %> can be added after the record has been created.

      +
      + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      - <% } %> +
      +
      +
      +

      Deceased

      + +
      +
      +

      Funeral Home

      + +
      +
      <% if (!isCreate) { %> -
      -
      -
      -
      -
      -

      - <%= configFunctions.getConfigProperty("aliases.occupants") %> -

      -
      -
      -
      -
      - -
      -
      - - - Export - -
      -
      -
      -
      -
      -
      -
      @@ -481,7 +422,7 @@
      -
      +
      <% @@ -505,7 +446,7 @@
      - <% if (lotOccupancy.workOrders.length === 0) { %> + <% if (contract.workOrders.length === 0) { %>

      There are no work orders associated with this record. @@ -521,7 +462,7 @@

    @@ -574,7 +515,7 @@ -
    +
    @@ -596,7 +537,7 @@
    -
    +
    @@ -606,32 +547,22 @@ - + <%- include('_footerB'); -%> diff --git a/views/contract-view.ejs b/views/contract-view.ejs index 9426b0af..f2d447d6 100644 --- a/views/contract-view.ejs +++ b/views/contract-view.ejs @@ -16,7 +16,7 @@
  • - <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= lotOccupancy.lotOccupancyId %>: <%= lotOccupancy.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %> + <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= contract.contractId %>: <%= contract.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %>
    • @@ -24,22 +24,22 @@

    <%= configFunctions.getConfigProperty("aliases.occupancy") %> - #<%= lotOccupancy.lotOccupancyId %>: - <%= lotOccupancy.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %> + #<%= contract.contractId %>: + <%= contract.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %>

    - <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= lotOccupancy.lotOccupancyId %>: - <%= lotOccupancy.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %> + <%= configFunctions.getConfigProperty("aliases.occupancy") %> #<%= contract.contractId %>: + <%= contract.lotName || ("(No " + configFunctions.getConfigProperty("aliases.lot") + ")") %>
    <% if (ContractTypePrints.length > 0) { %> <% if (ContractTypePrints.length === 1) { %>
    - + Print @@ -59,7 +59,7 @@ <% for (const printName of ContractTypePrints) { %> <% const printConfig = printFunctions.getPrintConfig(printName); %> <% if (printConfig) { %> - + <%= printConfig.title %> @@ -73,8 +73,8 @@ <% } %> <% if (user.userProperties.canUpdate) { %>
    - " - href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>/edit" + " + href="<%= urlPrefix %>/lotOccupancies/<%= contract.contractId %>/edit" accesskey="e"> Switch to Edit Mode @@ -90,22 +90,22 @@

    <%= configFunctions.getConfigProperty("aliases.occupancy") %> Type
    - <%= lotOccupancy.occupancyType %> + <%= contract.contractType %>

    Burial Site
    - <% if (lotOccupancy.lotId) { %> -     <%= lotOccupancy.lotName %> + <% if (contract.lotId) { %> + <%= contract.lotName %> <% } else { %> (No Burial Site) <% } %>

    <%= configFunctions.getConfigProperty("aliases.map") %>
    - <% if (lotOccupancy.mapId) { %> - <%= lotOccupancy.mapName %> + <% if (contract.mapId) { %> + <%= contract.mapName %> <% } else { %> (No <%= configFunctions.getConfigProperty("aliases.map") %>) <% } %> @@ -114,24 +114,24 @@

    <%= configFunctions.getConfigProperty("aliases.occupancyStartDate") %>
    - <%= lotOccupancy.occupancyStartDateString %> + <%= contract.occupancyStartDateString %>

    End Date
    - <% if (lotOccupancy.occupancyEndDateString === "") { %> + <% if (contract.occupancyEndDateString === "") { %> (No End Date) <% } else { %> - <%= lotOccupancy.occupancyEndDateString %> + <%= contract.occupancyEndDateString %> <% } %>

    - <% if (lotOccupancy.lotOccupancyFields.length > 0) { %> + <% if (contract.contractFields.length > 0) { %>
    - <% for (const lotOccupancyField of lotOccupancy.lotOccupancyFields) { %> + <% for (const contractField of contract.contractFields) { %>

    - <%= lotOccupancyField.occupancyTypeField %>
    - <% if (lotOccupancyField.lotOccupancyFieldValue) { %> - <%= lotOccupancyField.lotOccupancyFieldValue %> + <%= contractField.contractTypeField %>
    + <% if (contractField.contractFieldValue) { %> + <%= contractField.contractFieldValue %> <% } else { %> (No Value) <% } %> @@ -153,7 +153,7 @@

    - + Export @@ -162,7 +162,7 @@
    - <% if (lotOccupancy.lotOccupancyOccupants.length === 0) { %> + <% if (contract.contractOccupants.length === 0) { %>

    There are no <%= configFunctions.getConfigProperty("aliases.occupants").toLowerCase() %> @@ -180,37 +180,37 @@

    - <%= lotOccupancyOccupant.occupantName %> <%= lotOccupancyOccupant.occupantFamilyName %>
    + <%= contractOccupant.occupantName %> <%= contractOccupant.occupantFamilyName %>
    - - <%= lotOccupancyOccupant.lotOccupantType %> + + <%= contractOccupant.lotOccupantType %>     		- <% if (lotOccupancyOccupant.occupantAddress1) { %> - <%= lotOccupancyOccupant.occupantAddress1 %>
    + <% if (contractOccupant.occupantAddress1) { %> + <%= contractOccupant.occupantAddress1 %>
    <% } %> - <% if (lotOccupancyOccupant.occupantAddress2) { %> - <%= lotOccupancyOccupant.occupantAddress2 %>
    + <% if (contractOccupant.occupantAddress2) { %> + <%= contractOccupant.occupantAddress2 %>
    <% } %> - <% if (lotOccupancyOccupant.occupantCity) { %> - <%= lotOccupancyOccupant.occupantCity %>, + <% if (contractOccupant.occupantCity) { %> + <%= contractOccupant.occupantCity %>, <% } %> - <%= lotOccupancyOccupant.occupantProvince %>
    - <%= lotOccupancyOccupant.occupantPostalCode %> + <%= contractOccupant.occupantProvince %>
    + <%= contractOccupant.occupantPostalCode %>     		- <% if (lotOccupancyOccupant.occupantPhoneNumber) { %> - <%= lotOccupancyOccupant.occupantPhoneNumber %>
    + <% if (contractOccupant.occupantPhoneNumber) { %> + <%= contractOccupant.occupantPhoneNumber %>
    <% } %> - <%= lotOccupancyOccupant.occupantEmailAddress %> + <%= contractOccupant.occupantEmailAddress %>     		- - <%= lotOccupancyOccupant.occupantComment %> + + <%= contractOccupant.occupantComment %>
    <%= lotOccupancyComment.recordCreate_userName %><%= contractComment.recordCreate_userName %> - <%= lotOccupancyComment.lotOccupancyCommentDateString %> - <%= (lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : lotOccupancyComment.lotOccupancyCommentTimePeriodString) %> + <%= contractComment.contractCommentDateString %> + <%= (contractComment.contractCommentTime === 0 ? "" : contractComment.contractCommentTimePeriodString) %> <%= lotOccupancyComment.lotOccupancyComment %><%= contractComment.contractComment %>
    @@ -305,7 +305,7 @@

    Fees

    - <% if (lotOccupancy.lotOccupancyFees.length === 0) { %> + <% if (contract.contractFees.length === 0) { %>

    There are no fees applied to this <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> record. @@ -328,23 +328,23 @@

    "> - <%= lotOccupancyFee.feeName %>
    - <%= lotOccupancyFee.feeCategory %> +     		"> + <%= contractFee.feeName %>
    + <%= contractFee.feeCategory %>     		$<%= lotOccupancyFee.feeAmount.toFixed(2) %>$<%= contractFee.feeAmount.toFixed(2) %> ×<%= lotOccupancyFee.quantity %><%= contractFee.quantity %> =$<%= (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity).toFixed(2) %>$<%= (contractFee.feeAmount * contractFee.quantity).toFixed(2) %>
    <%= lotOccupancyTransaction.transactionDateString %><%= contractTransaction.transactionDateString %> - <% if (lotOccupancyTransaction.externalReceiptNumber !== '') { %> - <%= lotOccupancyTransaction.externalReceiptNumber %> + <% if (contractTransaction.externalReceiptNumber !== '') { %> + <%= contractTransaction.externalReceiptNumber %> <% if (configFunctions.getConfigProperty('settings.dynamicsGP.integrationIsEnabled')) { %> - <% if (lotOccupancyTransaction.dynamicsGPDocument === undefined) { %> + <% if (contractTransaction.dynamicsGPDocument === undefined) { %> - <% } else if (lotOccupancyTransaction.dynamicsGPDocument.documentTotal.toFixed(2) === lotOccupancyTransaction.transactionAmount.toFixed(2)) { %> + <% } else if (contractTransaction.dynamicsGPDocument.documentTotal.toFixed(2) === contractTransaction.transactionAmount.toFixed(2)) { %> <% } else { %> - - + + <% } %> <% } %>
    <% } %> - <%= lotOccupancyTransaction.transactionNote %> + <%= contractTransaction.transactionNote %>     		- $<%= lotOccupancyTransaction.transactionAmount.toFixed(2) %> + $<%= contractTransaction.transactionAmount.toFixed(2) %>
    @@ -173,11 +173,11 @@ <% - const field = lotOccupancy.lotOccupancyFields.find((possibleField) => { - return possibleField.occupancyTypeField === fieldName; + const field = contract.contractFields.find((possibleField) => { + return possibleField.contractTypeField === fieldName; }); %> - + <% } @@ -216,19 +216,19 @@
    <%= fieldName %>:<%= field?.lotOccupancyFieldValue ?? "" %> <%= field?.contractFieldValue ?? "" %> 
    - + - + <% - for (const field of lotOccupancy.lotOccupancyFields) { - if (!recipientFields.includes(field.occupancyTypeField) && field.lotOccupancyFieldValue) { + for (const field of contract.contractFields) { + if (!recipientFields.includes(field.contractTypeField) && field.contractFieldValue) { %> - - + + <% } @@ -245,7 +245,7 @@ let feeAmountTotal = 0; let taxAmountTotal = 0; %> - <% for (const fee of lotOccupancy.lotOccupancyFees) { %> + <% for (const fee of contract.contractFees) { %> <% if (currentFeeCategory !== fee.feeCategory) { %> diff --git a/views/print/pdf/workOrder.ejs b/views/print/pdf/workOrder.ejs index 26f4e92d..38e0cfae 100644 --- a/views/print/pdf/workOrder.ejs +++ b/views/print/pdf/workOrder.ejs @@ -49,12 +49,12 @@ <% for (const occupancy of workOrder.workOrderLotOccupancies) { %> - + - <% for (const lotOccupancyOccupant of lotOccupancy.lotOccupancyOccupants) { %> + <% for (const contractOccupant of contract.contractOccupants) { %> - - + + <% } %> @@ -98,7 +98,7 @@ <% } %> -<% if (lotOccupancy.lotOccupancyComments.length > 0) { %> +<% if (contract.contractComments.length > 0) { %>

    Comments

    @@ -111,14 +111,14 @@
    - <% for (const lotOccupancyComment of lotOccupancy.lotOccupancyComments) { %> + <% for (const contractComment of contract.contractComments) { %> - + - + <% } %> @@ -129,7 +129,7 @@

    Fees

    - <% if (lotOccupancy.lotOccupancyFees.length === 0) { %> + <% if (contract.contractFees.length === 0) { %>

    There are no fees applied to this <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> record. @@ -152,22 +152,22 @@

    - <% for (const lotOccupancyFee of lotOccupancy.lotOccupancyFees) { %> + <% for (const contractFee of contract.contractFees) { %> <% - feeAmountTotal += (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity); - taxAmountTotal += (lotOccupancyFee.taxAmount * lotOccupancyFee.quantity); + feeAmountTotal += (contractFee.feeAmount * contractFee.quantity); + taxAmountTotal += (contractFee.taxAmount * contractFee.quantity); %> - - <% if (lotOccupancyFee.quantity !== 1) { %> - + <% if (contractFee.quantity !== 1) { %> + - + <% } %> - + <% } %> @@ -192,7 +192,7 @@

    Transactions

    - <% if (lotOccupancy.lotOccupancyTransactions.length === 0) { %> + <% if (contract.contractTransactions.length === 0) { %>

    There are no transactions associated with this <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> record. @@ -208,15 +208,15 @@

    - <% for (const lotOccupancyTransaction of lotOccupancy.lotOccupancyTransactions) { %> + <% for (const contractTransaction of contract.contractTransactions) { %> - + <% } %> diff --git a/views/report-search.ejs b/views/report-search.ejs index 08a87310..5ff731d8 100644 --- a/views/report-search.ejs +++ b/views/report-search.ejs @@ -153,7 +153,7 @@ - +
    @@ -164,12 +164,12 @@

    Transactions by Date

    -
    - +
    - +
    @@ -345,7 +345,7 @@

    Full LotOccupancyComments Table

     - +
    @@ -356,7 +356,7 @@

    Full LotOccupancyFees Table

     - +
    @@ -367,7 +367,7 @@

    Full LotOccupancyFields Table

     - +
    @@ -378,7 +378,7 @@

    Full LotOccupancyOccupants Table

     - +
    @@ -564,7 +564,7 @@

    Occupancy (<%= configFunctions.getConfigProperty("aliases.occupancy") %>) Tables

    -     +
    @@ -572,10 +572,10 @@ CSV
    -

    Full OccupancyTypes Table

    +

    Full ContractTypes Table

     - +
    @@ -583,7 +583,7 @@ CSV
    -

    Full OccupancyTypeFields Table

    +

    Full ContractTypeFields Table

     diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs index f1b9dfe9..47225341 100644 --- a/views/workOrder-view.ejs +++ b/views/workOrder-view.ejs @@ -170,8 +170,8 @@
    - <% for (const lotOccupancy of workOrder.workOrderLotOccupancies) { %> - <% const isActive = !(lotOccupancy.occupancyEndDate && lotOccupancy.occupancyEndDate < currentDate); %> + <% for (const contract of workOrder.workOrderLotOccupancies) { %> + <% const isActive = !(contract.occupancyEndDate && contract.occupancyEndDate < currentDate); %> - +
    <%= configFunctions.getConfigProperty("aliases.map") %><%= lotOccupancy.mapName ?? '(No ' + configFunctions.getConfigProperty("aliases.map") + ')' %><%= contract.mapName ?? '(No ' + configFunctions.getConfigProperty("aliases.map") + ')' %>
    Burial Site<%= lotOccupancy.lotName ?? '(No ' + configFunctions.getConfigProperty("aliases.lot") + ')' %><%= contract.lotName ?? '(No ' + configFunctions.getConfigProperty("aliases.lot") + ')' %>
    <%= field.occupancyTypeField %><%= field.lotOccupancyFieldValue %><%= field.contractTypeField %><%= field.contractFieldValue %>
    @@ -292,7 +292,7 @@
    Balance Owing - $<%= (feeAmountTotal + taxAmountTotal - lotOccupancyFunctions.getTransactionTotal(lotOccupancy)).toFixed(2) %> + $<%= (feeAmountTotal + taxAmountTotal - contractFunctions.getTransactionTotal(contract)).toFixed(2) %>
    <%= occupancy.occupancyType %><%= occupancy.contractType %> <%= occupancy.lotName %> <%= occupancy.occupancyStartDateString %> <%= occupancy.occupancyStartEndString %> - <% for (const occupant of occupancy.lotOccupancyOccupants) { %> + <% for (const occupant of occupancy.contractOccupants) { %> <%= occupant.lotOccupantType %>: <%= occupant.occupantName %> <%= occupant.occupantFamilyName %> diff --git a/views/print/screen/contract.ejs b/views/print/screen/contract.ejs index 06d61ecd..b4360179 100644 --- a/views/print/screen/contract.ejs +++ b/views/print/screen/contract.ejs @@ -9,22 +9,22 @@

    <%= configFunctions.getConfigProperty("aliases.occupancy") %> Type
    - <%= lotOccupancy.occupancyType %> + <%= contract.contractType %>

    Burial Site
    - <% if (lotOccupancy.lotId) { %> - <%= lotOccupancy.lotName %> + <% if (contract.lotId) { %> + <%= contract.lotName %> <% } else { %> (No Burial Site) <% } %>

    <%= configFunctions.getConfigProperty("aliases.map") %>
    - <% if (lotOccupancy.mapId) { %> - <%= lotOccupancy.mapName %> + <% if (contract.mapId) { %> + <%= contract.mapName %> <% } else { %> (No <%= configFunctions.getConfigProperty("aliases.map") %>) <% } %> @@ -33,19 +33,19 @@

    <%= configFunctions.getConfigProperty("aliases.occupancyStartDate") %>
    - <%= lotOccupancy.occupancyStartDateString %> + <%= contract.occupancyStartDateString %>

    End Date
    - <%= (lotOccupancy.occupancyEndDateString === "" ? "(No End Date)" : lotOccupancy.occupancyEndDateString) %> + <%= (contract.occupancyEndDateString === "" ? "(No End Date)" : contract.occupancyEndDateString) %>

    - <% if (lotOccupancy.lotOccupancyFields.length > 0) { %> + <% if (contract.contractFields.length > 0) { %>
    - <% for (const lotOccupancyField of lotOccupancy.lotOccupancyFields) { %> + <% for (const contractField of contract.contractFields) { %>

    - <%= lotOccupancyField.occupancyTypeField %>
    - <%= lotOccupancyField.lotOccupancyFieldValue || "(No Value)" %> + <%= contractField.contractTypeField %>
    + <%= contractField.contractFieldValue || "(No Value)" %>

    <% } %>
    @@ -55,7 +55,7 @@

    <%= configFunctions.getConfigProperty("aliases.occupants") %>

    - <% if (lotOccupancy.lotOccupancyOccupants.length === 0) { %> + <% if (contract.contractOccupants.length === 0) { %>

    There are no <%= configFunctions.getConfigProperty("aliases.occupants").toLowerCase() %> @@ -73,23 +73,23 @@

    <%= lotOccupancyOccupant.lotOccupantType %><%= lotOccupancyOccupant.occupantName %> <%= lotOccupancyOccupant.occupantFamilyName %><%= contractOccupant.lotOccupantType %><%= contractOccupant.occupantName %> <%= contractOccupant.occupantFamilyName %> - <%= lotOccupancyOccupant.occupantAddress1 %>
    - <% if (lotOccupancyOccupant.occupantAddress2 && lotOccupancyOccupant.occupantAddress2 !== "") { %> - <%= lotOccupancyOccupant.occupantAddress2 %>
    + <%= contractOccupant.occupantAddress1 %>
    + <% if (contractOccupant.occupantAddress2 && contractOccupant.occupantAddress2 !== "") { %> + <%= contractOccupant.occupantAddress2 %>
    <% } %> - <% if (lotOccupancyOccupant.occupantCity) { %> - <%= lotOccupancyOccupant.occupantCity %>, + <% if (contractOccupant.occupantCity) { %> + <%= contractOccupant.occupantCity %>, <% } %> - <%= lotOccupancyOccupant.occupantProvince %>
    - <%= lotOccupancyOccupant.occupantPostalCode %> + <%= contractOccupant.occupantProvince %>
    + <%= contractOccupant.occupantPostalCode %>     		- <%= lotOccupancyOccupant.occupantPhoneNumber %> + <%= contractOccupant.occupantPhoneNumber %>
    <%= lotOccupancyComment.recordCreate_userName %><%= contractComment.recordCreate_userName %> - <%= lotOccupancyComment.lotOccupancyCommentDateString %> - <%= (lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : lotOccupancyComment.lotOccupancyCommentTimeString) %> + <%= contractComment.contractCommentDateString %> + <%= (contractComment.contractCommentTime === 0 ? "" : contractComment.contractCommentTimeString) %> <%= lotOccupancyComment.lotOccupancyComment %><%= contractComment.contractComment %>
    "> - <%= lotOccupancyFee.feeName %> + "> + <%= contractFee.feeName %> $<%= lotOccupancyFee.feeAmount.toFixed(2) %>$<%= contractFee.feeAmount.toFixed(2) %> ×<%= lotOccupancyFee.quantity %><%= contractFee.quantity %> =$<%= (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity).toFixed(2) %>$<%= (contractFee.feeAmount * contractFee.quantity).toFixed(2) %>
    <%= lotOccupancyTransaction.transactionDateString %><%= contractTransaction.transactionDateString %> - <%= lotOccupancyTransaction.externalReceiptNumber %>
    - <%= lotOccupancyTransaction.transactionNote %> + <%= contractTransaction.externalReceiptNumber %>
    + <%= contractTransaction.transactionNote %>     		- $<%= lotOccupancyTransaction.transactionAmount.toFixed(2) %> + $<%= contractTransaction.transactionAmount.toFixed(2) %>
    <% if (isActive) { %> @@ -182,36 +182,36 @@ - <%= lotOccupancy.occupancyType %> + href="<%= urlPrefix %>/lotOccupancies/<%= contract.contractId %>"> + <%= contract.contractType %>
    - #<%= lotOccupancy.lotOccupancyId %> + #<%= contract.contractId %>     		- <% if (lotOccupancy.lotId) { %> - <%= lotOccupancy.lotName %> + <% if (contract.lotId) { %> + <%= contract.lotName %> <% } else { %> (No Burial Site) <% } %> <%= lotOccupancy.occupancyStartDateString %><%= contract.occupancyStartDateString %> - <% if (lotOccupancy.occupancyEndDate) { %> - <%= lotOccupancy.occupancyEndDateString %> + <% if (contract.occupancyEndDate) { %> + <%= contract.occupancyEndDateString %> <% } else { %> (No End Date) <% } %> - <% if (lotOccupancy.lotOccupancyOccupants.length === 0) { %> + <% if (contract.contractOccupants.length === 0) { %> ( No <%= configFunctions.getConfigProperty("aliases.occupants") %>) <% } else { %>
      - <% for (const occupant of lotOccupancy.lotOccupancyOccupants) { %> + <% for (const occupant of contract.contractOccupants) { %>