From 7dc95ef90f353535be7866bfce1b599454351e6b Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 7 Mar 2025 15:42:38 -0500 Subject: [PATCH] major refactoring mostly finished, see #1 --- app.js | 1 - app.ts | 5 - ....d.ts => burialSiteTypeManagement.cy.d.ts} | 0 ...t.cy.js => burialSiteTypeManagement.cy.js} | 6 +- ...t.cy.ts => burialSiteTypeManagement.cy.ts} | 6 +- ...ccupancies.cy.d.ts => burialSites.cy.d.ts} | 0 .../{lots.cy.js => burialSites.cy.js} | 10 +- .../{lots.cy.ts => burialSites.cy.ts} | 10 +- .../{lots.cy.d.ts => contracts.cy.d.ts} | 0 .../{lotOccupancies.cy.js => contracts.cy.js} | 10 +- .../{lotOccupancies.cy.ts => contracts.cy.ts} | 10 +- cypress/e2e/02-update/workOrders.cy.js | 2 +- cypress/e2e/02-update/workOrders.cy.ts | 2 +- database/addContractComment.js | 2 +- database/addContractComment.ts | 4 +- database/addContractInterment.d.ts | 16 + database/addContractInterment.js | 30 + database/addContractInterment.ts | 77 + database/addWorkOrderBurialSite.d.ts | 4 +- database/addWorkOrderBurialSite.ts | 4 +- database/addWorkOrderComment.d.ts | 2 +- database/addWorkOrderComment.js | 6 +- database/addWorkOrderComment.ts | 8 +- database/addWorkOrderContract.d.ts | 4 +- database/addWorkOrderContract.ts | 4 +- database/deleteContractFee.js | 2 +- database/deleteContractFee.ts | 2 +- database/getContract.js | 3 + database/getContract.ts | 3 + database/getContracts.d.ts | 6 +- database/getContracts.js | 22 +- database/getContracts.ts | 36 +- database/getWorkOrderComments.js | 12 +- database/getWorkOrderComments.ts | 12 +- database/getWorkOrders.d.ts | 2 +- database/getWorkOrders.js | 20 +- database/getWorkOrders.ts | 24 +- database/initializeDatabase.js | 2 +- database/initializeDatabase.ts | 2 +- database/updateContractInterment.d.ts | 17 + database/updateContractInterment.js | 32 + database/updateContractInterment.ts | 74 + database/updateLotOccupancyOccupant.d.ts | 16 - database/updateLotOccupancyOccupant.js | 25 - database/updateLotOccupancyOccupant.ts | 66 - database/updateWorkOrderComment.d.ts | 6 +- database/updateWorkOrderComment.js | 8 +- database/updateWorkOrderComment.ts | 18 +- .../doAddContractInterment.d.ts | 3 + .../contracts-post/doAddContractInterment.js | 10 + .../contracts-post/doAddContractInterment.ts | 22 + .../doDeleteContractInterment.d.ts | 5 + .../doDeleteContractInterment.js | 10 + .../doDeleteContractInterment.ts | 28 + .../doUpdateContractInterment.d.ts | 3 + .../doUpdateContractInterment.js | 10 + .../doUpdateContractInterment.ts | 24 + handlers/workOrders-get/edit.js | 4 +- handlers/workOrders-get/edit.ts | 4 +- .../doAddWorkOrderBurialSite.js | 4 +- .../doAddWorkOrderBurialSite.ts | 4 +- helpers/functions.dynamicsGP.js | 6 +- helpers/functions.dynamicsGP.ts | 6 +- helpers/functions.sqlFilters.d.ts | 6 +- helpers/functions.sqlFilters.js | 26 +- helpers/functions.sqlFilters.ts | 34 +- package-lock.json | 27 +- package.json | 1 - public/html/adminFees-addFee.html | 20 +- public/html/adminFees-editFee.html | 7 +- ...l => burialSite-editBurialSiteStatus.html} | 20 +- ...dComment.html => contract-addComment.html} | 6 +- ...pancy-addFee.html => contract-addFee.html} | 0 public/html/contract-addInterment.html | 203 +++ ...tion.html => contract-addTransaction.html} | 0 ...der.html => contract-createWorkOrder.html} | 0 ...Comment.html => contract-editComment.html} | 18 +- ...ity.html => contract-editFeeQuantity.html} | 0 public/html/contract-editInterment.html | 172 +- ...ion.html => contract-editTransaction.html} | 0 ...tity.html => contract-setFeeQuantity.html} | 0 public/html/lotOccupancy-addOccupant.html | 318 ---- ...dLot.html => workOrder-addBurialSite.html} | 19 +- public/html/workOrder-addComment.html | 6 +- ...upancy.html => workOrder-addContract.html} | 19 +- public/html/workOrder-editComment.html | 18 +- public/javascripts/burialSite.edit.js | 35 +- public/javascripts/burialSite.edit.ts | 35 +- public/javascripts/burialSite.search.js | 12 +- public/javascripts/burialSite.search.ts | 12 +- public/javascripts/burialSiteTypes.admin.js | 30 +- public/javascripts/burialSiteTypes.admin.ts | 30 +- public/javascripts/contract.edit.js | 989 +---------- public/javascripts/contract.edit.ts | 1546 +---------------- public/javascripts/contract.editComments.d.ts | 1 + public/javascripts/contract.editComments.js | 185 ++ public/javascripts/contract.editComments.ts | 299 ++++ public/javascripts/contract.editFees.d.ts | 1 + public/javascripts/contract.editFees.js | 668 +++++++ public/javascripts/contract.editFees.ts | 1057 +++++++++++ .../javascripts/contract.editInterments.d.ts | 1 + public/javascripts/contract.editInterments.js | 257 +++ public/javascripts/contract.editInterments.ts | 375 ++++ .../javascripts/contract.editWorkOrders.d.ts | 1 + public/javascripts/contract.editWorkOrders.js | 70 + public/javascripts/contract.editWorkOrders.ts | 120 ++ public/javascripts/contract.search.js | 14 +- public/javascripts/contract.search.ts | 14 +- public/javascripts/database.admin.js | 6 +- public/javascripts/database.admin.ts | 8 +- public/javascripts/fees.admin.js | 79 +- public/javascripts/fees.admin.ts | 80 +- public/javascripts/main.js | 70 - public/javascripts/main.ts | 103 -- public/javascripts/types.d.ts | 1 - public/javascripts/types.ts | 3 - public/javascripts/workOrder.edit.js | 786 +-------- public/javascripts/workOrder.edit.ts | 1196 +------------ .../javascripts/workOrder.editComments.d.ts | 1 + public/javascripts/workOrder.editComments.js | 181 ++ public/javascripts/workOrder.editComments.ts | 294 ++++ public/javascripts/workOrder.editRelated.d.ts | 1 + public/javascripts/workOrder.editRelated.js | 547 ++++++ public/javascripts/workOrder.editRelated.ts | 856 +++++++++ .../workOrder.milestoneCalendar.js | 15 +- .../workOrder.milestoneCalendar.ts | 19 +- public/javascripts/workOrder.outlook.js | 4 +- public/javascripts/workOrder.outlook.ts | 12 +- public/javascripts/workOrder.search.js | 51 +- public/javascripts/workOrder.search.ts | 59 +- public/javascripts/workOrder.view.js | 60 +- public/javascripts/workOrder.view.ts | 21 +- routes/contracts.js | 7 + routes/contracts.ts | 58 +- temp/legacy.importFromCSV.js | 2 +- temp/legacy.importFromCSV.ts | 2 +- test/functions.js | 16 +- test/functions.ts | 16 +- types/recordTypes.d.ts | 5 + types/recordTypes.ts | 5 + views/_footerA.ejs | 1 - views/admin-fees.ejs | 4 +- views/contract-edit.ejs | 7 + views/contract-view.ejs | 40 +- views/print/pdf/ssm.cemetery.burialPermit.ejs | 62 +- views/print/pdf/ssm.cemetery.contract.ejs | 83 +- views/print/pdf/workOrder.ejs | 36 +- views/workOrder-edit.ejs | 358 ++-- views/workOrder-search.ejs | 215 ++- views/workOrder-view.ejs | 207 ++- 150 files changed, 6706 insertions(+), 6319 deletions(-) rename cypress/e2e/01-admin/{lotTypeManagement.cy.d.ts => burialSiteTypeManagement.cy.d.ts} (100%) rename cypress/e2e/01-admin/{lotTypeManagement.cy.js => burialSiteTypeManagement.cy.js} (66%) rename cypress/e2e/01-admin/{lotTypeManagement.cy.ts => burialSiteTypeManagement.cy.ts} (65%) rename cypress/e2e/02-update/{lotOccupancies.cy.d.ts => burialSites.cy.d.ts} (100%) rename cypress/e2e/02-update/{lots.cy.js => burialSites.cy.js} (65%) rename cypress/e2e/02-update/{lots.cy.ts => burialSites.cy.ts} (63%) rename cypress/e2e/02-update/{lots.cy.d.ts => contracts.cy.d.ts} (100%) rename cypress/e2e/02-update/{lotOccupancies.cy.js => contracts.cy.js} (63%) rename cypress/e2e/02-update/{lotOccupancies.cy.ts => contracts.cy.ts} (61%) create mode 100644 database/addContractInterment.d.ts create mode 100644 database/addContractInterment.js create mode 100644 database/addContractInterment.ts create mode 100644 database/updateContractInterment.d.ts create mode 100644 database/updateContractInterment.js create mode 100644 database/updateContractInterment.ts delete mode 100644 database/updateLotOccupancyOccupant.d.ts delete mode 100644 database/updateLotOccupancyOccupant.js delete mode 100644 database/updateLotOccupancyOccupant.ts create mode 100644 handlers/contracts-post/doAddContractInterment.d.ts create mode 100644 handlers/contracts-post/doAddContractInterment.js create mode 100644 handlers/contracts-post/doAddContractInterment.ts create mode 100644 handlers/contracts-post/doDeleteContractInterment.d.ts create mode 100644 handlers/contracts-post/doDeleteContractInterment.js create mode 100644 handlers/contracts-post/doDeleteContractInterment.ts create mode 100644 handlers/contracts-post/doUpdateContractInterment.d.ts create mode 100644 handlers/contracts-post/doUpdateContractInterment.js create mode 100644 handlers/contracts-post/doUpdateContractInterment.ts rename public/html/{burialSite-editLotStatus.html => burialSite-editBurialSiteStatus.html} (66%) rename public/html/{lotOccupancy-addComment.html => contract-addComment.html} (88%) rename public/html/{lotOccupancy-addFee.html => contract-addFee.html} (100%) create mode 100644 public/html/contract-addInterment.html rename public/html/{lotOccupancy-addTransaction.html => contract-addTransaction.html} (100%) rename public/html/{lotOccupancy-createWorkOrder.html => contract-createWorkOrder.html} (100%) rename public/html/{lotOccupancy-editComment.html => contract-editComment.html} (82%) rename public/html/{lotOccupancy-editFeeQuantity.html => contract-editFeeQuantity.html} (100%) rename public/html/{lotOccupancy-editTransaction.html => contract-editTransaction.html} (100%) rename public/html/{lotOccupancy-setFeeQuantity.html => contract-setFeeQuantity.html} (100%) delete mode 100644 public/html/lotOccupancy-addOccupant.html rename public/html/{workOrder-addLot.html => workOrder-addBurialSite.html} (76%) rename public/html/{workOrder-addLotOccupancy.html => workOrder-addContract.html} (80%) create mode 100644 public/javascripts/contract.editComments.d.ts create mode 100644 public/javascripts/contract.editComments.js create mode 100644 public/javascripts/contract.editComments.ts create mode 100644 public/javascripts/contract.editFees.d.ts create mode 100644 public/javascripts/contract.editFees.js create mode 100644 public/javascripts/contract.editFees.ts create mode 100644 public/javascripts/contract.editInterments.d.ts create mode 100644 public/javascripts/contract.editInterments.js create mode 100644 public/javascripts/contract.editInterments.ts create mode 100644 public/javascripts/contract.editWorkOrders.d.ts create mode 100644 public/javascripts/contract.editWorkOrders.js create mode 100644 public/javascripts/contract.editWorkOrders.ts create mode 100644 public/javascripts/workOrder.editComments.d.ts create mode 100644 public/javascripts/workOrder.editComments.js create mode 100644 public/javascripts/workOrder.editComments.ts create mode 100644 public/javascripts/workOrder.editRelated.d.ts create mode 100644 public/javascripts/workOrder.editRelated.js create mode 100644 public/javascripts/workOrder.editRelated.ts diff --git a/app.js b/app.js index 9c740bb0..cf2905da 100644 --- a/app.js +++ b/app.js @@ -75,7 +75,6 @@ if (urlPrefix !== '') { debug(`urlPrefix = ${urlPrefix}`); } app.use(urlPrefix, express.static(path.join('public'))); -app.use(`${urlPrefix}/lib/bulma-calendar`, express.static(path.join('node_modules', 'bulma-calendar', 'dist'))); app.use(`${urlPrefix}/lib/cityssm-bulma-js/bulma-js.js`, express.static(path.join('node_modules', '@cityssm', 'bulma-js', 'dist', 'bulma-js.js'))); app.use(`${urlPrefix}/lib/cityssm-bulma-webapp-js`, express.static(path.join('node_modules', '@cityssm', 'bulma-webapp-js', 'dist'))); app.use(`${urlPrefix}/lib/fa`, express.static(path.join('node_modules', '@fortawesome', 'fontawesome-free'))); diff --git a/app.ts b/app.ts index 753dc21f..bed9a32d 100644 --- a/app.ts +++ b/app.ts @@ -104,11 +104,6 @@ if (urlPrefix !== '') { app.use(urlPrefix, express.static(path.join('public'))) -app.use( - `${urlPrefix}/lib/bulma-calendar`, - express.static(path.join('node_modules', 'bulma-calendar', 'dist')) -) - app.use( `${urlPrefix}/lib/cityssm-bulma-js/bulma-js.js`, express.static( diff --git a/cypress/e2e/01-admin/lotTypeManagement.cy.d.ts b/cypress/e2e/01-admin/burialSiteTypeManagement.cy.d.ts similarity index 100% rename from cypress/e2e/01-admin/lotTypeManagement.cy.d.ts rename to cypress/e2e/01-admin/burialSiteTypeManagement.cy.d.ts diff --git a/cypress/e2e/01-admin/lotTypeManagement.cy.js b/cypress/e2e/01-admin/burialSiteTypeManagement.cy.js similarity index 66% rename from cypress/e2e/01-admin/lotTypeManagement.cy.js rename to cypress/e2e/01-admin/burialSiteTypeManagement.cy.js index 36c6b284..d87360e1 100644 --- a/cypress/e2e/01-admin/lotTypeManagement.cy.js +++ b/cypress/e2e/01-admin/burialSiteTypeManagement.cy.js @@ -1,11 +1,11 @@ import { testAdmin } from '../../../test/_globals.js'; import { login, logout } from '../../support/index.js'; -describe('Admin - Lot Type Management', () => { +describe('Admin - Burial Site Type Management', () => { beforeEach('Loads page', () => { logout(); login(testAdmin); - cy.visit('/admin/lotTypes'); - cy.location('pathname').should('equal', '/admin/lotTypes'); + cy.visit('/admin/burialSiteTypes'); + cy.location('pathname').should('equal', '/admin/burialSiteTypes'); }); afterEach(logout); it('Has no detectable accessibility issues', () => { diff --git a/cypress/e2e/01-admin/lotTypeManagement.cy.ts b/cypress/e2e/01-admin/burialSiteTypeManagement.cy.ts similarity index 65% rename from cypress/e2e/01-admin/lotTypeManagement.cy.ts rename to cypress/e2e/01-admin/burialSiteTypeManagement.cy.ts index 585ff19d..fc19595d 100644 --- a/cypress/e2e/01-admin/lotTypeManagement.cy.ts +++ b/cypress/e2e/01-admin/burialSiteTypeManagement.cy.ts @@ -1,12 +1,12 @@ import { testAdmin } from '../../../test/_globals.js' import { login, logout } from '../../support/index.js' -describe('Admin - Lot Type Management', () => { +describe('Admin - Burial Site Type Management', () => { beforeEach('Loads page', () => { logout() login(testAdmin) - cy.visit('/admin/lotTypes') - cy.location('pathname').should('equal', '/admin/lotTypes') + cy.visit('/admin/burialSiteTypes') + cy.location('pathname').should('equal', '/admin/burialSiteTypes') }) afterEach(logout) diff --git a/cypress/e2e/02-update/lotOccupancies.cy.d.ts b/cypress/e2e/02-update/burialSites.cy.d.ts similarity index 100% rename from cypress/e2e/02-update/lotOccupancies.cy.d.ts rename to cypress/e2e/02-update/burialSites.cy.d.ts diff --git a/cypress/e2e/02-update/lots.cy.js b/cypress/e2e/02-update/burialSites.cy.js similarity index 65% rename from cypress/e2e/02-update/lots.cy.js rename to cypress/e2e/02-update/burialSites.cy.js index 8ae70571..c91154b3 100644 --- a/cypress/e2e/02-update/lots.cy.js +++ b/cypress/e2e/02-update/burialSites.cy.js @@ -1,17 +1,17 @@ import { testUpdate } from '../../../test/_globals.js'; import { login, logout } from '../../support/index.js'; -describe('Update - Lots', () => { +describe('Update - Burial Sites', () => { beforeEach('Loads page', () => { logout(); login(testUpdate); }); afterEach(logout); - it('Has a "Create" link on the Lot Search', () => { - cy.visit('/lots'); - cy.location('pathname').should('equal', '/lots'); + it('Has a "Create" link on the Burial Site Search', () => { + cy.visit('/burialSites'); + cy.location('pathname').should('equal', '/burialSites'); cy.get("a[href$='/burialSites/new']").should('exist'); }); - describe('Update a New Lot', () => { + describe('Creates a New Burial Site', () => { it('Has no detectable accessibility issues', () => { cy.visit('/burialSites/new'); cy.injectAxe(); diff --git a/cypress/e2e/02-update/lots.cy.ts b/cypress/e2e/02-update/burialSites.cy.ts similarity index 63% rename from cypress/e2e/02-update/lots.cy.ts rename to cypress/e2e/02-update/burialSites.cy.ts index dee30068..67c1833e 100644 --- a/cypress/e2e/02-update/lots.cy.ts +++ b/cypress/e2e/02-update/burialSites.cy.ts @@ -1,7 +1,7 @@ import { testUpdate } from '../../../test/_globals.js' import { login, logout } from '../../support/index.js' -describe('Update - Lots', () => { +describe('Update - Burial Sites', () => { beforeEach('Loads page', () => { logout() login(testUpdate) @@ -9,13 +9,13 @@ describe('Update - Lots', () => { afterEach(logout) - it('Has a "Create" link on the Lot Search', () => { - cy.visit('/lots') - cy.location('pathname').should('equal', '/lots') + it('Has a "Create" link on the Burial Site Search', () => { + cy.visit('/burialSites') + cy.location('pathname').should('equal', '/burialSites') cy.get("a[href$='/burialSites/new']").should('exist') }) - describe('Update a New Lot', () => { + describe('Creates a New Burial Site', () => { it('Has no detectable accessibility issues', () => { cy.visit('/burialSites/new') cy.injectAxe() diff --git a/cypress/e2e/02-update/lots.cy.d.ts b/cypress/e2e/02-update/contracts.cy.d.ts similarity index 100% rename from cypress/e2e/02-update/lots.cy.d.ts rename to cypress/e2e/02-update/contracts.cy.d.ts diff --git a/cypress/e2e/02-update/lotOccupancies.cy.js b/cypress/e2e/02-update/contracts.cy.js similarity index 63% rename from cypress/e2e/02-update/lotOccupancies.cy.js rename to cypress/e2e/02-update/contracts.cy.js index 069ffb32..974a824a 100644 --- a/cypress/e2e/02-update/lotOccupancies.cy.js +++ b/cypress/e2e/02-update/contracts.cy.js @@ -1,17 +1,17 @@ import { testUpdate } from '../../../test/_globals.js'; import { login, logout } from '../../support/index.js'; -describe('Update - Lot Occupancies', () => { +describe('Update - Contracts', () => { beforeEach(() => { logout(); login(testUpdate); }); afterEach(logout); - it('Has a "Create" link on the Lot Occupancy Search', () => { - cy.visit('/lotOccupancies'); - cy.location('pathname').should('equal', '/lotOccupancies'); + it('Has a "Create" link on the Contract Search', () => { + cy.visit('/contracts'); + cy.location('pathname').should('equal', '/contracts'); cy.get("a[href$='/contracts/new']").should('exist'); }); - describe('Update a New Lot Occupancy', () => { + describe('Creates a New Contract', () => { it('Has no detectable accessibility issues', () => { cy.visit('/contracts/new'); cy.injectAxe(); diff --git a/cypress/e2e/02-update/lotOccupancies.cy.ts b/cypress/e2e/02-update/contracts.cy.ts similarity index 61% rename from cypress/e2e/02-update/lotOccupancies.cy.ts rename to cypress/e2e/02-update/contracts.cy.ts index 14501c2d..4ae0e462 100644 --- a/cypress/e2e/02-update/lotOccupancies.cy.ts +++ b/cypress/e2e/02-update/contracts.cy.ts @@ -1,7 +1,7 @@ import { testUpdate } from '../../../test/_globals.js' import { login, logout } from '../../support/index.js' -describe('Update - Lot Occupancies', () => { +describe('Update - Contracts', () => { beforeEach(() => { logout() login(testUpdate) @@ -9,13 +9,13 @@ describe('Update - Lot Occupancies', () => { afterEach(logout) - it('Has a "Create" link on the Lot Occupancy Search', () => { - cy.visit('/lotOccupancies') - cy.location('pathname').should('equal', '/lotOccupancies') + it('Has a "Create" link on the Contract Search', () => { + cy.visit('/contracts') + cy.location('pathname').should('equal', '/contracts') cy.get("a[href$='/contracts/new']").should('exist') }) - describe('Update a New Lot Occupancy', () => { + describe('Creates a New Contract', () => { it('Has no detectable accessibility issues', () => { cy.visit('/contracts/new') cy.injectAxe() diff --git a/cypress/e2e/02-update/workOrders.cy.js b/cypress/e2e/02-update/workOrders.cy.js index a7aab9ab..831058ac 100644 --- a/cypress/e2e/02-update/workOrders.cy.js +++ b/cypress/e2e/02-update/workOrders.cy.js @@ -11,7 +11,7 @@ describe('Update - Work Orders', () => { cy.location('pathname').should('equal', '/workOrders'); cy.get("a[href$='/workOrders/new']").should('exist'); }); - describe('Update a New Work Order', () => { + describe('Creates a New Work Order', () => { it('Has no detectable accessibility issues', () => { cy.visit('/workOrders/new'); cy.location('pathname').should('equal', '/workOrders/new'); diff --git a/cypress/e2e/02-update/workOrders.cy.ts b/cypress/e2e/02-update/workOrders.cy.ts index 9d1e2436..2674498e 100644 --- a/cypress/e2e/02-update/workOrders.cy.ts +++ b/cypress/e2e/02-update/workOrders.cy.ts @@ -15,7 +15,7 @@ describe('Update - Work Orders', () => { cy.get("a[href$='/workOrders/new']").should('exist') }) - describe('Update a New Work Order', () => { + describe('Creates a New Work Order', () => { it('Has no detectable accessibility issues', () => { cy.visit('/workOrders/new') cy.location('pathname').should('equal', '/workOrders/new') diff --git a/database/addContractComment.js b/database/addContractComment.js index c9122197..9e224735 100644 --- a/database/addContractComment.js +++ b/database/addContractComment.js @@ -14,7 +14,7 @@ export default async function addContractComment(commentForm, user) { } const database = await acquireConnection(); const result = database - .prepare(`insert into BurialSiteContactComments ( + .prepare(`insert into ContractComments ( contractId, commentDate, commentTime, comment, diff --git a/database/addContractComment.ts b/database/addContractComment.ts index 7a5f5c97..1075ec2e 100644 --- a/database/addContractComment.ts +++ b/database/addContractComment.ts @@ -11,7 +11,7 @@ import { acquireConnection } from './pool.js' export interface AddContractCommentForm { contractId: string | number - commentDateString?: DateString + commentDateString?: DateString commentTimeString?: TimeString comment: string } @@ -41,7 +41,7 @@ export default async function addContractComment( const result = database .prepare( - `insert into BurialSiteContactComments ( + `insert into ContractComments ( contractId, commentDate, commentTime, comment, diff --git a/database/addContractInterment.d.ts b/database/addContractInterment.d.ts new file mode 100644 index 00000000..d0a2355e --- /dev/null +++ b/database/addContractInterment.d.ts @@ -0,0 +1,16 @@ +import { type DateString } from '@cityssm/utils-datetime'; +export interface AddForm { + contractId: string | number; + deceasedName: string; + deceasedAddress1: string; + deceasedAddress2: string; + deceasedCity: string; + deceasedProvince: string; + deceasedPostalCode: string; + birthDateString: DateString | ''; + birthPlace: string; + deathDateString: DateString | ''; + deathPlace: string; + intermentContainerTypeId: string | number; +} +export default function addContractInterment(contractForm: AddForm, user: User): Promise; diff --git a/database/addContractInterment.js b/database/addContractInterment.js new file mode 100644 index 00000000..20002000 --- /dev/null +++ b/database/addContractInterment.js @@ -0,0 +1,30 @@ +import { dateStringToInteger } from '@cityssm/utils-datetime'; +import { acquireConnection } from './pool.js'; +export default async function addContractInterment(contractForm, user) { + const database = await acquireConnection(); + const maxIntermentNumber = (database + .prepare(`select max(intermentNumber) as maxIntermentNumber + from ContractInterments + where contractId = ?`) + .pluck() + .get(contractForm.contractId) ?? 0); + const newIntermentNumber = maxIntermentNumber + 1; + const rightNowMillis = Date.now(); + database + .prepare(`insert into ContractInterments + (contractId, intermentNumber, + deceasedName, deceasedAddress1, deceasedAddress2, deceasedCity, deceasedProvince, deceasedPostalCode, + birthDate, birthPlace, deathDate, deathPlace, intermentContainerTypeId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) + .run(contractForm.contractId, newIntermentNumber, contractForm.deceasedName, contractForm.deceasedAddress1, contractForm.deceasedAddress2, contractForm.deceasedCity, contractForm.deceasedProvince, contractForm.deceasedPostalCode, contractForm.birthDateString === '' + ? undefined + : dateStringToInteger(contractForm.birthDateString), contractForm.birthPlace, contractForm.deathDateString === '' + ? undefined + : dateStringToInteger(contractForm.deathDateString), contractForm.deathPlace, contractForm.intermentContainerTypeId === '' + ? undefined + : contractForm.intermentContainerTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis); + database.release(); + return newIntermentNumber; +} diff --git a/database/addContractInterment.ts b/database/addContractInterment.ts new file mode 100644 index 00000000..5e4b6d1b --- /dev/null +++ b/database/addContractInterment.ts @@ -0,0 +1,77 @@ +import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' + +import { acquireConnection } from './pool.js' + +export interface AddForm { + contractId: string | number + deceasedName: string + deceasedAddress1: string + deceasedAddress2: string + deceasedCity: string + deceasedProvince: string + deceasedPostalCode: string + birthDateString: DateString | '' + birthPlace: string + deathDateString: DateString | '' + deathPlace: string + intermentContainerTypeId: string | number +} + +export default async function addContractInterment( + contractForm: AddForm, + user: User +): Promise { + const database = await acquireConnection() + + const maxIntermentNumber = (database + .prepare( + `select max(intermentNumber) as maxIntermentNumber + from ContractInterments + where contractId = ?` + ) + .pluck() + .get(contractForm.contractId) ?? 0) as number + + const newIntermentNumber = maxIntermentNumber + 1 + const rightNowMillis = Date.now() + + database + .prepare( + `insert into ContractInterments + (contractId, intermentNumber, + deceasedName, deceasedAddress1, deceasedAddress2, deceasedCity, deceasedProvince, deceasedPostalCode, + birthDate, birthPlace, deathDate, deathPlace, intermentContainerTypeId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` + ) + .run( + contractForm.contractId, + newIntermentNumber, + contractForm.deceasedName, + contractForm.deceasedAddress1, + contractForm.deceasedAddress2, + contractForm.deceasedCity, + contractForm.deceasedProvince, + contractForm.deceasedPostalCode, + contractForm.birthDateString === '' + ? undefined + : dateStringToInteger(contractForm.birthDateString), + contractForm.birthPlace, + contractForm.deathDateString === '' + ? undefined + : dateStringToInteger(contractForm.deathDateString), + contractForm.deathPlace, + contractForm.intermentContainerTypeId === '' + ? undefined + : contractForm.intermentContainerTypeId, + user.userName, + rightNowMillis, + user.userName, + rightNowMillis + ) + + database.release() + + return newIntermentNumber +} diff --git a/database/addWorkOrderBurialSite.d.ts b/database/addWorkOrderBurialSite.d.ts index 2f84e34b..0d57c515 100644 --- a/database/addWorkOrderBurialSite.d.ts +++ b/database/addWorkOrderBurialSite.d.ts @@ -1,5 +1,5 @@ -export interface AddWorkOrderLotForm { +export interface AddForm { workOrderId: number | string; burialSiteId: number | string; } -export default function addWorkOrderBurialSite(workOrderLotForm: AddWorkOrderLotForm, user: User): Promise; +export default function addWorkOrderBurialSite(workOrderLotForm: AddForm, user: User): Promise; diff --git a/database/addWorkOrderBurialSite.ts b/database/addWorkOrderBurialSite.ts index 72682563..44f44c04 100644 --- a/database/addWorkOrderBurialSite.ts +++ b/database/addWorkOrderBurialSite.ts @@ -1,12 +1,12 @@ import { acquireConnection } from './pool.js' -export interface AddWorkOrderLotForm { +export interface AddForm { workOrderId: number | string burialSiteId: number | string } export default async function addWorkOrderBurialSite( - workOrderLotForm: AddWorkOrderLotForm, + workOrderLotForm: AddForm, user: User ): Promise { const database = await acquireConnection() diff --git a/database/addWorkOrderComment.d.ts b/database/addWorkOrderComment.d.ts index f9b4c357..a37c0583 100644 --- a/database/addWorkOrderComment.d.ts +++ b/database/addWorkOrderComment.d.ts @@ -1,5 +1,5 @@ export interface AddWorkOrderCommentForm { workOrderId: string; - workOrderComment: string; + comment: string; } export default function addWorkOrderComment(workOrderCommentForm: AddWorkOrderCommentForm, user: User): Promise; diff --git a/database/addWorkOrderComment.js b/database/addWorkOrderComment.js index cf90b964..7dda5538 100644 --- a/database/addWorkOrderComment.js +++ b/database/addWorkOrderComment.js @@ -6,12 +6,12 @@ export default async function addWorkOrderComment(workOrderCommentForm, user) { const result = database .prepare(`insert into WorkOrderComments ( workOrderId, - workOrderCommentDate, workOrderCommentTime, - workOrderComment, + commentDate, commentTime, + comment, recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?)`) - .run(workOrderCommentForm.workOrderId, dateToInteger(rightNow), dateToTimeInteger(rightNow), workOrderCommentForm.workOrderComment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); + .run(workOrderCommentForm.workOrderId, dateToInteger(rightNow), dateToTimeInteger(rightNow), workOrderCommentForm.comment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); database.release(); return result.lastInsertRowid; } diff --git a/database/addWorkOrderComment.ts b/database/addWorkOrderComment.ts index 1d5ca2c5..5b7d81db 100644 --- a/database/addWorkOrderComment.ts +++ b/database/addWorkOrderComment.ts @@ -4,7 +4,7 @@ import { acquireConnection } from './pool.js' export interface AddWorkOrderCommentForm { workOrderId: string - workOrderComment: string + comment: string } export default async function addWorkOrderComment( @@ -19,8 +19,8 @@ export default async function addWorkOrderComment( .prepare( `insert into WorkOrderComments ( workOrderId, - workOrderCommentDate, workOrderCommentTime, - workOrderComment, + commentDate, commentTime, + comment, recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?)` @@ -29,7 +29,7 @@ export default async function addWorkOrderComment( workOrderCommentForm.workOrderId, dateToInteger(rightNow), dateToTimeInteger(rightNow), - workOrderCommentForm.workOrderComment, + workOrderCommentForm.comment, user.userName, rightNow.getTime(), user.userName, diff --git a/database/addWorkOrderContract.d.ts b/database/addWorkOrderContract.d.ts index acf7a95a..c1b66cb9 100644 --- a/database/addWorkOrderContract.d.ts +++ b/database/addWorkOrderContract.d.ts @@ -1,6 +1,6 @@ import type { PoolConnection } from 'better-sqlite-pool'; -export interface AddWorkOrderContractOccupancyForm { +export interface AddForm { workOrderId: number | string; contractId: number | string; } -export default function addWorkOrderContract(addForm: AddWorkOrderContractOccupancyForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addWorkOrderContract(addForm: AddForm, user: User, connectedDatabase?: PoolConnection): Promise; diff --git a/database/addWorkOrderContract.ts b/database/addWorkOrderContract.ts index 5d3c3c6b..58710071 100644 --- a/database/addWorkOrderContract.ts +++ b/database/addWorkOrderContract.ts @@ -2,13 +2,13 @@ import type { PoolConnection } from 'better-sqlite-pool' import { acquireConnection } from './pool.js' -export interface AddWorkOrderContractOccupancyForm { +export interface AddForm { workOrderId: number | string contractId: number | string } export default async function addWorkOrderContract( - addForm: AddWorkOrderContractOccupancyForm, + addForm: AddForm, user: User, connectedDatabase?: PoolConnection ): Promise { diff --git a/database/deleteContractFee.js b/database/deleteContractFee.js index 8ad368f5..39c306d7 100644 --- a/database/deleteContractFee.js +++ b/database/deleteContractFee.js @@ -2,7 +2,7 @@ import { acquireConnection } from './pool.js'; export default async function deleteContractFee(contractId, feeId, user) { const database = await acquireConnection(); const result = database - .prepare(`update BurialSteContractFees + .prepare(`update ContractFees set recordDelete_userName = ?, recordDelete_timeMillis = ? where contractId = ? diff --git a/database/deleteContractFee.ts b/database/deleteContractFee.ts index ebf26015..737b8458 100644 --- a/database/deleteContractFee.ts +++ b/database/deleteContractFee.ts @@ -9,7 +9,7 @@ export default async function deleteContractFee( const result = database .prepare( - `update BurialSteContractFees + `update ContractFees set recordDelete_userName = ?, recordDelete_timeMillis = ? where contractId = ? diff --git a/database/getContract.js b/database/getContract.js index f6b02241..ffcfa9d2 100644 --- a/database/getContract.js +++ b/database/getContract.js @@ -21,12 +21,15 @@ export default async function getContract(contractId, connectedDatabase) { o.purchaserCity, o.purchaserProvince, o.purchaserPostalCode, o.purchaserPhoneNumber, o.purchaserEmail, o.purchaserRelationship, o.funeralHomeId, o.funeralDirectorName, + f.funeralHomeName, f.funeralHomeAddress1, f.funeralHomeAddress2, + f.funeralHomeCity, f.funeralHomeProvince, f.funeralHomePostalCode, o.funeralDate, userFn_dateIntegerToString(o.funeralDate) as funeralDateString, o.funeralTime, userFn_timeIntegerToString(o.funeralTime) as funeralTimeString, o.committalTypeId, c.committalType, o.recordUpdate_timeMillis from Contracts o left join ContractTypes t on o.contractTypeId = t.contractTypeId + left join FuneralHomes f on o.funeralHomeId = f.funeralHomeId left join CommittalTypes c on o.committalTypeId = c.committalTypeId left join BurialSites l on o.burialSiteId = l.burialSiteId left join Cemeteries m on l.cemeteryId = m.cemeteryId diff --git a/database/getContract.ts b/database/getContract.ts index 00e28b5a..f274c2cc 100644 --- a/database/getContract.ts +++ b/database/getContract.ts @@ -32,12 +32,15 @@ export default async function getContract( o.purchaserCity, o.purchaserProvince, o.purchaserPostalCode, o.purchaserPhoneNumber, o.purchaserEmail, o.purchaserRelationship, o.funeralHomeId, o.funeralDirectorName, + f.funeralHomeName, f.funeralHomeAddress1, f.funeralHomeAddress2, + f.funeralHomeCity, f.funeralHomeProvince, f.funeralHomePostalCode, o.funeralDate, userFn_dateIntegerToString(o.funeralDate) as funeralDateString, o.funeralTime, userFn_timeIntegerToString(o.funeralTime) as funeralTimeString, o.committalTypeId, c.committalType, o.recordUpdate_timeMillis from Contracts o left join ContractTypes t on o.contractTypeId = t.contractTypeId + left join FuneralHomes f on o.funeralHomeId = f.funeralHomeId left join CommittalTypes c on o.committalTypeId = c.committalTypeId left join BurialSites l on o.burialSiteId = l.burialSiteId left join Cemeteries m on l.cemeteryId = m.cemeteryId diff --git a/database/getContracts.d.ts b/database/getContracts.d.ts index b6dd8b37..71fa231b 100644 --- a/database/getContracts.d.ts +++ b/database/getContracts.d.ts @@ -3,10 +3,10 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { Contract } from '../types/recordTypes.js'; export interface GetContractsFilters { burialSiteId?: number | string; - occupancyTime?: '' | 'past' | 'current' | 'future'; + contractTime?: '' | 'past' | 'current' | 'future'; contractStartDateString?: DateString; - occupancyEffectiveDateString?: string; - occupantName?: string; + contractEffectiveDateString?: string; + deceasedName?: string; contractTypeId?: number | string; cemeteryId?: number | string; burialSiteNameSearchType?: '' | 'startsWith' | 'endsWith'; diff --git a/database/getContracts.js b/database/getContracts.js index 71245b84..c31816e1 100644 --- a/database/getContracts.js +++ b/database/getContracts.js @@ -1,7 +1,7 @@ import { dateIntegerToString, dateStringToInteger, timeIntegerToString } from '@cityssm/utils-datetime'; import { getConfigProperty } from '../helpers/config.helpers.js'; import { getContractTypeById } from '../helpers/functions.cache.js'; -import { getBurialSiteNameWhereClause, getOccupancyTimeWhereClause, getOccupantNameWhereClause } from '../helpers/functions.sqlFilters.js'; +import { getBurialSiteNameWhereClause, getContractTimeWhereClause, getDeceasedNameWhereClause, } from '../helpers/functions.sqlFilters.js'; import getContractFees from './getContractFees.js'; import getContractInterments from './getContractInterments.js'; import getContractTransactions from './getContractTransactions.js'; @@ -16,31 +16,31 @@ function buildWhereClause(filters) { const burialSiteNameFilters = getBurialSiteNameWhereClause(filters.burialSiteName, filters.burialSiteNameSearchType ?? '', 'l'); sqlWhereClause += burialSiteNameFilters.sqlWhereClause; sqlParameters.push(...burialSiteNameFilters.sqlParameters); - const occupantNameFilters = getOccupantNameWhereClause(filters.occupantName, 'o'); - if (occupantNameFilters.sqlParameters.length > 0) { + const deceasedNameFilters = getDeceasedNameWhereClause(filters.deceasedName, 'o'); + if (deceasedNameFilters.sqlParameters.length > 0) { sqlWhereClause += ` and o.contractId in ( - select contractId from LotOccupancyOccupants o + select contractId from ContractInterments o where recordDelete_timeMillis is null - ${occupantNameFilters.sqlWhereClause})`; - sqlParameters.push(...occupantNameFilters.sqlParameters); + ${deceasedNameFilters.sqlWhereClause})`; + sqlParameters.push(...deceasedNameFilters.sqlParameters); } if ((filters.contractTypeId ?? '') !== '') { sqlWhereClause += ' and o.contractTypeId = ?'; sqlParameters.push(filters.contractTypeId); } - const occupancyTimeFilters = getOccupancyTimeWhereClause(filters.occupancyTime ?? '', 'o'); - sqlWhereClause += occupancyTimeFilters.sqlWhereClause; - sqlParameters.push(...occupancyTimeFilters.sqlParameters); + const contractTimeFilters = getContractTimeWhereClause(filters.contractTime ?? '', 'o'); + sqlWhereClause += contractTimeFilters.sqlWhereClause; + sqlParameters.push(...contractTimeFilters.sqlParameters); if ((filters.contractStartDateString ?? '') !== '') { sqlWhereClause += ' and o.contractStartDate = ?'; sqlParameters.push(dateStringToInteger(filters.contractStartDateString)); } - if ((filters.occupancyEffectiveDateString ?? '') !== '') { + if ((filters.contractEffectiveDateString ?? '') !== '') { sqlWhereClause += ` and ( o.contractEndDate is null or (o.contractStartDate <= ? and o.contractEndDate >= ?) )`; - sqlParameters.push(dateStringToInteger(filters.occupancyEffectiveDateString), dateStringToInteger(filters.occupancyEffectiveDateString)); + sqlParameters.push(dateStringToInteger(filters.contractEffectiveDateString), dateStringToInteger(filters.contractEffectiveDateString)); } if ((filters.cemeteryId ?? '') !== '') { sqlWhereClause += ' and l.cemeteryId = ?'; diff --git a/database/getContracts.ts b/database/getContracts.ts index 5976085e..a48948bd 100644 --- a/database/getContracts.ts +++ b/database/getContracts.ts @@ -10,8 +10,8 @@ import { getConfigProperty } from '../helpers/config.helpers.js' import { getContractTypeById } from '../helpers/functions.cache.js' import { getBurialSiteNameWhereClause, - getOccupancyTimeWhereClause, - getOccupantNameWhereClause + getContractTimeWhereClause, + getDeceasedNameWhereClause, } from '../helpers/functions.sqlFilters.js' import type { Contract } from '../types/recordTypes.js' @@ -22,10 +22,10 @@ import { acquireConnection } from './pool.js' export interface GetContractsFilters { burialSiteId?: number | string - occupancyTime?: '' | 'past' | 'current' | 'future' + contractTime?: '' | 'past' | 'current' | 'future' contractStartDateString?: DateString - occupancyEffectiveDateString?: string - occupantName?: string + contractEffectiveDateString?: string + deceasedName?: string contractTypeId?: number | string cemeteryId?: number | string burialSiteNameSearchType?: '' | 'startsWith' | 'endsWith' @@ -64,16 +64,16 @@ function buildWhereClause(filters: GetContractsFilters): { sqlWhereClause += burialSiteNameFilters.sqlWhereClause sqlParameters.push(...burialSiteNameFilters.sqlParameters) - const occupantNameFilters = getOccupantNameWhereClause( - filters.occupantName, + const deceasedNameFilters = getDeceasedNameWhereClause( + filters.deceasedName, 'o' ) - if (occupantNameFilters.sqlParameters.length > 0) { + if (deceasedNameFilters.sqlParameters.length > 0) { sqlWhereClause += ` and o.contractId in ( - select contractId from LotOccupancyOccupants o + select contractId from ContractInterments o where recordDelete_timeMillis is null - ${occupantNameFilters.sqlWhereClause})` - sqlParameters.push(...occupantNameFilters.sqlParameters) + ${deceasedNameFilters.sqlWhereClause})` + sqlParameters.push(...deceasedNameFilters.sqlParameters) } if ((filters.contractTypeId ?? '') !== '') { @@ -81,12 +81,12 @@ function buildWhereClause(filters: GetContractsFilters): { sqlParameters.push(filters.contractTypeId) } - const occupancyTimeFilters = getOccupancyTimeWhereClause( - filters.occupancyTime ?? '', + const contractTimeFilters = getContractTimeWhereClause( + filters.contractTime ?? '', 'o' ) - sqlWhereClause += occupancyTimeFilters.sqlWhereClause - sqlParameters.push(...occupancyTimeFilters.sqlParameters) + sqlWhereClause += contractTimeFilters.sqlWhereClause + sqlParameters.push(...contractTimeFilters.sqlParameters) if ((filters.contractStartDateString ?? '') !== '') { sqlWhereClause += ' and o.contractStartDate = ?' @@ -95,14 +95,14 @@ function buildWhereClause(filters: GetContractsFilters): { ) } - if ((filters.occupancyEffectiveDateString ?? '') !== '') { + if ((filters.contractEffectiveDateString ?? '') !== '') { sqlWhereClause += ` and ( o.contractEndDate is null or (o.contractStartDate <= ? and o.contractEndDate >= ?) )` sqlParameters.push( - dateStringToInteger(filters.occupancyEffectiveDateString as DateString), - dateStringToInteger(filters.occupancyEffectiveDateString as DateString) + dateStringToInteger(filters.contractEffectiveDateString as DateString), + dateStringToInteger(filters.contractEffectiveDateString as DateString) ) } diff --git a/database/getWorkOrderComments.js b/database/getWorkOrderComments.js index 87dbcaa5..36ca3cf8 100644 --- a/database/getWorkOrderComments.js +++ b/database/getWorkOrderComments.js @@ -7,16 +7,16 @@ export default async function getWorkOrderComments(workOrderId, connectedDatabas database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString); const workOrderComments = database .prepare(`select workOrderCommentId, - workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, - workOrderCommentTime, - userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, - userFn_timeIntegerToPeriodString(workOrderCommentTime) as workOrderCommentTimePeriodString, - workOrderComment, + commentDate, userFn_dateIntegerToString(commentDate) as commentDateString, + commentTime, + userFn_timeIntegerToString(commentTime) as commentTimeString, + userFn_timeIntegerToPeriodString(commentTime) as commentTimePeriodString, + comment, recordCreate_userName, recordUpdate_userName from WorkOrderComments where recordDelete_timeMillis is null and workOrderId = ? - order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`) + order by commentDate desc, commentTime desc, workOrderCommentId desc`) .all(workOrderId); if (connectedDatabase === undefined) { database.release(); diff --git a/database/getWorkOrderComments.ts b/database/getWorkOrderComments.ts index 4acb3afe..eae61b9d 100644 --- a/database/getWorkOrderComments.ts +++ b/database/getWorkOrderComments.ts @@ -25,16 +25,16 @@ export default async function getWorkOrderComments( const workOrderComments = database .prepare( `select workOrderCommentId, - workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, - workOrderCommentTime, - userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, - userFn_timeIntegerToPeriodString(workOrderCommentTime) as workOrderCommentTimePeriodString, - workOrderComment, + commentDate, userFn_dateIntegerToString(commentDate) as commentDateString, + commentTime, + userFn_timeIntegerToString(commentTime) as commentTimeString, + userFn_timeIntegerToPeriodString(commentTime) as commentTimePeriodString, + comment, recordCreate_userName, recordUpdate_userName from WorkOrderComments where recordDelete_timeMillis is null and workOrderId = ? - order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc` + order by commentDate desc, commentTime desc, workOrderCommentId desc` ) .all(workOrderId) as WorkOrderComment[] diff --git a/database/getWorkOrders.d.ts b/database/getWorkOrders.d.ts index dce60c27..f7e832bb 100644 --- a/database/getWorkOrders.d.ts +++ b/database/getWorkOrders.d.ts @@ -4,7 +4,7 @@ export interface GetWorkOrdersFilters { workOrderTypeId?: number | string; workOrderOpenStatus?: '' | 'open' | 'closed'; workOrderOpenDateString?: string; - occupantName?: string; + deceasedName?: string; burialSiteName?: string; contractId?: number | string; } diff --git a/database/getWorkOrders.js b/database/getWorkOrders.js index 7f8de6c9..df3f780b 100644 --- a/database/getWorkOrders.js +++ b/database/getWorkOrders.js @@ -1,7 +1,7 @@ import { dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetime'; -import { getBurialSiteNameWhereClause, getOccupantNameWhereClause } from '../helpers/functions.sqlFilters.js'; -import getContracts from './getContracts.js'; +import { getBurialSiteNameWhereClause, getDeceasedNameWhereClause } from '../helpers/functions.sqlFilters.js'; import getBurialSites from './getBurialSites.js'; +import getContracts from './getContracts.js'; import getWorkOrderComments from './getWorkOrderComments.js'; import getWorkOrderMilestones from './getWorkOrderMilestones.js'; import { acquireConnection } from './pool.js'; @@ -24,17 +24,17 @@ function buildWhereClause(filters) { sqlWhereClause += ' and w.workOrderOpenDate = ?'; sqlParameters.push(dateStringToInteger(filters.workOrderOpenDateString)); } - const occupantNameFilters = getOccupantNameWhereClause(filters.occupantName, 'o'); - if (occupantNameFilters.sqlParameters.length > 0) { + const deceasedNameFilters = getDeceasedNameWhereClause(filters.deceasedName, 'o'); + if (deceasedNameFilters.sqlParameters.length > 0) { sqlWhereClause += ` and w.workOrderId in ( select workOrderId from WorkOrderContracts o where recordDelete_timeMillis is null and o.contractId in ( - select contractId from LotOccupancyOccupants o where recordDelete_timeMillis is null - ${occupantNameFilters.sqlWhereClause} + select contractId from ContractInterments o where recordDelete_timeMillis is null + ${deceasedNameFilters.sqlWhereClause} ))`; - sqlParameters.push(...occupantNameFilters.sqlParameters); + sqlParameters.push(...deceasedNameFilters.sqlParameters); } const burialSiteNameFilters = getBurialSiteNameWhereClause(filters.burialSiteName, '', 'l'); if (burialSiteNameFilters.sqlParameters.length > 0) { @@ -119,7 +119,7 @@ export async function getWorkOrders(filters, options, connectedDatabase) { w.workOrderCloseDate, userFn_dateIntegerToString(w.workOrderCloseDate) as workOrderCloseDateString, ifnull(m.workOrderMilestoneCount, 0) as workOrderMilestoneCount, ifnull(m.workOrderMilestoneCompletionCount, 0) as workOrderMilestoneCompletionCount, - ifnull(l.workOrderLotCount, 0) as workOrderLotCount + ifnull(l.workOrderBurialSiteCount, 0) as workOrderBurialSiteCount from WorkOrders w left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId left join ( @@ -130,8 +130,8 @@ export async function getWorkOrders(filters, options, connectedDatabase) { where recordDelete_timeMillis is null group by workOrderId) m on w.workOrderId = m.workOrderId left join ( - select workOrderId, count(burialSiteId) as workOrderLotCount - from WorkOrderLots + select workOrderId, count(burialSiteId) as workOrderBurialSiteCount + from WorkOrderBurialSites where recordDelete_timeMillis is null group by workOrderId) l on w.workOrderId = l.workOrderId ${sqlWhereClause} diff --git a/database/getWorkOrders.ts b/database/getWorkOrders.ts index fcafa68d..b21255d2 100644 --- a/database/getWorkOrders.ts +++ b/database/getWorkOrders.ts @@ -7,12 +7,12 @@ import type { PoolConnection } from 'better-sqlite-pool' import { getBurialSiteNameWhereClause, - getOccupantNameWhereClause + getDeceasedNameWhereClause } from '../helpers/functions.sqlFilters.js' import type { WorkOrder } from '../types/recordTypes.js' -import getContracts from './getContracts.js' import getBurialSites from './getBurialSites.js' +import getContracts from './getContracts.js' import getWorkOrderComments from './getWorkOrderComments.js' import getWorkOrderMilestones from './getWorkOrderMilestones.js' import { acquireConnection } from './pool.js' @@ -21,7 +21,7 @@ export interface GetWorkOrdersFilters { workOrderTypeId?: number | string workOrderOpenStatus?: '' | 'open' | 'closed' workOrderOpenDateString?: string - occupantName?: string + deceasedName?: string burialSiteName?: string contractId?: number | string } @@ -61,20 +61,20 @@ function buildWhereClause(filters: GetWorkOrdersFilters): { ) } - const occupantNameFilters = getOccupantNameWhereClause( - filters.occupantName, + const deceasedNameFilters = getDeceasedNameWhereClause( + filters.deceasedName, 'o' ) - if (occupantNameFilters.sqlParameters.length > 0) { + if (deceasedNameFilters.sqlParameters.length > 0) { sqlWhereClause += ` and w.workOrderId in ( select workOrderId from WorkOrderContracts o where recordDelete_timeMillis is null and o.contractId in ( - select contractId from LotOccupancyOccupants o where recordDelete_timeMillis is null - ${occupantNameFilters.sqlWhereClause} + select contractId from ContractInterments o where recordDelete_timeMillis is null + ${deceasedNameFilters.sqlWhereClause} ))` - sqlParameters.push(...occupantNameFilters.sqlParameters) + sqlParameters.push(...deceasedNameFilters.sqlParameters) } const burialSiteNameFilters = getBurialSiteNameWhereClause(filters.burialSiteName, '', 'l') @@ -202,7 +202,7 @@ export async function getWorkOrders( w.workOrderCloseDate, userFn_dateIntegerToString(w.workOrderCloseDate) as workOrderCloseDateString, ifnull(m.workOrderMilestoneCount, 0) as workOrderMilestoneCount, ifnull(m.workOrderMilestoneCompletionCount, 0) as workOrderMilestoneCompletionCount, - ifnull(l.workOrderLotCount, 0) as workOrderLotCount + ifnull(l.workOrderBurialSiteCount, 0) as workOrderBurialSiteCount from WorkOrders w left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId left join ( @@ -213,8 +213,8 @@ export async function getWorkOrders( where recordDelete_timeMillis is null group by workOrderId) m on w.workOrderId = m.workOrderId left join ( - select workOrderId, count(burialSiteId) as workOrderLotCount - from WorkOrderLots + select workOrderId, count(burialSiteId) as workOrderBurialSiteCount + from WorkOrderBurialSites where recordDelete_timeMillis is null group by workOrderId) l on w.workOrderId = l.workOrderId ${sqlWhereClause} diff --git a/database/initializeDatabase.js b/database/initializeDatabase.js index a0eeb8c1..53bdff0c 100644 --- a/database/initializeDatabase.js +++ b/database/initializeDatabase.js @@ -231,7 +231,7 @@ const createStatements = [ contractId integer not null, intermentNumber integer not null, - deceasedName varchar(50) not null, + deceasedName varchar(200) not null, isCremated bit not null default 0, deceasedAddress1 varchar(50), diff --git a/database/initializeDatabase.ts b/database/initializeDatabase.ts index afa23ee8..9d1bb88a 100644 --- a/database/initializeDatabase.ts +++ b/database/initializeDatabase.ts @@ -270,7 +270,7 @@ const createStatements = [ contractId integer not null, intermentNumber integer not null, - deceasedName varchar(50) not null, + deceasedName varchar(200) not null, isCremated bit not null default 0, deceasedAddress1 varchar(50), diff --git a/database/updateContractInterment.d.ts b/database/updateContractInterment.d.ts new file mode 100644 index 00000000..ef9b3de6 --- /dev/null +++ b/database/updateContractInterment.d.ts @@ -0,0 +1,17 @@ +import { type DateString } from '@cityssm/utils-datetime'; +export interface UpdateForm { + contractId: string | number; + intermentNumber: string | number; + deceasedName: string; + deceasedAddress1: string; + deceasedAddress2: string; + deceasedCity: string; + deceasedProvince: string; + deceasedPostalCode: string; + birthDateString: DateString | ''; + birthPlace: string; + deathDateString: DateString | ''; + deathPlace: string; + intermentContainerTypeId: string | number; +} +export default function updateContractInterment(contractForm: UpdateForm, user: User): Promise; diff --git a/database/updateContractInterment.js b/database/updateContractInterment.js new file mode 100644 index 00000000..497180ef --- /dev/null +++ b/database/updateContractInterment.js @@ -0,0 +1,32 @@ +import { dateStringToInteger } from '@cityssm/utils-datetime'; +import { acquireConnection } from './pool.js'; +export default async function updateContractInterment(contractForm, user) { + const database = await acquireConnection(); + const results = database + .prepare(`update ContractInterments + set deceasedName = ?, + deceasedAddress1 = ?, + deceasedAddress2 = ?, + deceasedCity = ?, + deceasedProvince = ?, + deceasedPostalCode = ?, + birthDate = ?, + birthPlace = ?, + deathDate = ?, + deathPlace = ?, + intermentContainerTypeId = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and contractId = ? + and intermentNumber = ?`) + .run(contractForm.deceasedName, contractForm.deceasedAddress1, contractForm.deceasedAddress2, contractForm.deceasedCity, contractForm.deceasedProvince, contractForm.deceasedPostalCode, contractForm.birthDateString === '' + ? undefined + : dateStringToInteger(contractForm.birthDateString), contractForm.birthPlace, contractForm.deathDateString === '' + ? undefined + : dateStringToInteger(contractForm.deathDateString), contractForm.deathPlace, contractForm.intermentContainerTypeId === '' + ? undefined + : contractForm.intermentContainerTypeId, user.userName, Date.now(), contractForm.contractId, contractForm.intermentNumber); + database.release(); + return results.changes > 0; +} diff --git a/database/updateContractInterment.ts b/database/updateContractInterment.ts new file mode 100644 index 00000000..38bce77b --- /dev/null +++ b/database/updateContractInterment.ts @@ -0,0 +1,74 @@ +import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' + +import { acquireConnection } from './pool.js' + +export interface UpdateForm { + contractId: string | number + intermentNumber: string | number + deceasedName: string + deceasedAddress1: string + deceasedAddress2: string + deceasedCity: string + deceasedProvince: string + deceasedPostalCode: string + birthDateString: DateString | '' + birthPlace: string + deathDateString: DateString | '' + deathPlace: string + intermentContainerTypeId: string | number +} + +export default async function updateContractInterment( + contractForm: UpdateForm, + user: User +): Promise { + const database = await acquireConnection() + + const results = database + .prepare( + `update ContractInterments + set deceasedName = ?, + deceasedAddress1 = ?, + deceasedAddress2 = ?, + deceasedCity = ?, + deceasedProvince = ?, + deceasedPostalCode = ?, + birthDate = ?, + birthPlace = ?, + deathDate = ?, + deathPlace = ?, + intermentContainerTypeId = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and contractId = ? + and intermentNumber = ?` + ) + .run( + contractForm.deceasedName, + contractForm.deceasedAddress1, + contractForm.deceasedAddress2, + contractForm.deceasedCity, + contractForm.deceasedProvince, + contractForm.deceasedPostalCode, + contractForm.birthDateString === '' + ? undefined + : dateStringToInteger(contractForm.birthDateString), + contractForm.birthPlace, + contractForm.deathDateString === '' + ? undefined + : dateStringToInteger(contractForm.deathDateString), + contractForm.deathPlace, + contractForm.intermentContainerTypeId === '' + ? undefined + : contractForm.intermentContainerTypeId, + user.userName, + Date.now(), + contractForm.contractId, + contractForm.intermentNumber + ) + + database.release() + + return results.changes > 0 +} diff --git a/database/updateLotOccupancyOccupant.d.ts b/database/updateLotOccupancyOccupant.d.ts deleted file mode 100644 index 2ba973a0..00000000 --- a/database/updateLotOccupancyOccupant.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -export interface UpdateLotOccupancyOccupantForm { - contractId: string | number; - lotOccupantIndex: string | number; - lotOccupantTypeId: string | number; - occupantName: string; - occupantFamilyName: string; - occupantAddress1: string; - occupantAddress2: string; - occupantCity: string; - occupantProvince: string; - occupantPostalCode: string; - occupantPhoneNumber: string; - occupantEmailAddress: string; - occupantComment: string; -} -export default function updateContractOccupant(contractOccupantForm: UpdateLotOccupancyOccupantForm, user: User): Promise; diff --git a/database/updateLotOccupancyOccupant.js b/database/updateLotOccupancyOccupant.js deleted file mode 100644 index e74fc32d..00000000 --- a/database/updateLotOccupancyOccupant.js +++ /dev/null @@ -1,25 +0,0 @@ -import { acquireConnection } from './pool.js'; -export default async function updateContractOccupant(contractOccupantForm, user) { - const database = await acquireConnection(); - const results = database - .prepare(`update LotOccupancyOccupants - set occupantName = ?, - occupantFamilyName = ?, - occupantAddress1 = ?, - occupantAddress2 = ?, - occupantCity = ?, - occupantProvince = ?, - occupantPostalCode = ?, - occupantPhoneNumber = ?, - occupantEmailAddress = ?, - occupantComment = ?, - lotOccupantTypeId = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where recordDelete_timeMillis is null - and contractId = ? - and lotOccupantIndex = ?`) - .run(contractOccupantForm.occupantName, contractOccupantForm.occupantFamilyName, contractOccupantForm.occupantAddress1, contractOccupantForm.occupantAddress2, contractOccupantForm.occupantCity, contractOccupantForm.occupantProvince, contractOccupantForm.occupantPostalCode, contractOccupantForm.occupantPhoneNumber, contractOccupantForm.occupantEmailAddress, contractOccupantForm.occupantComment, contractOccupantForm.lotOccupantTypeId, user.userName, Date.now(), contractOccupantForm.contractId, contractOccupantForm.lotOccupantIndex); - database.release(); - return results.changes > 0; -} diff --git a/database/updateLotOccupancyOccupant.ts b/database/updateLotOccupancyOccupant.ts deleted file mode 100644 index be2d0e07..00000000 --- a/database/updateLotOccupancyOccupant.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { acquireConnection } from './pool.js' - -export interface UpdateLotOccupancyOccupantForm { - contractId: string | number - lotOccupantIndex: string | number - lotOccupantTypeId: string | number - occupantName: string - occupantFamilyName: string - occupantAddress1: string - occupantAddress2: string - occupantCity: string - occupantProvince: string - occupantPostalCode: string - occupantPhoneNumber: string - occupantEmailAddress: string - occupantComment: string -} - -export default async function updateContractOccupant( - contractOccupantForm: UpdateLotOccupancyOccupantForm, - user: User -): Promise { - const database = await acquireConnection() - - const results = database - .prepare( - `update LotOccupancyOccupants - set occupantName = ?, - occupantFamilyName = ?, - occupantAddress1 = ?, - occupantAddress2 = ?, - occupantCity = ?, - occupantProvince = ?, - occupantPostalCode = ?, - occupantPhoneNumber = ?, - occupantEmailAddress = ?, - occupantComment = ?, - lotOccupantTypeId = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where recordDelete_timeMillis is null - and contractId = ? - and lotOccupantIndex = ?` - ) - .run( - contractOccupantForm.occupantName, - contractOccupantForm.occupantFamilyName, - contractOccupantForm.occupantAddress1, - contractOccupantForm.occupantAddress2, - contractOccupantForm.occupantCity, - contractOccupantForm.occupantProvince, - contractOccupantForm.occupantPostalCode, - contractOccupantForm.occupantPhoneNumber, - contractOccupantForm.occupantEmailAddress, - contractOccupantForm.occupantComment, - contractOccupantForm.lotOccupantTypeId, - user.userName, - Date.now(), - contractOccupantForm.contractId, - contractOccupantForm.lotOccupantIndex - ) - - database.release() - - return results.changes > 0 -} diff --git a/database/updateWorkOrderComment.d.ts b/database/updateWorkOrderComment.d.ts index 3ea6a547..efeac9f5 100644 --- a/database/updateWorkOrderComment.d.ts +++ b/database/updateWorkOrderComment.d.ts @@ -1,8 +1,8 @@ import { type DateString, type TimeString } from '@cityssm/utils-datetime'; export interface UpdateWorkOrderCommentForm { workOrderCommentId: string | number; - workOrderCommentDateString: DateString; - workOrderCommentTimeString: TimeString; - workOrderComment: string; + commentDateString: DateString; + commentTimeString: TimeString; + comment: string; } export default function updateWorkOrderComment(commentForm: UpdateWorkOrderCommentForm, user: User): Promise; diff --git a/database/updateWorkOrderComment.js b/database/updateWorkOrderComment.js index 46b9082d..17de433e 100644 --- a/database/updateWorkOrderComment.js +++ b/database/updateWorkOrderComment.js @@ -4,14 +4,14 @@ export default async function updateWorkOrderComment(commentForm, user) { const database = await acquireConnection(); const result = database .prepare(`update WorkOrderComments - set workOrderCommentDate = ?, - workOrderCommentTime = ?, - workOrderComment = ?, + set commentDate = ?, + commentTime = ?, + comment = ?, recordUpdate_userName = ?, recordUpdate_timeMillis = ? where recordDelete_timeMillis is null and workOrderCommentId = ?`) - .run(dateStringToInteger(commentForm.workOrderCommentDateString), timeStringToInteger(commentForm.workOrderCommentTimeString), commentForm.workOrderComment, user.userName, Date.now(), commentForm.workOrderCommentId); + .run(dateStringToInteger(commentForm.commentDateString), timeStringToInteger(commentForm.commentTimeString), commentForm.comment, user.userName, Date.now(), commentForm.workOrderCommentId); database.release(); return result.changes > 0; } diff --git a/database/updateWorkOrderComment.ts b/database/updateWorkOrderComment.ts index b0c18371..ad865c17 100644 --- a/database/updateWorkOrderComment.ts +++ b/database/updateWorkOrderComment.ts @@ -9,9 +9,9 @@ import { acquireConnection } from './pool.js' export interface UpdateWorkOrderCommentForm { workOrderCommentId: string | number - workOrderCommentDateString: DateString - workOrderCommentTimeString: TimeString - workOrderComment: string + commentDateString: DateString + commentTimeString: TimeString + comment: string } export default async function updateWorkOrderComment( @@ -23,18 +23,18 @@ export default async function updateWorkOrderComment( const result = database .prepare( `update WorkOrderComments - set workOrderCommentDate = ?, - workOrderCommentTime = ?, - workOrderComment = ?, + set commentDate = ?, + commentTime = ?, + comment = ?, recordUpdate_userName = ?, recordUpdate_timeMillis = ? where recordDelete_timeMillis is null and workOrderCommentId = ?` ) .run( - dateStringToInteger(commentForm.workOrderCommentDateString), - timeStringToInteger(commentForm.workOrderCommentTimeString), - commentForm.workOrderComment, + dateStringToInteger(commentForm.commentDateString), + timeStringToInteger(commentForm.commentTimeString), + commentForm.comment, user.userName, Date.now(), commentForm.workOrderCommentId diff --git a/handlers/contracts-post/doAddContractInterment.d.ts b/handlers/contracts-post/doAddContractInterment.d.ts new file mode 100644 index 00000000..3c0ca003 --- /dev/null +++ b/handlers/contracts-post/doAddContractInterment.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type AddForm } from '../../database/addContractInterment.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/contracts-post/doAddContractInterment.js b/handlers/contracts-post/doAddContractInterment.js new file mode 100644 index 00000000..7b1835d0 --- /dev/null +++ b/handlers/contracts-post/doAddContractInterment.js @@ -0,0 +1,10 @@ +import addContractInterment from '../../database/addContractInterment.js'; +import getContractInterments from '../../database/getContractInterments.js'; +export default async function handler(request, response) { + await addContractInterment(request.body, request.session.user); + const contractInterments = await getContractInterments(request.body.contractId); + response.json({ + success: true, + contractInterments + }); +} diff --git a/handlers/contracts-post/doAddContractInterment.ts b/handlers/contracts-post/doAddContractInterment.ts new file mode 100644 index 00000000..6c35b227 --- /dev/null +++ b/handlers/contracts-post/doAddContractInterment.ts @@ -0,0 +1,22 @@ +import type { Request, Response } from 'express' + +import addContractInterment, { + type AddForm +} from '../../database/addContractInterment.js' +import getContractInterments from '../../database/getContractInterments.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + await addContractInterment(request.body, request.session.user as User) + + const contractInterments = await getContractInterments( + request.body.contractId + ) + + response.json({ + success: true, + contractInterments + }) +} diff --git a/handlers/contracts-post/doDeleteContractInterment.d.ts b/handlers/contracts-post/doDeleteContractInterment.d.ts new file mode 100644 index 00000000..2c0a449a --- /dev/null +++ b/handlers/contracts-post/doDeleteContractInterment.d.ts @@ -0,0 +1,5 @@ +import type { Request, Response } from 'express'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/contracts-post/doDeleteContractInterment.js b/handlers/contracts-post/doDeleteContractInterment.js new file mode 100644 index 00000000..de50e30c --- /dev/null +++ b/handlers/contracts-post/doDeleteContractInterment.js @@ -0,0 +1,10 @@ +import deleteContractInterment from '../../database/deleteContractInterment.js'; +import getContractInterments from '../../database/getContractInterments.js'; +export default async function handler(request, response) { + const success = await deleteContractInterment(request.body.contractId, request.body.intermentNumber, request.session.user); + const contractInterments = await getContractInterments(request.body.contractId); + response.json({ + success, + contractInterments + }); +} diff --git a/handlers/contracts-post/doDeleteContractInterment.ts b/handlers/contracts-post/doDeleteContractInterment.ts new file mode 100644 index 00000000..9242dd49 --- /dev/null +++ b/handlers/contracts-post/doDeleteContractInterment.ts @@ -0,0 +1,28 @@ +import type { Request, Response } from 'express' + +import deleteContractInterment from '../../database/deleteContractInterment.js' +import getContractInterments from '../../database/getContractInterments.js' + +export default async function handler( + request: Request< + unknown, + unknown, + { contractId: string; intermentNumber: string } + >, + response: Response +): Promise { + const success = await deleteContractInterment( + request.body.contractId, + request.body.intermentNumber, + request.session.user as User + ) + + const contractInterments = await getContractInterments( + request.body.contractId + ) + + response.json({ + success, + contractInterments + }) +} diff --git a/handlers/contracts-post/doUpdateContractInterment.d.ts b/handlers/contracts-post/doUpdateContractInterment.d.ts new file mode 100644 index 00000000..f40b8fa2 --- /dev/null +++ b/handlers/contracts-post/doUpdateContractInterment.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type UpdateForm } from '../../database/updateContractInterment.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/contracts-post/doUpdateContractInterment.js b/handlers/contracts-post/doUpdateContractInterment.js new file mode 100644 index 00000000..72482211 --- /dev/null +++ b/handlers/contracts-post/doUpdateContractInterment.js @@ -0,0 +1,10 @@ +import getContractInterments from '../../database/getContractInterments.js'; +import updateContractInterment from '../../database/updateContractInterment.js'; +export default async function handler(request, response) { + await updateContractInterment(request.body, request.session.user); + const contractInterments = await getContractInterments(request.body.contractId); + response.json({ + success: true, + contractInterments + }); +} diff --git a/handlers/contracts-post/doUpdateContractInterment.ts b/handlers/contracts-post/doUpdateContractInterment.ts new file mode 100644 index 00000000..ca689fd9 --- /dev/null +++ b/handlers/contracts-post/doUpdateContractInterment.ts @@ -0,0 +1,24 @@ +import type { Request, Response } from 'express' + +import getContractInterments from '../../database/getContractInterments.js' +import updateContractInterment, { + type UpdateForm +} from '../../database/updateContractInterment.js' + +export default async function handler( + request: Request, + response: Response +): Promise { + await updateContractInterment( + request.body, + request.session.user as User + ) + + const contractInterments = + await getContractInterments(request.body.contractId) + + response.json({ + success: true, + contractInterments + }) +} diff --git a/handlers/workOrders-get/edit.js b/handlers/workOrders-get/edit.js index bb35f305..bca16425 100644 --- a/handlers/workOrders-get/edit.js +++ b/handlers/workOrders-get/edit.js @@ -17,13 +17,13 @@ export default async function handler(request, response) { } const workOrderTypes = await getWorkOrderTypes(); const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); - const lotStatuses = await getBurialSiteStatuses(); + const burialSiteStatuses = await getBurialSiteStatuses(); response.render('workOrder-edit', { headTitle: `Work Order #${workOrder.workOrderNumber}`, workOrder, isCreate: false, workOrderTypes, workOrderMilestoneTypes, - lotStatuses + burialSiteStatuses }); } diff --git a/handlers/workOrders-get/edit.ts b/handlers/workOrders-get/edit.ts index 69aa90c9..a5142fc0 100644 --- a/handlers/workOrders-get/edit.ts +++ b/handlers/workOrders-get/edit.ts @@ -40,7 +40,7 @@ export default async function handler( const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() - const lotStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = await getBurialSiteStatuses() response.render('workOrder-edit', { headTitle: `Work Order #${workOrder.workOrderNumber}`, @@ -48,6 +48,6 @@ export default async function handler( isCreate: false, workOrderTypes, workOrderMilestoneTypes, - lotStatuses + burialSiteStatuses }) } diff --git a/handlers/workOrders-post/doAddWorkOrderBurialSite.js b/handlers/workOrders-post/doAddWorkOrderBurialSite.js index 24f9a2d2..1c5b6e12 100644 --- a/handlers/workOrders-post/doAddWorkOrderBurialSite.js +++ b/handlers/workOrders-post/doAddWorkOrderBurialSite.js @@ -5,7 +5,7 @@ export default async function handler(request, response) { workOrderId: request.body.workOrderId, burialSiteId: request.body.burialSiteId }, request.session.user); - const workOrderLotsResults = await getBurialSites({ + const results = await getBurialSites({ workOrderId: request.body.workOrderId }, { limit: -1, @@ -14,6 +14,6 @@ export default async function handler(request, response) { }); response.json({ success, - workOrderBurialSites: workOrderLotsResults.burialSites + workOrderBurialSites: results.burialSites }); } diff --git a/handlers/workOrders-post/doAddWorkOrderBurialSite.ts b/handlers/workOrders-post/doAddWorkOrderBurialSite.ts index 80dff2fd..1660bcc3 100644 --- a/handlers/workOrders-post/doAddWorkOrderBurialSite.ts +++ b/handlers/workOrders-post/doAddWorkOrderBurialSite.ts @@ -19,7 +19,7 @@ export default async function handler( request.session.user as User ) - const workOrderLotsResults = await getBurialSites( + const results = await getBurialSites( { workOrderId: request.body.workOrderId }, @@ -32,6 +32,6 @@ export default async function handler( response.json({ success, - workOrderBurialSites: workOrderLotsResults.burialSites + workOrderBurialSites: results.burialSites }) } diff --git a/helpers/functions.dynamicsGP.js b/helpers/functions.dynamicsGP.js index a815d63d..c8470a27 100644 --- a/helpers/functions.dynamicsGP.js +++ b/helpers/functions.dynamicsGP.js @@ -8,12 +8,14 @@ if (getConfigProperty('settings.dynamicsGP.integrationIsEnabled')) { function filterCashReceipt(cashReceipt) { const accountCodes = getConfigProperty('settings.dynamicsGP.accountCodes'); if (accountCodes.length > 0) { - for (const detail of cashReceipt.details) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + for (const detail of cashReceipt?.details ?? []) { if (accountCodes.includes(detail.accountCode)) { return cashReceipt; } } - for (const distribution of cashReceipt.distributions) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + for (const distribution of cashReceipt?.distributions ?? []) { if (accountCodes.includes(distribution.accountCode)) { return cashReceipt; } diff --git a/helpers/functions.dynamicsGP.ts b/helpers/functions.dynamicsGP.ts index 2564c705..0b38284a 100644 --- a/helpers/functions.dynamicsGP.ts +++ b/helpers/functions.dynamicsGP.ts @@ -23,13 +23,15 @@ function filterCashReceipt( const accountCodes = getConfigProperty('settings.dynamicsGP.accountCodes') if (accountCodes.length > 0) { - for (const detail of cashReceipt.details) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + for (const detail of cashReceipt?.details ?? []) { if (accountCodes.includes(detail.accountCode)) { return cashReceipt } } - for (const distribution of cashReceipt.distributions) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + for (const distribution of cashReceipt?.distributions ?? []) { if (accountCodes.includes(distribution.accountCode)) { return cashReceipt } diff --git a/helpers/functions.sqlFilters.d.ts b/helpers/functions.sqlFilters.d.ts index 6df91203..679f35bf 100644 --- a/helpers/functions.sqlFilters.d.ts +++ b/helpers/functions.sqlFilters.d.ts @@ -4,7 +4,7 @@ interface WhereClauseReturn { sqlParameters: unknown[]; } export declare function getBurialSiteNameWhereClause(burialSiteName?: string, burialSiteNameSearchType?: BurialSiteNameSearchType, burialSitesTableAlias?: string): WhereClauseReturn; -type OccupancyTime = '' | 'current' | 'past' | 'future'; -export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime | undefined, lotOccupanciesTableAlias?: string): WhereClauseReturn; -export declare function getOccupantNameWhereClause(occupantName?: string, tableAlias?: string): WhereClauseReturn; +type ContractTime = '' | 'current' | 'past' | 'future'; +export declare function getContractTimeWhereClause(contractTime: ContractTime | undefined, contractsTableAlias?: string): WhereClauseReturn; +export declare function getDeceasedNameWhereClause(deceasedName?: string, tableAlias?: string): WhereClauseReturn; export {}; diff --git a/helpers/functions.sqlFilters.js b/helpers/functions.sqlFilters.js index dc01d2e1..a99a3671 100644 --- a/helpers/functions.sqlFilters.js +++ b/helpers/functions.sqlFilters.js @@ -33,27 +33,27 @@ export function getBurialSiteNameWhereClause(burialSiteName = '', burialSiteName sqlParameters }; } -export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAlias = 'o') { +export function getContractTimeWhereClause(contractTime, contractsTableAlias = 'o') { let sqlWhereClause = ''; const sqlParameters = []; const currentDateString = dateToInteger(new Date()); // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check - switch (occupancyTime ?? '') { + switch (contractTime ?? '') { case 'current': { - sqlWhereClause += ` and ${lotOccupanciesTableAlias}.contractStartDate <= ? - and (${lotOccupanciesTableAlias}.contractEndDate is null or ${lotOccupanciesTableAlias}.contractEndDate >= ?)`; + sqlWhereClause += ` and ${contractsTableAlias}.contractStartDate <= ? + and (${contractsTableAlias}.contractEndDate is null or ${contractsTableAlias}.contractEndDate >= ?)`; sqlParameters.push(currentDateString, currentDateString); break; } case 'past': { sqlWhereClause += - ` and ${lotOccupanciesTableAlias}.contractEndDate < ?`; + ` and ${contractsTableAlias}.contractEndDate < ?`; sqlParameters.push(currentDateString); break; } case 'future': { sqlWhereClause += - ` and ${lotOccupanciesTableAlias}.contractStartDate > ?`; + ` and ${contractsTableAlias}.contractStartDate > ?`; sqlParameters.push(currentDateString); break; } @@ -63,18 +63,18 @@ export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAl sqlParameters }; } -export function getOccupantNameWhereClause(occupantName = '', tableAlias = 'o') { +export function getDeceasedNameWhereClause(deceasedName = '', tableAlias = 'o') { let sqlWhereClause = ''; const sqlParameters = []; const usedPieces = new Set(); - const occupantNamePieces = occupantName.toLowerCase().split(' '); - for (const occupantNamePiece of occupantNamePieces) { - if (occupantNamePiece === '' || usedPieces.has(occupantNamePiece)) { + const deceasedNamePieces = deceasedName.toLowerCase().split(' '); + for (const namePiece of deceasedNamePieces) { + if (namePiece === '' || usedPieces.has(namePiece)) { continue; } - usedPieces.add(occupantNamePiece); - sqlWhereClause += ` and (instr(lower(${tableAlias}.occupantName), ?) or instr(lower(${tableAlias}.occupantFamilyName), ?))`; - sqlParameters.push(occupantNamePiece, occupantNamePiece); + usedPieces.add(namePiece); + sqlWhereClause += ` and instr(lower(${tableAlias}.deceasedName), ?)`; + sqlParameters.push(namePiece); } return { sqlWhereClause, diff --git a/helpers/functions.sqlFilters.ts b/helpers/functions.sqlFilters.ts index a9ebf1dc..25c20cb5 100644 --- a/helpers/functions.sqlFilters.ts +++ b/helpers/functions.sqlFilters.ts @@ -52,11 +52,11 @@ export function getBurialSiteNameWhereClause( } } -type OccupancyTime = '' | 'current' | 'past' | 'future' +type ContractTime = '' | 'current' | 'past' | 'future' -export function getOccupancyTimeWhereClause( - occupancyTime: OccupancyTime | undefined, - lotOccupanciesTableAlias = 'o' +export function getContractTimeWhereClause( + contractTime: ContractTime | undefined, + contractsTableAlias = 'o' ): WhereClauseReturn { let sqlWhereClause = '' const sqlParameters: unknown[] = [] @@ -64,24 +64,24 @@ export function getOccupancyTimeWhereClause( const currentDateString = dateToInteger(new Date()) // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check - switch (occupancyTime ?? '') { + switch (contractTime ?? '') { case 'current': { - sqlWhereClause += ` and ${lotOccupanciesTableAlias}.contractStartDate <= ? - and (${lotOccupanciesTableAlias}.contractEndDate is null or ${lotOccupanciesTableAlias}.contractEndDate >= ?)` + sqlWhereClause += ` and ${contractsTableAlias}.contractStartDate <= ? + and (${contractsTableAlias}.contractEndDate is null or ${contractsTableAlias}.contractEndDate >= ?)` sqlParameters.push(currentDateString, currentDateString) break } case 'past': { sqlWhereClause += - ` and ${lotOccupanciesTableAlias}.contractEndDate < ?` + ` and ${contractsTableAlias}.contractEndDate < ?` sqlParameters.push(currentDateString) break } case 'future': { sqlWhereClause += - ` and ${lotOccupanciesTableAlias}.contractStartDate > ?` + ` and ${contractsTableAlias}.contractStartDate > ?` sqlParameters.push(currentDateString) break } @@ -93,8 +93,8 @@ export function getOccupancyTimeWhereClause( } } -export function getOccupantNameWhereClause( - occupantName = '', +export function getDeceasedNameWhereClause( + deceasedName = '', tableAlias = 'o' ): WhereClauseReturn { let sqlWhereClause = '' @@ -102,16 +102,16 @@ export function getOccupantNameWhereClause( const usedPieces = new Set() - const occupantNamePieces = occupantName.toLowerCase().split(' ') - for (const occupantNamePiece of occupantNamePieces) { - if (occupantNamePiece === '' || usedPieces.has(occupantNamePiece)) { + const deceasedNamePieces = deceasedName.toLowerCase().split(' ') + for (const namePiece of deceasedNamePieces) { + if (namePiece === '' || usedPieces.has(namePiece)) { continue } - usedPieces.add(occupantNamePiece) + usedPieces.add(namePiece) - sqlWhereClause += ` and (instr(lower(${tableAlias}.occupantName), ?) or instr(lower(${tableAlias}.occupantFamilyName), ?))` - sqlParameters.push(occupantNamePiece, occupantNamePiece) + sqlWhereClause += ` and instr(lower(${tableAlias}.deceasedName), ?)` + sqlParameters.push(namePiece) } return { diff --git a/package-lock.json b/package-lock.json index 9c0d1f41..c283b3f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,6 @@ "activedirectory2": "^2.2.0", "better-sqlite-pool": "^0.3.2", "better-sqlite3": "^11.8.1", - "bulma-calendar": "^6.1.19", "camelcase": "^8.0.0", "compression": "^1.8.0", "cookie-parser": "^1.4.7", @@ -3735,18 +3734,8 @@ "node_modules/bulma": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", - "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" - }, - "node_modules/bulma-calendar": { - "version": "6.1.19", - "resolved": "https://registry.npmjs.org/bulma-calendar/-/bulma-calendar-6.1.19.tgz", - "integrity": "sha512-roosrqoXWGTP7MR5PW151XO4mnarov2qvfzvHfGKzT8rV+SGRZmhzbr4/xmUxRyD+vdn6mSG+ensda4mvvKDow==", - "dependencies": { - "date-fns": "^2.21.3" - }, - "peerDependencies": { - "bulma": "^0.9.4" - } + "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==", + "dev": true }, "node_modules/bulma-divider": { "version": "0.2.0", @@ -4876,18 +4865,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/date-fns": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", - "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", - "engines": { - "node": ">=0.11" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" - } - }, "node_modules/dayjs": { "version": "1.11.7", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", diff --git a/package.json b/package.json index 635a6e34..1a2c8e90 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "activedirectory2": "^2.2.0", "better-sqlite-pool": "^0.3.2", "better-sqlite3": "^11.8.1", - "bulma-calendar": "^6.1.19", "camelcase": "^8.0.0", "compression": "^1.8.0", "cookie-parser": "^1.4.7", diff --git a/public/html/adminFees-addFee.html b/public/html/adminFees-addFee.html index 3dcee820..23980a0f 100644 --- a/public/html/adminFees-addFee.html +++ b/public/html/adminFees-addFee.html @@ -68,20 +68,16 @@

Filters can be used to show or hide available fees depending on the - type and - type selected when - creating the - - record. + contract type and burial site type selected when + creating the contract record.

- +
diff --git a/public/html/adminFees-editFee.html b/public/html/adminFees-editFee.html index 045edc99..82b69c31 100644 --- a/public/html/adminFees-editFee.html +++ b/public/html/adminFees-editFee.html @@ -69,11 +69,8 @@

Filters can be used to show or hide available fees depending on the - type and - type selected when - creating the - - record. + contract type and burial site type selected when + creating the contract record.

diff --git a/public/html/burialSite-editLotStatus.html b/public/html/burialSite-editBurialSiteStatus.html similarity index 66% rename from public/html/burialSite-editLotStatus.html rename to public/html/burialSite-editBurialSiteStatus.html index 8692a16f..d2cf51c8 100644 --- a/public/html/burialSite-editLotStatus.html +++ b/public/html/burialSite-editBurialSiteStatus.html @@ -3,7 +3,7 @@

- Edit Status + Edit Burial Site Status

-
- + +
- +
- +
-
@@ -43,7 +43,7 @@ + +
+ + +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+ + +
+
+
diff --git a/public/html/lotOccupancy-addTransaction.html b/public/html/contract-addTransaction.html similarity index 100% rename from public/html/lotOccupancy-addTransaction.html rename to public/html/contract-addTransaction.html diff --git a/public/html/lotOccupancy-createWorkOrder.html b/public/html/contract-createWorkOrder.html similarity index 100% rename from public/html/lotOccupancy-createWorkOrder.html rename to public/html/contract-createWorkOrder.html diff --git a/public/html/lotOccupancy-editComment.html b/public/html/contract-editComment.html similarity index 82% rename from public/html/lotOccupancy-editComment.html rename to public/html/contract-editComment.html index 8dbeb2bb..5ee6037a 100644 --- a/public/html/lotOccupancy-editComment.html +++ b/public/html/contract-editComment.html @@ -26,14 +26,14 @@
@@ -43,14 +43,14 @@
@@ -64,14 +64,14 @@
diff --git a/public/html/lotOccupancy-editFeeQuantity.html b/public/html/contract-editFeeQuantity.html similarity index 100% rename from public/html/lotOccupancy-editFeeQuantity.html rename to public/html/contract-editFeeQuantity.html diff --git a/public/html/contract-editInterment.html b/public/html/contract-editInterment.html index 57f7376f..6b779e4f 100644 --- a/public/html/contract-editInterment.html +++ b/public/html/contract-editInterment.html @@ -3,7 +3,7 @@

- Update + Update Interment

-
+ - -
-
-
- -
-
-
- -
-
-
+ +
- Name
-
-
- -
- -
-
-
-
-
@@ -130,14 +97,14 @@
@@ -148,14 +115,14 @@
-
+
- - - + + +
-
+ +
+ +
+
+
+
+
+
+
+
- - - + + +
+
+
+ +
+ +
+
+
- +
- +
+ +
@@ -231,10 +199,10 @@ diff --git a/public/html/lotOccupancy-editTransaction.html b/public/html/contract-editTransaction.html similarity index 100% rename from public/html/lotOccupancy-editTransaction.html rename to public/html/contract-editTransaction.html diff --git a/public/html/lotOccupancy-setFeeQuantity.html b/public/html/contract-setFeeQuantity.html similarity index 100% rename from public/html/lotOccupancy-setFeeQuantity.html rename to public/html/contract-setFeeQuantity.html diff --git a/public/html/lotOccupancy-addOccupant.html b/public/html/lotOccupancy-addOccupant.html deleted file mode 100644 index 7f0842c8..00000000 --- a/public/html/lotOccupancy-addOccupant.html +++ /dev/null @@ -1,318 +0,0 @@ - diff --git a/public/html/workOrder-addLot.html b/public/html/workOrder-addBurialSite.html similarity index 76% rename from public/html/workOrder-addLot.html rename to public/html/workOrder-addBurialSite.html index 8e3e6c2c..f3aad101 100644 --- a/public/html/workOrder-addLot.html +++ b/public/html/workOrder-addBurialSite.html @@ -3,7 +3,7 @@

- Add Related to Work Order + Add Related Burial Site to Work Order

diff --git a/public/html/workOrder-addComment.html b/public/html/workOrder-addComment.html index 33410bc0..0bc58e9e 100644 --- a/public/html/workOrder-addComment.html +++ b/public/html/workOrder-addComment.html @@ -18,14 +18,14 @@ value="" />
-
diff --git a/public/html/workOrder-addLotOccupancy.html b/public/html/workOrder-addContract.html similarity index 80% rename from public/html/workOrder-addLotOccupancy.html rename to public/html/workOrder-addContract.html index 290bd859..cdcf3e91 100644 --- a/public/html/workOrder-addLotOccupancy.html +++ b/public/html/workOrder-addContract.html @@ -3,8 +3,7 @@

- Add Related to Work - Order + Add Related Contract to Work Order

` - : ''} - -
- `; - tableRowElement - .querySelector('.button--editQuantity') - ?.addEventListener('click', editContractFeeQuantity); - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteContractFee); - contractFeesContainerElement - .querySelector('tbody') - ?.append(tableRowElement); - feeAmountTotal += - (contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0); - taxAmountTotal += - (contractFee.taxAmount ?? 0) * (contractFee.quantity ?? 0); - } - ; - contractFeesContainerElement.querySelector('#contractFees--feeAmountTotal').textContent = `$${feeAmountTotal.toFixed(2)}`; - contractFeesContainerElement.querySelector('#contractFees--taxAmountTotal').textContent = `$${taxAmountTotal.toFixed(2)}`; - contractFeesContainerElement.querySelector('#contractFees--grandTotal').textContent = `$${(feeAmountTotal + taxAmountTotal).toFixed(2)}`; - renderContractTransactions(); - } - const addFeeButtonElement = document.querySelector('#button--addFee'); - addFeeButtonElement.addEventListener('click', () => { - if (sunrise.hasUnsavedChanges()) { - bulmaJS.alert({ - message: 'Please save all unsaved changes before adding fees.', - contextualColorName: 'warning' - }); - return; - } - let feeCategories; - let feeFilterElement; - let feeFilterResultsElement; - function doAddFeeCategory(clickEvent) { - clickEvent.preventDefault(); - const feeCategoryId = Number.parseInt(clickEvent.currentTarget.dataset.feeCategoryId ?? '', 10); - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractFeeCategory`, { - contractId, - feeCategoryId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractFees = responseJSON.contractFees; - renderContractFees(); - bulmaJS.alert({ - message: 'Fee Group Added Successfully', - contextualColorName: 'success' - }); - } - else { - bulmaJS.alert({ - title: 'Error Adding Fee', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function doAddFee(feeId, quantity = 1) { - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractFee`, { - contractId, - feeId, - quantity - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractFees = responseJSON.contractFees; - renderContractFees(); - filterFees(); - } - else { - bulmaJS.alert({ - title: 'Error Adding Fee', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - function doSetQuantityAndAddFee(fee) { - let quantityElement; - let quantityCloseModalFunction; - function doSetQuantity(submitEvent) { - submitEvent.preventDefault(); - doAddFee(fee.feeId, quantityElement.value); - quantityCloseModalFunction(); - } - cityssm.openHtmlModal('contract-setFeeQuantity', { - onshow(modalElement) { - ; - modalElement.querySelector('#contractFeeQuantity--quantityUnit').textContent = fee.quantityUnit ?? ''; - }, - onshown(modalElement, closeModalFunction) { - quantityCloseModalFunction = closeModalFunction; - quantityElement = modalElement.querySelector('#contractFeeQuantity--quantity'); - modalElement - .querySelector('form') - ?.addEventListener('submit', doSetQuantity); - } - }); - } - function tryAddFee(clickEvent) { - clickEvent.preventDefault(); - const feeId = Number.parseInt(clickEvent.currentTarget.dataset.feeId ?? '', 10); - const feeCategoryId = Number.parseInt(clickEvent.currentTarget.dataset.feeCategoryId ?? '', 10); - const feeCategory = feeCategories.find((currentFeeCategory) => currentFeeCategory.feeCategoryId === feeCategoryId); - const fee = feeCategory.fees.find((currentFee) => currentFee.feeId === feeId); - if (fee.includeQuantity ?? false) { - doSetQuantityAndAddFee(fee); - } - else { - doAddFee(feeId); - } - } - function filterFees() { - const filterStringPieces = feeFilterElement.value - .trim() - .toLowerCase() - .split(' '); - feeFilterResultsElement.innerHTML = ''; - for (const feeCategory of feeCategories) { - const categoryContainerElement = document.createElement('div'); - categoryContainerElement.className = 'container--feeCategory'; - categoryContainerElement.dataset.feeCategoryId = - feeCategory.feeCategoryId.toString(); - categoryContainerElement.innerHTML = `
-
-

- ${cityssm.escapeHTML(feeCategory.feeCategory ?? '')} -

-
-
-
`; - if (feeCategory.isGroupedFee) { - // eslint-disable-next-line no-unsanitized/method - categoryContainerElement - .querySelector('.columns') - ?.insertAdjacentHTML('beforeend', `
- -
`); - categoryContainerElement - .querySelector('button') - ?.addEventListener('click', doAddFeeCategory); - } - let hasFees = false; - for (const fee of feeCategory.fees) { - // Don't include already applied fees that limit quantity - if (contractFeesContainerElement.querySelector(`.container--contractFee[data-fee-id='${fee.feeId}'][data-include-quantity='0']`) !== null) { - continue; - } - let includeFee = true; - const feeSearchString = `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase(); - for (const filterStringPiece of filterStringPieces) { - if (!feeSearchString.includes(filterStringPiece)) { - includeFee = false; - break; - } - } - if (!includeFee) { - continue; - } - hasFees = true; - const panelBlockElement = document.createElement(feeCategory.isGroupedFee ? 'div' : 'a'); - panelBlockElement.className = 'panel-block is-block container--fee'; - panelBlockElement.dataset.feeId = fee.feeId.toString(); - panelBlockElement.dataset.feeCategoryId = - feeCategory.feeCategoryId.toString(); - // eslint-disable-next-line no-unsanitized/property - panelBlockElement.innerHTML = `${cityssm.escapeHTML(fee.feeName ?? '')}
- - ${cityssm - .escapeHTML(fee.feeDescription ?? '') - .replaceAll('\n', '
')} - `; - if (!feeCategory.isGroupedFee) { - ; - panelBlockElement.href = '#'; - panelBlockElement.addEventListener('click', tryAddFee); - } - ; - categoryContainerElement.querySelector('.panel').append(panelBlockElement); - } - if (hasFees) { - feeFilterResultsElement.append(categoryContainerElement); - } - } - } - cityssm.openHtmlModal('contract-addFee', { - onshow(modalElement) { - feeFilterElement = modalElement.querySelector('#feeSelect--feeName'); - feeFilterResultsElement = modalElement.querySelector('#resultsContainer--feeSelect'); - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetFees`, { - contractId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - feeCategories = responseJSON.feeCategories; - feeFilterElement.disabled = false; - feeFilterElement.addEventListener('keyup', filterFees); - feeFilterElement.focus(); - filterFees(); - }); - }, - onshown() { - bulmaJS.toggleHtmlClipped(); - }, - onhidden() { - renderContractFees(); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - addFeeButtonElement.focus(); - } - }); - }); - let contractTransactions = exports.contractTransactions; - delete exports.contractTransactions; - const contractTransactionsContainerElement = document.querySelector('#container--contractTransactions'); - function getTransactionGrandTotal() { - let transactionGrandTotal = 0; - for (const contractTransaction of contractTransactions) { - transactionGrandTotal += contractTransaction.transactionAmount; - } - return transactionGrandTotal; - } - function editContractTransaction(clickEvent) { - const transactionIndex = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset - .transactionIndex ?? '', 10); - const transaction = contractTransactions.find((possibleTransaction) => possibleTransaction.transactionIndex === transactionIndex); - let editCloseModalFunction; - function doEdit(formEvent) { - formEvent.preventDefault(); - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractTransaction`, formEvent.currentTarget, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractTransactions = responseJSON.contractTransactions; - renderContractTransactions(); - editCloseModalFunction(); - } - else { - bulmaJS.alert({ - title: 'Error Updating Transaction', - message: 'Please try again.', - contextualColorName: 'danger' - }); - } - }); - } - cityssm.openHtmlModal('contract-editTransaction', { - onshow(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); - modalElement.querySelector('#contractTransactionEdit--externalReceiptNumber').value = transaction.externalReceiptNumber ?? ''; - modalElement.querySelector('#contractTransactionEdit--transactionNote').value = transaction.transactionNote ?? ''; - modalElement.querySelector('#contractTransactionEdit--transactionDateString').value = transaction.transactionDateString ?? ''; - modalElement.querySelector('#contractTransactionEdit--transactionTimeString').value = transaction.transactionTimeString ?? ''; - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped(); - sunrise.initializeDatePickers(modalElement); - modalElement.querySelector('#contractTransactionEdit--transactionAmount').focus(); - modalElement.querySelector('form')?.addEventListener('submit', doEdit); - editCloseModalFunction = closeModalFunction; - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - } - }); - } - function deleteContractTransaction(clickEvent) { - const transactionIndex = clickEvent.currentTarget.closest('.container--contractTransaction').dataset.transactionIndex; - function doDelete() { - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractTransaction`, { - contractId, - transactionIndex - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractTransactions = responseJSON.contractTransactions; - renderContractTransactions(); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Transaction', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: 'Delete Transaction', - message: 'Are you sure you want to delete this transaction?', - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Transaction', - callbackFunction: doDelete - } - }); - } - function renderContractTransactions() { - if (contractTransactions.length === 0) { - // eslint-disable-next-line no-unsanitized/property - contractTransactionsContainerElement.innerHTML = `
-

There are no transactions associated with this record.

-
`; - return; - } - // eslint-disable-next-line no-unsanitized/property - contractTransactionsContainerElement.innerHTML = ` - - - - - - - - - - - - -
Date${sunrise.escapedAliases.ExternalReceiptNumber}AmountOptions
Transaction Total
`; - let transactionGrandTotal = 0; - for (const contractTransaction of contractTransactions) { - transactionGrandTotal += contractTransaction.transactionAmount; - const tableRowElement = document.createElement('tr'); - tableRowElement.className = 'container--contractTransaction'; - tableRowElement.dataset.transactionIndex = - contractTransaction.transactionIndex?.toString(); - let externalReceiptNumberHTML = ''; - if (contractTransaction.externalReceiptNumber !== '') { - externalReceiptNumberHTML = cityssm.escapeHTML(contractTransaction.externalReceiptNumber ?? ''); - if (sunrise.dynamicsGPIntegrationIsEnabled) { - if (contractTransaction.dynamicsGPDocument === undefined) { - externalReceiptNumberHTML += ` - - `; - } - else if (contractTransaction.dynamicsGPDocument.documentTotal.toFixed(2) === contractTransaction.transactionAmount.toFixed(2)) { - externalReceiptNumberHTML += ` - - `; - } - else { - externalReceiptNumberHTML += ` - - `; - } - } - externalReceiptNumberHTML += '
'; - } - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML(contractTransaction.transactionDateString ?? '')} - - - ${externalReceiptNumberHTML} - ${cityssm.escapeHTML(contractTransaction.transactionNote ?? '')} - - - $${cityssm.escapeHTML(contractTransaction.transactionAmount.toFixed(2))} - - -
- - -
- `; - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', editContractTransaction); - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteContractTransaction); - contractTransactionsContainerElement - .querySelector('tbody') - ?.append(tableRowElement); - } - ; - contractTransactionsContainerElement.querySelector('#contractTransactions--grandTotal').textContent = `$${transactionGrandTotal.toFixed(2)}`; - const feeGrandTotal = getFeeGrandTotal(); - if (feeGrandTotal.toFixed(2) !== transactionGrandTotal.toFixed(2)) { - contractTransactionsContainerElement.insertAdjacentHTML('afterbegin', `
-
-
-
-
Outstanding Balance
-
-
-
- $${cityssm.escapeHTML((feeGrandTotal - transactionGrandTotal).toFixed(2))} -
-
-
-
`); - } - } - const addTransactionButtonElement = document.querySelector('#button--addTransaction'); - addTransactionButtonElement.addEventListener('click', () => { - let transactionAmountElement; - let externalReceiptNumberElement; - let addCloseModalFunction; - function doAddTransaction(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractTransaction`, submitEvent.currentTarget, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - contractTransactions = responseJSON.contractTransactions; - addCloseModalFunction(); - renderContractTransactions(); - } - else { - bulmaJS.confirm({ - title: 'Error Adding Transaction', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - // eslint-disable-next-line @typescript-eslint/naming-convention - function dynamicsGP_refreshExternalReceiptNumberIcon() { - const externalReceiptNumber = externalReceiptNumberElement.value; - const iconElement = externalReceiptNumberElement - .closest('.control') - ?.querySelector('.icon'); - const helpTextElement = externalReceiptNumberElement - .closest('.field') - ?.querySelector('.help'); - if (externalReceiptNumber === '') { - helpTextElement.innerHTML = ' '; - iconElement.innerHTML = - ''; - return; - } - cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetDynamicsGPDocument`, { - externalReceiptNumber - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (!responseJSON.success || - responseJSON.dynamicsGPDocument === undefined) { - helpTextElement.textContent = 'No Matching Document Found'; - iconElement.innerHTML = - ''; - } - else if (transactionAmountElement.valueAsNumber === - responseJSON.dynamicsGPDocument.documentTotal) { - helpTextElement.textContent = 'Matching Document Found'; - iconElement.innerHTML = - ''; - } - else { - helpTextElement.textContent = `Matching Document: $${responseJSON.dynamicsGPDocument.documentTotal.toFixed(2)}`; - iconElement.innerHTML = - ''; - } - }); - } - cityssm.openHtmlModal('contract-addTransaction', { - onshow(modalElement) { - sunrise.populateAliases(modalElement); - modalElement.querySelector('#contractTransactionAdd--contractId').value = contractId.toString(); - const feeGrandTotal = getFeeGrandTotal(); - const transactionGrandTotal = getTransactionGrandTotal(); - transactionAmountElement = modalElement.querySelector('#contractTransactionAdd--transactionAmount'); - 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 (sunrise.dynamicsGPIntegrationIsEnabled) { - externalReceiptNumberElement = modalElement.querySelector('#contractTransactionAdd--externalReceiptNumber'); - const externalReceiptNumberControlElement = externalReceiptNumberElement.closest('.control'); - externalReceiptNumberControlElement.classList.add('has-icons-right'); - externalReceiptNumberControlElement.insertAdjacentHTML('beforeend', ''); - externalReceiptNumberControlElement.insertAdjacentHTML('afterend', '

'); - externalReceiptNumberElement.addEventListener('change', dynamicsGP_refreshExternalReceiptNumberIcon); - transactionAmountElement.addEventListener('change', dynamicsGP_refreshExternalReceiptNumberIcon); - dynamicsGP_refreshExternalReceiptNumberIcon(); - } - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped(); - transactionAmountElement.focus(); - addCloseModalFunction = closeModalFunction; - modalElement - .querySelector('form') - ?.addEventListener('submit', doAddTransaction); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - addTransactionButtonElement.focus(); - } - }); - }); - renderContractFees(); - } })(); diff --git a/public/javascripts/contract.edit.ts b/public/javascripts/contract.edit.ts index 0c2cbe88..96ea65f0 100644 --- a/public/javascripts/contract.edit.ts +++ b/public/javascripts/contract.edit.ts @@ -6,15 +6,7 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { BurialSite, - ContractComment, - ContractFee, - ContractInterment, - ContractTransaction, - ContractTypeField, - DynamicsGPDocument, - Fee, - FeeCategory, - WorkOrderType + ContractTypeField } from '../../types/recordTypes.js' import type { Sunrise } from './types.js' @@ -196,109 +188,6 @@ declare const exports: Record }) }) - document - .querySelector('#button--createWorkOrder') - ?.addEventListener('click', (clickEvent) => { - clickEvent.preventDefault() - - let createCloseModalFunction: () => void - - function doCreate(formEvent: SubmitEvent): void { - formEvent.preventDefault() - - cityssm.postJSON( - `${sunrise.urlPrefix}/workOrders/doCreateWorkOrder`, - formEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderId?: number - } - - if (responseJSON.success) { - createCloseModalFunction() - - bulmaJS.confirm({ - title: 'Work Order Created Successfully', - message: 'Would you like to open the work order now?', - contextualColorName: 'success', - okButton: { - text: 'Yes, Open the Work Order', - callbackFunction() { - globalThis.location.href = sunrise.getWorkOrderURL( - responseJSON.workOrderId, - true - ) - } - } - }) - } else { - bulmaJS.alert({ - title: 'Error Creating Work Order', - message: responseJSON.errorMessage as string, - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('contract-createWorkOrder', { - onshow(modalElement) { - ;( - modalElement.querySelector( - '#workOrderCreate--contractId' - ) as HTMLInputElement - ).value = contractId - ;( - modalElement.querySelector( - '#workOrderCreate--workOrderOpenDateString' - ) as HTMLInputElement - ).value = cityssm.dateToString(new Date()) - - const workOrderTypeSelectElement = modalElement.querySelector( - '#workOrderCreate--workOrderTypeId' - ) as HTMLSelectElement - - const workOrderTypes = (exports as Record) - .workOrderTypes as WorkOrderType[] - - if (workOrderTypes.length === 1) { - workOrderTypeSelectElement.innerHTML = '' - } - - for (const workOrderType of workOrderTypes) { - const optionElement = document.createElement('option') - optionElement.value = workOrderType.workOrderTypeId.toString() - optionElement.textContent = workOrderType.workOrderType ?? '' - workOrderTypeSelectElement.append(optionElement) - } - }, - onshown(modalElement, closeModalFunction) { - createCloseModalFunction = closeModalFunction - bulmaJS.toggleHtmlClipped() - ;( - modalElement.querySelector( - '#workOrderCreate--workOrderTypeId' - ) as HTMLSelectElement - ).focus() - - modalElement - .querySelector('form') - ?.addEventListener('submit', doCreate) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - ;( - document.querySelector( - '#button--createWorkOrder' - ) as HTMLButtonElement - ).focus() - } - }) - }) - // Contract Type const contractTypeIdElement = document.querySelector( @@ -668,24 +557,18 @@ declare const exports: Record // Start Date - sunrise.initializeDatePickers(formElement) - document .querySelector('#contract--contractStartDateString') ?.addEventListener('change', () => { - const endDatePicker = ( - document.querySelector( - '#contract--contractEndDateString' - ) as HTMLInputElement - ).bulmaCalendar.datePicker + const endDateElement = document.querySelector( + '#contract--contractEndDateString' + ) as HTMLInputElement - endDatePicker.min = ( + endDateElement.min = ( document.querySelector( '#contract--contractStartDateString' ) as HTMLInputElement ).value - - endDatePicker.refresh() }) sunrise.initializeUnlockFieldButtons(formElement) @@ -721,1424 +604,5 @@ declare const exports: Record setUnsavedChanges() }) - } else { - /** - * Interments - */ - - let contractInterments = exports.contractInterments as ContractInterment[] - delete exports.contractInterments - - function openEditContractInterment(clickEvent: Event): void {} - - function deleteContractInterment(clickEvent: Event): void {} - - function renderContractInterments(): void { - const containerElement = document.querySelector( - '#container--contractInterments' - ) as HTMLElement - - if (contractInterments.length === 0) { - containerElement.innerHTML = `
-

There are no interments associated with this record.

-
` - - return - } - - const tableElement = document.createElement('table') - tableElement.className = 'table is-fullwidth is-striped is-hoverable' - tableElement.innerHTML = ` - Name - Vital Statistics - Container - Options - - ` - - for (const interment of contractInterments) { - const tableRowElement = document.createElement('tr') - tableRowElement.dataset.intermentNumber = - interment.intermentNumber?.toString() - - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML(interment.deceasedName ?? '')}
- ${cityssm.escapeHTML(interment.deceasedAddress1 ?? '')}
- ${cityssm.escapeHTML(interment.deceasedAddress2 ?? '')}
- ${cityssm.escapeHTML(interment.deceasedCity ?? '')}, ${cityssm.escapeHTML( - interment.deceasedProvince ?? '' - )}
- ${cityssm.escapeHTML(interment.deceasedPostalCode ?? '')} - - -

- Birth:
- ${cityssm.escapeHTML(interment.birthDateString ?? '')}
- ${cityssm.escapeHTML(interment.birthPlace ?? '')} -

-

- Death:
- ${cityssm.escapeHTML(interment.deathDateString ?? '')}
- ${cityssm.escapeHTML(interment.deathPlace ?? '')} -

- - ${cityssm.escapeHTML(interment.intermentContainerType ?? '')} - -
- - -
- ` - - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', openEditContractInterment) - - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteContractInterment) - - tableElement.querySelector('tbody')?.append(tableRowElement) - } - - containerElement.innerHTML = '' - containerElement.append(tableElement) - } - - renderContractInterments() - - /** - * Comments - */ - - let contractComments = exports.contractComments as ContractComment[] - delete exports.contractComments - - function openEditContractComment(clickEvent: Event): void { - const contractCommentId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset - .contractCommentId ?? '', - 10 - ) - - const contractComment = contractComments.find( - (currentComment) => - currentComment.contractCommentId === contractCommentId - ) as ContractComment - - let editFormElement: HTMLFormElement - let editCloseModalFunction: () => void - - function editContractComment(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doUpdateContractComment`, - editFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractComments?: ContractComment[] - } - - if (responseJSON.success) { - contractComments = responseJSON.contractComments ?? [] - editCloseModalFunction() - renderContractComments() - } else { - bulmaJS.alert({ - title: 'Error Updating Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('contract-editComment', { - onshow(modalElement) { - sunrise.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#contractCommentEdit--contractId' - ) as HTMLInputElement - ).value = contractId - ;( - modalElement.querySelector( - '#contractCommentEdit--contractCommentId' - ) as HTMLInputElement - ).value = contractCommentId.toString() - ;( - modalElement.querySelector( - '#contractCommentEdit--contractComment' - ) as HTMLInputElement - ).value = contractComment.contractComment ?? '' - - const contractCommentDateStringElement = modalElement.querySelector( - '#contractCommentEdit--contractCommentDateString' - ) as HTMLInputElement - - contractCommentDateStringElement.value = - contractComment.contractCommentDateString ?? '' - - const currentDateString = cityssm.dateToString(new Date()) - - contractCommentDateStringElement.max = - contractComment.contractCommentDateString! <= currentDateString - ? currentDateString - : contractComment.contractCommentDateString ?? '' - ;( - modalElement.querySelector( - '#contractCommentEdit--contractCommentTimeString' - ) as HTMLInputElement - ).value = contractComment.contractCommentTimeString ?? '' - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - - sunrise.initializeDatePickers(modalElement) - ;( - modalElement.querySelector( - '#contractCommentEdit--contractComment' - ) as HTMLTextAreaElement - ).focus() - - editFormElement = modalElement.querySelector( - 'form' - ) as HTMLFormElement - - editFormElement.addEventListener('submit', editContractComment) - - editCloseModalFunction = closeModalFunction - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function deleteContractComment(clickEvent: Event): void { - const contractCommentId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset - .contractCommentId ?? '', - 10 - ) - - function doDelete(): void { - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doDeleteContractComment`, - { - contractId, - contractCommentId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractComments: ContractComment[] - } - - if (responseJSON.success) { - contractComments = responseJSON.contractComments - renderContractComments() - } else { - bulmaJS.alert({ - title: 'Error Removing Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Remove Comment?', - message: 'Are you sure you want to remove this comment?', - okButton: { - text: 'Yes, Remove Comment', - callbackFunction: doDelete - }, - contextualColorName: 'warning' - }) - } - - function renderContractComments(): void { - const containerElement = document.querySelector( - '#container--contractComments' - ) as HTMLElement - - if (contractComments.length === 0) { - containerElement.innerHTML = `
-

There are no comments associated with this record.

-
` - return - } - - const tableElement = document.createElement('table') - tableElement.className = 'table is-fullwidth is-striped is-hoverable' - tableElement.innerHTML = ` - Author - Comment Date - Comment - Options - - ` - - for (const contractComment of contractComments) { - const tableRowElement = document.createElement('tr') - tableRowElement.dataset.contractCommentId = - contractComment.contractCommentId?.toString() - - tableRowElement.innerHTML = `${cityssm.escapeHTML(contractComment.recordCreate_userName ?? '')} - - ${cityssm.escapeHTML(contractComment.commentDateString ?? '')} - ${cityssm.escapeHTML( - contractComment.commentTime === 0 - ? '' - : contractComment.commentTimePeriodString ?? '' - )} - - ${cityssm.escapeHTML(contractComment.comment ?? '')} - -
- - -
- ` - - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', openEditContractComment) - - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteContractComment) - - tableElement.querySelector('tbody')?.append(tableRowElement) - } - - containerElement.innerHTML = '' - containerElement.append(tableElement) - } - - document - .querySelector('#button--addComment') - ?.addEventListener('click', () => { - let addFormElement: HTMLFormElement - let addCloseModalFunction: () => void - - function addComment(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doAddContractComment`, - addFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractComments: ContractComment[] - } - - if (responseJSON.success) { - contractComments = responseJSON.contractComments - addCloseModalFunction() - renderContractComments() - } else { - bulmaJS.alert({ - title: 'Error Adding Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('contract-addComment', { - onshow(modalElement) { - sunrise.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#contractCommentAdd--contractId' - ) as HTMLInputElement - ).value = contractId - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - ;( - modalElement.querySelector( - '#contractCommentAdd--comment' - ) as HTMLTextAreaElement - ).focus() - - addFormElement = modalElement.querySelector( - 'form' - ) as HTMLFormElement - - addFormElement.addEventListener('submit', addComment) - - addCloseModalFunction = closeModalFunction - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - ;( - document.querySelector('#button--addComment') as HTMLButtonElement - ).focus() - } - }) - }) - - renderContractComments() - - /** - * Fees - */ - - let contractFees = exports.contractFees as ContractFee[] - delete exports.contractFees - - const contractFeesContainerElement = document.querySelector( - '#container--contractFees' - ) as HTMLElement - - function getFeeGrandTotal(): number { - let feeGrandTotal = 0 - - for (const contractFee of contractFees) { - feeGrandTotal += - ((contractFee.feeAmount ?? 0) + (contractFee.taxAmount ?? 0)) * - (contractFee.quantity ?? 0) - } - - return feeGrandTotal - } - - function editContractFeeQuantity(clickEvent: Event): void { - const feeId = Number.parseInt( - (clickEvent.currentTarget as HTMLButtonElement).closest('tr')?.dataset - .feeId ?? '', - 10 - ) - - const fee = contractFees.find( - (possibleFee) => possibleFee.feeId === feeId - ) as ContractFee - - let updateCloseModalFunction: () => void - - function doUpdateQuantity(formEvent: SubmitEvent): void { - formEvent.preventDefault() - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doUpdateContractFeeQuantity`, - formEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - contractFees: ContractFee[] - } - - if (responseJSON.success) { - contractFees = responseJSON.contractFees - renderContractFees() - updateCloseModalFunction() - } else { - bulmaJS.alert({ - title: 'Error Updating Quantity', - message: 'Please try again.', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('contract-editFeeQuantity', { - onshow(modalElement) { - ;( - modalElement.querySelector( - '#contractFeeQuantity--contractId' - ) as HTMLInputElement - ).value = contractId - ;( - modalElement.querySelector( - '#contractFeeQuantity--feeId' - ) as HTMLInputElement - ).value = fee.feeId.toString() - ;( - modalElement.querySelector( - '#contractFeeQuantity--quantity' - ) as HTMLInputElement - ).valueAsNumber = fee.quantity ?? 0 - ;( - modalElement.querySelector( - '#contractFeeQuantity--quantityUnit' - ) as HTMLElement - ).textContent = fee.quantityUnit ?? '' - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - - updateCloseModalFunction = closeModalFunction - ;( - modalElement.querySelector( - '#contractFeeQuantity--quantity' - ) as HTMLInputElement - ).focus() - - modalElement - .querySelector('form') - ?.addEventListener('submit', doUpdateQuantity) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function deleteContractFee(clickEvent: Event): void { - const feeId = ( - (clickEvent.currentTarget as HTMLElement).closest( - '.container--contractFee' - ) as HTMLElement - ).dataset.feeId - - function doDelete(): void { - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doDeleteContractFee`, - { - contractId, - feeId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractFees: ContractFee[] - } - - if (responseJSON.success) { - contractFees = responseJSON.contractFees - renderContractFees() - } else { - bulmaJS.alert({ - title: 'Error Deleting Fee', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Delete Fee', - message: 'Are you sure you want to delete this fee?', - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Fee', - callbackFunction: doDelete - } - }) - } - - // eslint-disable-next-line complexity - function renderContractFees(): void { - if (contractFees.length === 0) { - contractFeesContainerElement.innerHTML = `
-

There are no fees associated with this record.

-
` - - renderContractTransactions() - - return - } - - contractFeesContainerElement.innerHTML = ` - - - - - - - - - - - - - - - - - - - - - - -
FeeUnit Cost×QuantityequalsTotalOptions
Subtotal
Tax
Grand Total
` - - let feeAmountTotal = 0 - let taxAmountTotal = 0 - - for (const contractFee of contractFees) { - const tableRowElement = document.createElement('tr') - tableRowElement.className = 'container--contractFee' - tableRowElement.dataset.feeId = contractFee.feeId.toString() - tableRowElement.dataset.includeQuantity = - contractFee.includeQuantity ?? false ? '1' : '0' - - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML(contractFee.feeName ?? '')}
- ${cityssm.escapeHTML(contractFee.feeCategory ?? '')} - - ${ - contractFee.quantity === 1 - ? '' - : ` - $${contractFee.feeAmount?.toFixed(2)} - - × - ${contractFee.quantity?.toString()} - =` - } - - $${((contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0)).toFixed(2)} - - -
- ${ - contractFee.includeQuantity ?? false - ? `` - : '' - } - -
- ` - - tableRowElement - .querySelector('.button--editQuantity') - ?.addEventListener('click', editContractFeeQuantity) - - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteContractFee) - - contractFeesContainerElement - .querySelector('tbody') - ?.append(tableRowElement) - - feeAmountTotal += - (contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0) - - taxAmountTotal += - (contractFee.taxAmount ?? 0) * (contractFee.quantity ?? 0) - } - - ;( - contractFeesContainerElement.querySelector( - '#contractFees--feeAmountTotal' - ) as HTMLElement - ).textContent = `$${feeAmountTotal.toFixed(2)}` - ;( - contractFeesContainerElement.querySelector( - '#contractFees--taxAmountTotal' - ) as HTMLElement - ).textContent = `$${taxAmountTotal.toFixed(2)}` - ;( - contractFeesContainerElement.querySelector( - '#contractFees--grandTotal' - ) as HTMLElement - ).textContent = `$${(feeAmountTotal + taxAmountTotal).toFixed(2)}` - - renderContractTransactions() - } - - const addFeeButtonElement = document.querySelector( - '#button--addFee' - ) as HTMLButtonElement - - addFeeButtonElement.addEventListener('click', () => { - if (sunrise.hasUnsavedChanges()) { - bulmaJS.alert({ - message: 'Please save all unsaved changes before adding fees.', - contextualColorName: 'warning' - }) - return - } - - let feeCategories: FeeCategory[] - - let feeFilterElement: HTMLInputElement - let feeFilterResultsElement: HTMLElement - - function doAddFeeCategory(clickEvent: Event): void { - clickEvent.preventDefault() - - const feeCategoryId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).dataset.feeCategoryId ?? '', - 10 - ) - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doAddContractFeeCategory`, - { - contractId, - feeCategoryId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractFees: ContractFee[] - } - - if (responseJSON.success) { - contractFees = responseJSON.contractFees - renderContractFees() - - bulmaJS.alert({ - message: 'Fee Group Added Successfully', - contextualColorName: 'success' - }) - } else { - bulmaJS.alert({ - title: 'Error Adding Fee', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function doAddFee(feeId: number, quantity: number | string = 1): void { - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doAddContractFee`, - { - contractId, - feeId, - quantity - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractFees: ContractFee[] - } - - if (responseJSON.success) { - contractFees = responseJSON.contractFees - renderContractFees() - filterFees() - } else { - bulmaJS.alert({ - title: 'Error Adding Fee', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - function doSetQuantityAndAddFee(fee: Fee): void { - let quantityElement: HTMLInputElement - let quantityCloseModalFunction: () => void - - function doSetQuantity(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - doAddFee(fee.feeId, quantityElement.value) - quantityCloseModalFunction() - } - - cityssm.openHtmlModal('contract-setFeeQuantity', { - onshow(modalElement) { - ;( - modalElement.querySelector( - '#contractFeeQuantity--quantityUnit' - ) as HTMLElement - ).textContent = fee.quantityUnit ?? '' - }, - onshown(modalElement, closeModalFunction) { - quantityCloseModalFunction = closeModalFunction - - quantityElement = modalElement.querySelector( - '#contractFeeQuantity--quantity' - ) as HTMLInputElement - - modalElement - .querySelector('form') - ?.addEventListener('submit', doSetQuantity) - } - }) - } - - function tryAddFee(clickEvent: Event): void { - clickEvent.preventDefault() - - const feeId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).dataset.feeId ?? '', - 10 - ) - const feeCategoryId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).dataset.feeCategoryId ?? '', - 10 - ) - - const feeCategory = feeCategories.find( - (currentFeeCategory) => - currentFeeCategory.feeCategoryId === feeCategoryId - ) as FeeCategory - - const fee = feeCategory.fees.find( - (currentFee) => currentFee.feeId === feeId - ) as Fee - - if (fee.includeQuantity ?? false) { - doSetQuantityAndAddFee(fee) - } else { - doAddFee(feeId) - } - } - - function filterFees(): void { - const filterStringPieces = feeFilterElement.value - .trim() - .toLowerCase() - .split(' ') - - feeFilterResultsElement.innerHTML = '' - - for (const feeCategory of feeCategories) { - const categoryContainerElement = document.createElement('div') - - categoryContainerElement.className = 'container--feeCategory' - - categoryContainerElement.dataset.feeCategoryId = - feeCategory.feeCategoryId.toString() - - categoryContainerElement.innerHTML = `
-
-

- ${cityssm.escapeHTML(feeCategory.feeCategory ?? '')} -

-
-
-
` - - if (feeCategory.isGroupedFee) { - // eslint-disable-next-line no-unsanitized/method - categoryContainerElement - .querySelector('.columns') - ?.insertAdjacentHTML( - 'beforeend', - `
- -
` - ) - - categoryContainerElement - .querySelector('button') - ?.addEventListener('click', doAddFeeCategory) - } - - let hasFees = false - - for (const fee of feeCategory.fees) { - // Don't include already applied fees that limit quantity - if ( - contractFeesContainerElement.querySelector( - `.container--contractFee[data-fee-id='${fee.feeId}'][data-include-quantity='0']` - ) !== null - ) { - continue - } - - let includeFee = true - - const feeSearchString = - `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase() - - for (const filterStringPiece of filterStringPieces) { - if (!feeSearchString.includes(filterStringPiece)) { - includeFee = false - break - } - } - - if (!includeFee) { - continue - } - - hasFees = true - - const panelBlockElement = document.createElement( - feeCategory.isGroupedFee ? 'div' : 'a' - ) - panelBlockElement.className = 'panel-block is-block container--fee' - panelBlockElement.dataset.feeId = fee.feeId.toString() - panelBlockElement.dataset.feeCategoryId = - feeCategory.feeCategoryId.toString() - - // eslint-disable-next-line no-unsanitized/property - panelBlockElement.innerHTML = `${cityssm.escapeHTML(fee.feeName ?? '')}
- - ${cityssm - .escapeHTML(fee.feeDescription ?? '') - .replaceAll('\n', '
')} - ` - - if (!feeCategory.isGroupedFee) { - ;(panelBlockElement as HTMLAnchorElement).href = '#' - panelBlockElement.addEventListener('click', tryAddFee) - } - ;( - categoryContainerElement.querySelector('.panel') as HTMLElement - ).append(panelBlockElement) - } - - if (hasFees) { - feeFilterResultsElement.append(categoryContainerElement) - } - } - } - - cityssm.openHtmlModal('contract-addFee', { - onshow(modalElement) { - feeFilterElement = modalElement.querySelector( - '#feeSelect--feeName' - ) as HTMLInputElement - - feeFilterResultsElement = modalElement.querySelector( - '#resultsContainer--feeSelect' - ) as HTMLElement - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doGetFees`, - { - contractId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - feeCategories: FeeCategory[] - } - - feeCategories = responseJSON.feeCategories - - feeFilterElement.disabled = false - feeFilterElement.addEventListener('keyup', filterFees) - feeFilterElement.focus() - - filterFees() - } - ) - }, - onshown() { - bulmaJS.toggleHtmlClipped() - }, - onhidden() { - renderContractFees() - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - addFeeButtonElement.focus() - } - }) - }) - - let contractTransactions = - exports.contractTransactions as ContractTransaction[] - delete exports.contractTransactions - - const contractTransactionsContainerElement = document.querySelector( - '#container--contractTransactions' - ) as HTMLElement - - function getTransactionGrandTotal(): number { - let transactionGrandTotal = 0 - - for (const contractTransaction of contractTransactions) { - transactionGrandTotal += contractTransaction.transactionAmount - } - - return transactionGrandTotal - } - - function editContractTransaction(clickEvent: Event): void { - const transactionIndex = Number.parseInt( - (clickEvent.currentTarget as HTMLButtonElement).closest('tr')?.dataset - .transactionIndex ?? '', - 10 - ) - - const transaction = contractTransactions.find( - (possibleTransaction) => - possibleTransaction.transactionIndex === transactionIndex - ) as ContractTransaction - - let editCloseModalFunction: () => void - - function doEdit(formEvent: SubmitEvent): void { - formEvent.preventDefault() - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doUpdateContractTransaction`, - formEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - contractTransactions: ContractTransaction[] - } - - if (responseJSON.success) { - contractTransactions = responseJSON.contractTransactions - renderContractTransactions() - editCloseModalFunction() - } else { - bulmaJS.alert({ - title: 'Error Updating Transaction', - message: 'Please try again.', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('contract-editTransaction', { - onshow(modalElement) { - sunrise.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#contractTransactionEdit--contractId' - ) as HTMLInputElement - ).value = contractId - ;( - modalElement.querySelector( - '#contractTransactionEdit--transactionIndex' - ) as HTMLInputElement - ).value = transaction.transactionIndex?.toString() ?? '' - ;( - modalElement.querySelector( - '#contractTransactionEdit--transactionAmount' - ) as HTMLInputElement - ).value = transaction.transactionAmount.toFixed(2) - ;( - modalElement.querySelector( - '#contractTransactionEdit--externalReceiptNumber' - ) as HTMLInputElement - ).value = transaction.externalReceiptNumber ?? '' - ;( - modalElement.querySelector( - '#contractTransactionEdit--transactionNote' - ) as HTMLTextAreaElement - ).value = transaction.transactionNote ?? '' - ;( - modalElement.querySelector( - '#contractTransactionEdit--transactionDateString' - ) as HTMLInputElement - ).value = transaction.transactionDateString ?? '' - ;( - modalElement.querySelector( - '#contractTransactionEdit--transactionTimeString' - ) as HTMLInputElement - ).value = transaction.transactionTimeString ?? '' - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - - sunrise.initializeDatePickers(modalElement) - ;( - modalElement.querySelector( - '#contractTransactionEdit--transactionAmount' - ) as HTMLInputElement - ).focus() - - modalElement.querySelector('form')?.addEventListener('submit', doEdit) - - editCloseModalFunction = closeModalFunction - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function deleteContractTransaction(clickEvent: Event): void { - const transactionIndex = ( - (clickEvent.currentTarget as HTMLElement).closest( - '.container--contractTransaction' - ) as HTMLElement - ).dataset.transactionIndex - - function doDelete(): void { - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doDeleteContractTransaction`, - { - contractId, - transactionIndex - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractTransactions: ContractTransaction[] - } - - if (responseJSON.success) { - contractTransactions = responseJSON.contractTransactions - renderContractTransactions() - } else { - bulmaJS.alert({ - title: 'Error Deleting Transaction', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Delete Transaction', - message: 'Are you sure you want to delete this transaction?', - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Transaction', - callbackFunction: doDelete - } - }) - } - - function renderContractTransactions(): void { - if (contractTransactions.length === 0) { - // eslint-disable-next-line no-unsanitized/property - contractTransactionsContainerElement.innerHTML = `
-

There are no transactions associated with this record.

-
` - - return - } - - // eslint-disable-next-line no-unsanitized/property - contractTransactionsContainerElement.innerHTML = ` - - - - - - - - - - - - -
Date${sunrise.escapedAliases.ExternalReceiptNumber}AmountOptions
Transaction Total
` - - let transactionGrandTotal = 0 - - for (const contractTransaction of contractTransactions) { - transactionGrandTotal += contractTransaction.transactionAmount - - const tableRowElement = document.createElement('tr') - tableRowElement.className = 'container--contractTransaction' - tableRowElement.dataset.transactionIndex = - contractTransaction.transactionIndex?.toString() - - let externalReceiptNumberHTML = '' - - if (contractTransaction.externalReceiptNumber !== '') { - externalReceiptNumberHTML = cityssm.escapeHTML( - contractTransaction.externalReceiptNumber ?? '' - ) - - if (sunrise.dynamicsGPIntegrationIsEnabled) { - if (contractTransaction.dynamicsGPDocument === undefined) { - externalReceiptNumberHTML += ` - - ` - } else if ( - contractTransaction.dynamicsGPDocument.documentTotal.toFixed( - 2 - ) === contractTransaction.transactionAmount.toFixed(2) - ) { - externalReceiptNumberHTML += ` - - ` - } else { - externalReceiptNumberHTML += ` - - ` - } - } - - externalReceiptNumberHTML += '
' - } - - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML(contractTransaction.transactionDateString ?? '')} - - - ${externalReceiptNumberHTML} - ${cityssm.escapeHTML(contractTransaction.transactionNote ?? '')} - - - $${cityssm.escapeHTML(contractTransaction.transactionAmount.toFixed(2))} - - -
- - -
- ` - - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', editContractTransaction) - - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteContractTransaction) - - contractTransactionsContainerElement - .querySelector('tbody') - ?.append(tableRowElement) - } - - ;( - contractTransactionsContainerElement.querySelector( - '#contractTransactions--grandTotal' - ) as HTMLElement - ).textContent = `$${transactionGrandTotal.toFixed(2)}` - - const feeGrandTotal = getFeeGrandTotal() - - if (feeGrandTotal.toFixed(2) !== transactionGrandTotal.toFixed(2)) { - contractTransactionsContainerElement.insertAdjacentHTML( - 'afterbegin', - `
-
-
-
-
Outstanding Balance
-
-
-
- $${cityssm.escapeHTML((feeGrandTotal - transactionGrandTotal).toFixed(2))} -
-
-
-
` - ) - } - } - - const addTransactionButtonElement = document.querySelector( - '#button--addTransaction' - ) as HTMLButtonElement - - addTransactionButtonElement.addEventListener('click', () => { - let transactionAmountElement: HTMLInputElement - let externalReceiptNumberElement: HTMLInputElement - - let addCloseModalFunction: () => void - - function doAddTransaction(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doAddContractTransaction`, - submitEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - contractTransactions: ContractTransaction[] - } - - if (responseJSON.success) { - contractTransactions = responseJSON.contractTransactions - addCloseModalFunction() - renderContractTransactions() - } else { - bulmaJS.confirm({ - title: 'Error Adding Transaction', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - // eslint-disable-next-line @typescript-eslint/naming-convention - function dynamicsGP_refreshExternalReceiptNumberIcon(): void { - const externalReceiptNumber = externalReceiptNumberElement.value - - const iconElement = externalReceiptNumberElement - .closest('.control') - ?.querySelector('.icon') as HTMLElement - - const helpTextElement = externalReceiptNumberElement - .closest('.field') - ?.querySelector('.help') as HTMLElement - - if (externalReceiptNumber === '') { - helpTextElement.innerHTML = ' ' - iconElement.innerHTML = - '' - return - } - - cityssm.postJSON( - `${sunrise.urlPrefix}/contracts/doGetDynamicsGPDocument`, - { - externalReceiptNumber - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - dynamicsGPDocument?: DynamicsGPDocument - } - - if ( - !responseJSON.success || - responseJSON.dynamicsGPDocument === undefined - ) { - helpTextElement.textContent = 'No Matching Document Found' - iconElement.innerHTML = - '' - } else if ( - transactionAmountElement.valueAsNumber === - responseJSON.dynamicsGPDocument.documentTotal - ) { - helpTextElement.textContent = 'Matching Document Found' - iconElement.innerHTML = - '' - } else { - helpTextElement.textContent = `Matching Document: $${responseJSON.dynamicsGPDocument.documentTotal.toFixed(2)}` - iconElement.innerHTML = - '' - } - } - ) - } - - cityssm.openHtmlModal('contract-addTransaction', { - onshow(modalElement) { - sunrise.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#contractTransactionAdd--contractId' - ) as HTMLInputElement - ).value = contractId.toString() - - const feeGrandTotal = getFeeGrandTotal() - const transactionGrandTotal = getTransactionGrandTotal() - - transactionAmountElement = modalElement.querySelector( - '#contractTransactionAdd--transactionAmount' - ) as HTMLInputElement - - 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 (sunrise.dynamicsGPIntegrationIsEnabled) { - externalReceiptNumberElement = modalElement.querySelector( - '#contractTransactionAdd--externalReceiptNumber' - ) as HTMLInputElement - - const externalReceiptNumberControlElement = - externalReceiptNumberElement.closest('.control') as HTMLElement - - externalReceiptNumberControlElement.classList.add('has-icons-right') - - externalReceiptNumberControlElement.insertAdjacentHTML( - 'beforeend', - '' - ) - - externalReceiptNumberControlElement.insertAdjacentHTML( - 'afterend', - '

' - ) - - externalReceiptNumberElement.addEventListener( - 'change', - dynamicsGP_refreshExternalReceiptNumberIcon - ) - - transactionAmountElement.addEventListener( - 'change', - dynamicsGP_refreshExternalReceiptNumberIcon - ) - - dynamicsGP_refreshExternalReceiptNumberIcon() - } - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - - transactionAmountElement.focus() - - addCloseModalFunction = closeModalFunction - - modalElement - .querySelector('form') - ?.addEventListener('submit', doAddTransaction) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - addTransactionButtonElement.focus() - } - }) - }) - - renderContractFees() } })() diff --git a/public/javascripts/contract.editComments.d.ts b/public/javascripts/contract.editComments.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/contract.editComments.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/contract.editComments.js b/public/javascripts/contract.editComments.js new file mode 100644 index 00000000..42eaca37 --- /dev/null +++ b/public/javascripts/contract.editComments.js @@ -0,0 +1,185 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const contractId = document.querySelector('#contract--contractId').value; + let contractComments = exports.contractComments; + delete exports.contractComments; + function openEditContractComment(clickEvent) { + const contractCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .contractCommentId ?? '', 10); + const contractComment = contractComments.find((currentComment) => currentComment.contractCommentId === contractCommentId); + let editFormElement; + let editCloseModalFunction; + function editContractComment(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractComment`, editFormElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractComments = responseJSON.contractComments ?? []; + editCloseModalFunction(); + renderContractComments(); + } + else { + bulmaJS.alert({ + title: 'Error Updating Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('contract-editComment', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + modalElement.querySelector('#contractCommentEdit--contractId').value = contractId; + modalElement.querySelector('#contractCommentEdit--contractCommentId').value = contractCommentId.toString(); + modalElement.querySelector('#contractCommentEdit--comment').value = contractComment.comment ?? ''; + const contractCommentDateStringElement = modalElement.querySelector('#contractCommentEdit--commentDateString'); + contractCommentDateStringElement.value = + contractComment.commentDateString ?? ''; + const currentDateString = cityssm.dateToString(new Date()); + contractCommentDateStringElement.max = + contractComment.commentDateString <= currentDateString + ? currentDateString + : contractComment.commentDateString ?? ''; + modalElement.querySelector('#contractCommentEdit--commentTimeString').value = contractComment.commentTimeString ?? ''; + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#contractCommentEdit--comment').focus(); + editFormElement = modalElement.querySelector('form'); + editFormElement.addEventListener('submit', editContractComment); + editCloseModalFunction = closeModalFunction; + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function deleteContractComment(clickEvent) { + const contractCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .contractCommentId ?? '', 10); + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractComment`, { + contractId, + contractCommentId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractComments = responseJSON.contractComments; + renderContractComments(); + } + else { + bulmaJS.alert({ + title: 'Error Removing Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: 'Remove Comment?', + message: 'Are you sure you want to remove this comment?', + okButton: { + text: 'Yes, Remove Comment', + callbackFunction: doDelete + }, + contextualColorName: 'warning' + }); + } + function renderContractComments() { + const containerElement = document.querySelector('#container--contractComments'); + if (contractComments.length === 0) { + containerElement.innerHTML = `
+

There are no comments associated with this record.

+
`; + return; + } + const tableElement = document.createElement('table'); + tableElement.className = 'table is-fullwidth is-striped is-hoverable'; + tableElement.innerHTML = ` + Author + Comment Date + Comment + Options + + `; + for (const contractComment of contractComments) { + const tableRowElement = document.createElement('tr'); + tableRowElement.dataset.contractCommentId = + contractComment.contractCommentId?.toString(); + tableRowElement.innerHTML = `${cityssm.escapeHTML(contractComment.recordCreate_userName ?? '')} + + ${cityssm.escapeHTML(contractComment.commentDateString ?? '')} + ${cityssm.escapeHTML(contractComment.commentTime === 0 + ? '' + : contractComment.commentTimePeriodString ?? '')} + + ${cityssm.escapeHTML(contractComment.comment ?? '')} + +
+ + +
+ `; + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', openEditContractComment); + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractComment); + tableElement.querySelector('tbody')?.append(tableRowElement); + } + containerElement.innerHTML = ''; + containerElement.append(tableElement); + } + document + .querySelector('#button--addComment') + ?.addEventListener('click', () => { + let addFormElement; + let addCloseModalFunction; + function addComment(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractComment`, addFormElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractComments = responseJSON.contractComments; + addCloseModalFunction(); + renderContractComments(); + } + else { + bulmaJS.alert({ + title: 'Error Adding Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('contract-addComment', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + modalElement.querySelector('#contractCommentAdd--contractId').value = contractId; + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#contractCommentAdd--comment').focus(); + addFormElement = modalElement.querySelector('form'); + addFormElement.addEventListener('submit', addComment); + addCloseModalFunction = closeModalFunction; + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + document.querySelector('#button--addComment').focus(); + } + }); + }); + renderContractComments(); +})(); diff --git a/public/javascripts/contract.editComments.ts b/public/javascripts/contract.editComments.ts new file mode 100644 index 00000000..5010f357 --- /dev/null +++ b/public/javascripts/contract.editComments.ts @@ -0,0 +1,299 @@ +import type { BulmaJS } from '@cityssm/bulma-js/types.js' +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { ContractComment } from '../../types/recordTypes.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 contractId = ( + document.querySelector('#contract--contractId') as HTMLInputElement + ).value + + let contractComments = exports.contractComments as ContractComment[] + delete exports.contractComments + + function openEditContractComment(clickEvent: Event): void { + const contractCommentId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset + .contractCommentId ?? '', + 10 + ) + + const contractComment = contractComments.find( + (currentComment) => currentComment.contractCommentId === contractCommentId + ) as ContractComment + + let editFormElement: HTMLFormElement + let editCloseModalFunction: () => void + + function editContractComment(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doUpdateContractComment`, + editFormElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractComments?: ContractComment[] + } + + if (responseJSON.success) { + contractComments = responseJSON.contractComments ?? [] + editCloseModalFunction() + renderContractComments() + } else { + bulmaJS.alert({ + title: 'Error Updating Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('contract-editComment', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + ;( + modalElement.querySelector( + '#contractCommentEdit--contractId' + ) as HTMLInputElement + ).value = contractId + ;( + modalElement.querySelector( + '#contractCommentEdit--contractCommentId' + ) as HTMLInputElement + ).value = contractCommentId.toString() + ;( + modalElement.querySelector( + '#contractCommentEdit--comment' + ) as HTMLInputElement + ).value = contractComment.comment ?? '' + + const contractCommentDateStringElement = modalElement.querySelector( + '#contractCommentEdit--commentDateString' + ) as HTMLInputElement + + contractCommentDateStringElement.value = + contractComment.commentDateString ?? '' + + const currentDateString = cityssm.dateToString(new Date()) + + contractCommentDateStringElement.max = + contractComment.commentDateString! <= currentDateString + ? currentDateString + : contractComment.commentDateString ?? '' + ;( + modalElement.querySelector( + '#contractCommentEdit--commentTimeString' + ) as HTMLInputElement + ).value = contractComment.commentTimeString ?? '' + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + + ;( + modalElement.querySelector( + '#contractCommentEdit--comment' + ) as HTMLTextAreaElement + ).focus() + + editFormElement = modalElement.querySelector('form') as HTMLFormElement + + editFormElement.addEventListener('submit', editContractComment) + + editCloseModalFunction = closeModalFunction + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function deleteContractComment(clickEvent: Event): void { + const contractCommentId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset + .contractCommentId ?? '', + 10 + ) + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doDeleteContractComment`, + { + contractId, + contractCommentId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractComments: ContractComment[] + } + + if (responseJSON.success) { + contractComments = responseJSON.contractComments + renderContractComments() + } else { + bulmaJS.alert({ + title: 'Error Removing Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: 'Remove Comment?', + message: 'Are you sure you want to remove this comment?', + okButton: { + text: 'Yes, Remove Comment', + callbackFunction: doDelete + }, + contextualColorName: 'warning' + }) + } + + function renderContractComments(): void { + const containerElement = document.querySelector( + '#container--contractComments' + ) as HTMLElement + + if (contractComments.length === 0) { + containerElement.innerHTML = `
+

There are no comments associated with this record.

+
` + return + } + + const tableElement = document.createElement('table') + tableElement.className = 'table is-fullwidth is-striped is-hoverable' + tableElement.innerHTML = ` + Author + Comment Date + Comment + Options + + ` + + for (const contractComment of contractComments) { + const tableRowElement = document.createElement('tr') + tableRowElement.dataset.contractCommentId = + contractComment.contractCommentId?.toString() + + tableRowElement.innerHTML = `${cityssm.escapeHTML(contractComment.recordCreate_userName ?? '')} + + ${cityssm.escapeHTML(contractComment.commentDateString ?? '')} + ${cityssm.escapeHTML( + contractComment.commentTime === 0 + ? '' + : contractComment.commentTimePeriodString ?? '' + )} + + ${cityssm.escapeHTML(contractComment.comment ?? '')} + +
+ + +
+ ` + + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', openEditContractComment) + + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractComment) + + tableElement.querySelector('tbody')?.append(tableRowElement) + } + + containerElement.innerHTML = '' + containerElement.append(tableElement) + } + + document + .querySelector('#button--addComment') + ?.addEventListener('click', () => { + let addFormElement: HTMLFormElement + let addCloseModalFunction: () => void + + function addComment(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doAddContractComment`, + addFormElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractComments: ContractComment[] + } + + if (responseJSON.success) { + contractComments = responseJSON.contractComments + addCloseModalFunction() + renderContractComments() + } else { + bulmaJS.alert({ + title: 'Error Adding Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('contract-addComment', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + ;( + modalElement.querySelector( + '#contractCommentAdd--contractId' + ) as HTMLInputElement + ).value = contractId + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + ;( + modalElement.querySelector( + '#contractCommentAdd--comment' + ) as HTMLTextAreaElement + ).focus() + + addFormElement = modalElement.querySelector('form') as HTMLFormElement + + addFormElement.addEventListener('submit', addComment) + + addCloseModalFunction = closeModalFunction + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + ;( + document.querySelector('#button--addComment') as HTMLButtonElement + ).focus() + } + }) + }) + + renderContractComments() +})() diff --git a/public/javascripts/contract.editFees.d.ts b/public/javascripts/contract.editFees.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/contract.editFees.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/contract.editFees.js b/public/javascripts/contract.editFees.js new file mode 100644 index 00000000..0e435ab3 --- /dev/null +++ b/public/javascripts/contract.editFees.js @@ -0,0 +1,668 @@ +"use strict"; +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable max-lines */ +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const contractId = document.querySelector('#contract--contractId').value; + let contractFees = exports.contractFees; + delete exports.contractFees; + const contractFeesContainerElement = document.querySelector('#container--contractFees'); + function getFeeGrandTotal() { + let feeGrandTotal = 0; + for (const contractFee of contractFees) { + feeGrandTotal += + ((contractFee.feeAmount ?? 0) + (contractFee.taxAmount ?? 0)) * + (contractFee.quantity ?? 0); + } + return feeGrandTotal; + } + function editContractFeeQuantity(clickEvent) { + const feeId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .feeId ?? '', 10); + const fee = contractFees.find((possibleFee) => possibleFee.feeId === feeId); + let updateCloseModalFunction; + function doUpdateQuantity(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractFeeQuantity`, formEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractFees = responseJSON.contractFees; + renderContractFees(); + updateCloseModalFunction(); + } + else { + bulmaJS.alert({ + title: 'Error Updating Quantity', + message: 'Please try again.', + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('contract-editFeeQuantity', { + onshow(modalElement) { + ; + modalElement.querySelector('#contractFeeQuantity--contractId').value = contractId; + modalElement.querySelector('#contractFeeQuantity--feeId').value = fee.feeId.toString(); + modalElement.querySelector('#contractFeeQuantity--quantity').valueAsNumber = fee.quantity ?? 0; + modalElement.querySelector('#contractFeeQuantity--quantityUnit').textContent = fee.quantityUnit ?? ''; + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + updateCloseModalFunction = closeModalFunction; + modalElement.querySelector('#contractFeeQuantity--quantity').focus(); + modalElement + .querySelector('form') + ?.addEventListener('submit', doUpdateQuantity); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function deleteContractFee(clickEvent) { + const feeId = clickEvent.currentTarget.closest('.container--contractFee').dataset.feeId; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractFee`, { + contractId, + feeId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractFees = responseJSON.contractFees; + renderContractFees(); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Fee', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: 'Delete Fee', + message: 'Are you sure you want to delete this fee?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Fee', + callbackFunction: doDelete + } + }); + } + // eslint-disable-next-line complexity + function renderContractFees() { + if (contractFees.length === 0) { + contractFeesContainerElement.innerHTML = `
+

There are no fees associated with this record.

+
`; + renderContractTransactions(); + return; + } + contractFeesContainerElement.innerHTML = ` + + + + + + + + + + + + + + + + + + + + + + +
FeeUnit Cost×QuantityequalsTotalOptions
Subtotal
Tax
Grand Total
`; + let feeAmountTotal = 0; + let taxAmountTotal = 0; + for (const contractFee of contractFees) { + const tableRowElement = document.createElement('tr'); + tableRowElement.className = 'container--contractFee'; + tableRowElement.dataset.feeId = contractFee.feeId.toString(); + tableRowElement.dataset.includeQuantity = + contractFee.includeQuantity ?? false ? '1' : '0'; + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(contractFee.feeName ?? '')}
+ ${cityssm.escapeHTML(contractFee.feeCategory ?? '')} + + ${contractFee.quantity === 1 + ? '' + : ` + $${contractFee.feeAmount?.toFixed(2)} + + × + ${contractFee.quantity?.toString()} + =`} + + $${((contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0)).toFixed(2)} + + +
+ ${contractFee.includeQuantity ?? false + ? `` + : ''} + +
+ `; + tableRowElement + .querySelector('.button--editQuantity') + ?.addEventListener('click', editContractFeeQuantity); + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractFee); + contractFeesContainerElement + .querySelector('tbody') + ?.append(tableRowElement); + feeAmountTotal += + (contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0); + taxAmountTotal += + (contractFee.taxAmount ?? 0) * (contractFee.quantity ?? 0); + } + ; + contractFeesContainerElement.querySelector('#contractFees--feeAmountTotal').textContent = `$${feeAmountTotal.toFixed(2)}`; + contractFeesContainerElement.querySelector('#contractFees--taxAmountTotal').textContent = `$${taxAmountTotal.toFixed(2)}`; + contractFeesContainerElement.querySelector('#contractFees--grandTotal').textContent = `$${(feeAmountTotal + taxAmountTotal).toFixed(2)}`; + renderContractTransactions(); + } + const addFeeButtonElement = document.querySelector('#button--addFee'); + addFeeButtonElement.addEventListener('click', () => { + if (sunrise.hasUnsavedChanges()) { + bulmaJS.alert({ + message: 'Please save all unsaved changes before adding fees.', + contextualColorName: 'warning' + }); + return; + } + let feeCategories; + let feeFilterElement; + let feeFilterResultsElement; + function doAddFeeCategory(clickEvent) { + clickEvent.preventDefault(); + const feeCategoryId = Number.parseInt(clickEvent.currentTarget.dataset.feeCategoryId ?? '', 10); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractFeeCategory`, { + contractId, + feeCategoryId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractFees = responseJSON.contractFees; + renderContractFees(); + bulmaJS.alert({ + message: 'Fee Group Added Successfully', + contextualColorName: 'success' + }); + } + else { + bulmaJS.alert({ + title: 'Error Adding Fee', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + function doAddFee(feeId, quantity = 1) { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractFee`, { + contractId, + feeId, + quantity + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractFees = responseJSON.contractFees; + renderContractFees(); + filterFees(); + } + else { + bulmaJS.alert({ + title: 'Error Adding Fee', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + function doSetQuantityAndAddFee(fee) { + let quantityElement; + let quantityCloseModalFunction; + function doSetQuantity(submitEvent) { + submitEvent.preventDefault(); + doAddFee(fee.feeId, quantityElement.value); + quantityCloseModalFunction(); + } + cityssm.openHtmlModal('contract-setFeeQuantity', { + onshow(modalElement) { + ; + modalElement.querySelector('#contractFeeQuantity--quantityUnit').textContent = fee.quantityUnit ?? ''; + }, + onshown(modalElement, closeModalFunction) { + quantityCloseModalFunction = closeModalFunction; + quantityElement = modalElement.querySelector('#contractFeeQuantity--quantity'); + modalElement + .querySelector('form') + ?.addEventListener('submit', doSetQuantity); + } + }); + } + function tryAddFee(clickEvent) { + clickEvent.preventDefault(); + const feeId = Number.parseInt(clickEvent.currentTarget.dataset.feeId ?? '', 10); + const feeCategoryId = Number.parseInt(clickEvent.currentTarget.dataset.feeCategoryId ?? '', 10); + const feeCategory = feeCategories.find((currentFeeCategory) => currentFeeCategory.feeCategoryId === feeCategoryId); + const fee = feeCategory.fees.find((currentFee) => currentFee.feeId === feeId); + if (fee.includeQuantity ?? false) { + doSetQuantityAndAddFee(fee); + } + else { + doAddFee(feeId); + } + } + function filterFees() { + const filterStringPieces = feeFilterElement.value + .trim() + .toLowerCase() + .split(' '); + feeFilterResultsElement.innerHTML = ''; + for (const feeCategory of feeCategories) { + const categoryContainerElement = document.createElement('div'); + categoryContainerElement.className = 'container--feeCategory'; + categoryContainerElement.dataset.feeCategoryId = + feeCategory.feeCategoryId.toString(); + categoryContainerElement.innerHTML = `
+
+

+ ${cityssm.escapeHTML(feeCategory.feeCategory ?? '')} +

+
+
+
`; + if (feeCategory.isGroupedFee) { + // eslint-disable-next-line no-unsanitized/method + categoryContainerElement + .querySelector('.columns') + ?.insertAdjacentHTML('beforeend', `
+ +
`); + categoryContainerElement + .querySelector('button') + ?.addEventListener('click', doAddFeeCategory); + } + let hasFees = false; + for (const fee of feeCategory.fees) { + // Don't include already applied fees that limit quantity + if (contractFeesContainerElement.querySelector(`.container--contractFee[data-fee-id='${fee.feeId}'][data-include-quantity='0']`) !== null) { + continue; + } + let includeFee = true; + const feeSearchString = `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase(); + for (const filterStringPiece of filterStringPieces) { + if (!feeSearchString.includes(filterStringPiece)) { + includeFee = false; + break; + } + } + if (!includeFee) { + continue; + } + hasFees = true; + const panelBlockElement = document.createElement(feeCategory.isGroupedFee ? 'div' : 'a'); + panelBlockElement.className = 'panel-block is-block container--fee'; + panelBlockElement.dataset.feeId = fee.feeId.toString(); + panelBlockElement.dataset.feeCategoryId = + feeCategory.feeCategoryId.toString(); + // eslint-disable-next-line no-unsanitized/property + panelBlockElement.innerHTML = `${cityssm.escapeHTML(fee.feeName ?? '')}
+ + ${cityssm + .escapeHTML(fee.feeDescription ?? '') + .replaceAll('\n', '
')} + `; + if (!feeCategory.isGroupedFee) { + ; + panelBlockElement.href = '#'; + panelBlockElement.addEventListener('click', tryAddFee); + } + ; + categoryContainerElement.querySelector('.panel').append(panelBlockElement); + } + if (hasFees) { + feeFilterResultsElement.append(categoryContainerElement); + } + } + } + cityssm.openHtmlModal('contract-addFee', { + onshow(modalElement) { + feeFilterElement = modalElement.querySelector('#feeSelect--feeName'); + feeFilterResultsElement = modalElement.querySelector('#resultsContainer--feeSelect'); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetFees`, { + contractId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + feeCategories = responseJSON.feeCategories; + feeFilterElement.disabled = false; + feeFilterElement.addEventListener('keyup', filterFees); + feeFilterElement.focus(); + filterFees(); + }); + }, + onshown() { + bulmaJS.toggleHtmlClipped(); + }, + onhidden() { + renderContractFees(); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + addFeeButtonElement.focus(); + } + }); + }); + let contractTransactions = exports.contractTransactions; + delete exports.contractTransactions; + const contractTransactionsContainerElement = document.querySelector('#container--contractTransactions'); + function getTransactionGrandTotal() { + let transactionGrandTotal = 0; + for (const contractTransaction of contractTransactions) { + transactionGrandTotal += contractTransaction.transactionAmount; + } + return transactionGrandTotal; + } + function editContractTransaction(clickEvent) { + const transactionIndex = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .transactionIndex ?? '', 10); + const transaction = contractTransactions.find((possibleTransaction) => possibleTransaction.transactionIndex === transactionIndex); + let editCloseModalFunction; + function doEdit(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doUpdateContractTransaction`, formEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractTransactions = responseJSON.contractTransactions; + renderContractTransactions(); + editCloseModalFunction(); + } + else { + bulmaJS.alert({ + title: 'Error Updating Transaction', + message: 'Please try again.', + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('contract-editTransaction', { + onshow(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); + modalElement.querySelector('#contractTransactionEdit--externalReceiptNumber').value = transaction.externalReceiptNumber ?? ''; + modalElement.querySelector('#contractTransactionEdit--transactionNote').value = transaction.transactionNote ?? ''; + modalElement.querySelector('#contractTransactionEdit--transactionDateString').value = transaction.transactionDateString ?? ''; + modalElement.querySelector('#contractTransactionEdit--transactionTimeString').value = transaction.transactionTimeString ?? ''; + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#contractTransactionEdit--transactionAmount').focus(); + modalElement.querySelector('form')?.addEventListener('submit', doEdit); + editCloseModalFunction = closeModalFunction; + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function deleteContractTransaction(clickEvent) { + const transactionIndex = clickEvent.currentTarget.closest('.container--contractTransaction').dataset.transactionIndex; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doDeleteContractTransaction`, { + contractId, + transactionIndex + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractTransactions = responseJSON.contractTransactions; + renderContractTransactions(); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Transaction', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: 'Delete Transaction', + message: 'Are you sure you want to delete this transaction?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Transaction', + callbackFunction: doDelete + } + }); + } + function renderContractTransactions() { + if (contractTransactions.length === 0) { + // eslint-disable-next-line no-unsanitized/property + contractTransactionsContainerElement.innerHTML = `
+

There are no transactions associated with this record.

+
`; + return; + } + // eslint-disable-next-line no-unsanitized/property + contractTransactionsContainerElement.innerHTML = ` + + + + + + + + + + + + +
Date${sunrise.escapedAliases.ExternalReceiptNumber}AmountOptions
Transaction Total
`; + let transactionGrandTotal = 0; + for (const contractTransaction of contractTransactions) { + transactionGrandTotal += contractTransaction.transactionAmount; + const tableRowElement = document.createElement('tr'); + tableRowElement.className = 'container--contractTransaction'; + tableRowElement.dataset.transactionIndex = + contractTransaction.transactionIndex?.toString(); + let externalReceiptNumberHTML = ''; + if (contractTransaction.externalReceiptNumber !== '') { + externalReceiptNumberHTML = cityssm.escapeHTML(contractTransaction.externalReceiptNumber ?? ''); + if (sunrise.dynamicsGPIntegrationIsEnabled) { + if (contractTransaction.dynamicsGPDocument === undefined) { + externalReceiptNumberHTML += ` + + `; + } + else if (contractTransaction.dynamicsGPDocument.documentTotal.toFixed(2) === + contractTransaction.transactionAmount.toFixed(2)) { + externalReceiptNumberHTML += ` + + `; + } + else { + externalReceiptNumberHTML += ` + + `; + } + } + externalReceiptNumberHTML += '
'; + } + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(contractTransaction.transactionDateString ?? '')} + + + ${externalReceiptNumberHTML} + ${cityssm.escapeHTML(contractTransaction.transactionNote ?? '')} + + + $${cityssm.escapeHTML(contractTransaction.transactionAmount.toFixed(2))} + + +
+ + +
+ `; + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', editContractTransaction); + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractTransaction); + contractTransactionsContainerElement + .querySelector('tbody') + ?.append(tableRowElement); + } + ; + contractTransactionsContainerElement.querySelector('#contractTransactions--grandTotal').textContent = `$${transactionGrandTotal.toFixed(2)}`; + const feeGrandTotal = getFeeGrandTotal(); + if (feeGrandTotal.toFixed(2) !== transactionGrandTotal.toFixed(2)) { + contractTransactionsContainerElement.insertAdjacentHTML('afterbegin', `
+
+
+
+
Outstanding Balance
+
+
+
+ $${cityssm.escapeHTML((feeGrandTotal - transactionGrandTotal).toFixed(2))} +
+
+
+
`); + } + } + const addTransactionButtonElement = document.querySelector('#button--addTransaction'); + addTransactionButtonElement.addEventListener('click', () => { + let transactionAmountElement; + let externalReceiptNumberElement; + let addCloseModalFunction; + function doAddTransaction(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doAddContractTransaction`, submitEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + contractTransactions = responseJSON.contractTransactions; + addCloseModalFunction(); + renderContractTransactions(); + } + else { + bulmaJS.confirm({ + title: 'Error Adding Transaction', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + // eslint-disable-next-line @typescript-eslint/naming-convention + function dynamicsGP_refreshExternalReceiptNumberIcon() { + const externalReceiptNumber = externalReceiptNumberElement.value; + const iconElement = externalReceiptNumberElement + .closest('.control') + ?.querySelector('.icon'); + const helpTextElement = externalReceiptNumberElement + .closest('.field') + ?.querySelector('.help'); + if (externalReceiptNumber === '') { + helpTextElement.innerHTML = ' '; + iconElement.innerHTML = + ''; + return; + } + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doGetDynamicsGPDocument`, { + externalReceiptNumber + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (!responseJSON.success || + responseJSON.dynamicsGPDocument === undefined) { + helpTextElement.textContent = 'No Matching Document Found'; + iconElement.innerHTML = + ''; + } + else if (transactionAmountElement.valueAsNumber === + responseJSON.dynamicsGPDocument.documentTotal) { + helpTextElement.textContent = 'Matching Document Found'; + iconElement.innerHTML = + ''; + } + else { + helpTextElement.textContent = `Matching Document: $${responseJSON.dynamicsGPDocument.documentTotal.toFixed(2)}`; + iconElement.innerHTML = + ''; + } + }); + } + cityssm.openHtmlModal('contract-addTransaction', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + modalElement.querySelector('#contractTransactionAdd--contractId').value = contractId.toString(); + const feeGrandTotal = getFeeGrandTotal(); + const transactionGrandTotal = getTransactionGrandTotal(); + transactionAmountElement = modalElement.querySelector('#contractTransactionAdd--transactionAmount'); + 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 (sunrise.dynamicsGPIntegrationIsEnabled) { + externalReceiptNumberElement = modalElement.querySelector('#contractTransactionAdd--externalReceiptNumber'); + const externalReceiptNumberControlElement = externalReceiptNumberElement.closest('.control'); + externalReceiptNumberControlElement.classList.add('has-icons-right'); + externalReceiptNumberControlElement.insertAdjacentHTML('beforeend', ''); + externalReceiptNumberControlElement.insertAdjacentHTML('afterend', '

'); + externalReceiptNumberElement.addEventListener('change', dynamicsGP_refreshExternalReceiptNumberIcon); + transactionAmountElement.addEventListener('change', dynamicsGP_refreshExternalReceiptNumberIcon); + dynamicsGP_refreshExternalReceiptNumberIcon(); + } + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + transactionAmountElement.focus(); + addCloseModalFunction = closeModalFunction; + modalElement + .querySelector('form') + ?.addEventListener('submit', doAddTransaction); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + addTransactionButtonElement.focus(); + } + }); + }); + renderContractFees(); +})(); diff --git a/public/javascripts/contract.editFees.ts b/public/javascripts/contract.editFees.ts new file mode 100644 index 00000000..f7c5ed19 --- /dev/null +++ b/public/javascripts/contract.editFees.ts @@ -0,0 +1,1057 @@ +// 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 { + ContractFee, + ContractTransaction, + DynamicsGPDocument, + Fee, + FeeCategory +} from '../../types/recordTypes.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 contractId = ( + document.querySelector('#contract--contractId') as HTMLInputElement + ).value + + let contractFees = exports.contractFees as ContractFee[] + delete exports.contractFees + + const contractFeesContainerElement = document.querySelector( + '#container--contractFees' + ) as HTMLElement + + function getFeeGrandTotal(): number { + let feeGrandTotal = 0 + + for (const contractFee of contractFees) { + feeGrandTotal += + ((contractFee.feeAmount ?? 0) + (contractFee.taxAmount ?? 0)) * + (contractFee.quantity ?? 0) + } + + return feeGrandTotal + } + + function editContractFeeQuantity(clickEvent: Event): void { + const feeId = Number.parseInt( + (clickEvent.currentTarget as HTMLButtonElement).closest('tr')?.dataset + .feeId ?? '', + 10 + ) + + const fee = contractFees.find( + (possibleFee) => possibleFee.feeId === feeId + ) as ContractFee + + let updateCloseModalFunction: () => void + + function doUpdateQuantity(formEvent: SubmitEvent): void { + formEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doUpdateContractFeeQuantity`, + formEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + contractFees: ContractFee[] + } + + if (responseJSON.success) { + contractFees = responseJSON.contractFees + renderContractFees() + updateCloseModalFunction() + } else { + bulmaJS.alert({ + title: 'Error Updating Quantity', + message: 'Please try again.', + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('contract-editFeeQuantity', { + onshow(modalElement) { + ;( + modalElement.querySelector( + '#contractFeeQuantity--contractId' + ) as HTMLInputElement + ).value = contractId + ;( + modalElement.querySelector( + '#contractFeeQuantity--feeId' + ) as HTMLInputElement + ).value = fee.feeId.toString() + ;( + modalElement.querySelector( + '#contractFeeQuantity--quantity' + ) as HTMLInputElement + ).valueAsNumber = fee.quantity ?? 0 + ;( + modalElement.querySelector( + '#contractFeeQuantity--quantityUnit' + ) as HTMLElement + ).textContent = fee.quantityUnit ?? '' + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + + updateCloseModalFunction = closeModalFunction + ;( + modalElement.querySelector( + '#contractFeeQuantity--quantity' + ) as HTMLInputElement + ).focus() + + modalElement + .querySelector('form') + ?.addEventListener('submit', doUpdateQuantity) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function deleteContractFee(clickEvent: Event): void { + const feeId = ( + (clickEvent.currentTarget as HTMLElement).closest( + '.container--contractFee' + ) as HTMLElement + ).dataset.feeId + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doDeleteContractFee`, + { + contractId, + feeId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractFees: ContractFee[] + } + + if (responseJSON.success) { + contractFees = responseJSON.contractFees + renderContractFees() + } else { + bulmaJS.alert({ + title: 'Error Deleting Fee', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: 'Delete Fee', + message: 'Are you sure you want to delete this fee?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Fee', + callbackFunction: doDelete + } + }) + } + + // eslint-disable-next-line complexity + function renderContractFees(): void { + if (contractFees.length === 0) { + contractFeesContainerElement.innerHTML = `
+

There are no fees associated with this record.

+
` + + renderContractTransactions() + + return + } + + contractFeesContainerElement.innerHTML = ` + + + + + + + + + + + + + + + + + + + + + + +
FeeUnit Cost×QuantityequalsTotalOptions
Subtotal
Tax
Grand Total
` + + let feeAmountTotal = 0 + let taxAmountTotal = 0 + + for (const contractFee of contractFees) { + const tableRowElement = document.createElement('tr') + tableRowElement.className = 'container--contractFee' + tableRowElement.dataset.feeId = contractFee.feeId.toString() + tableRowElement.dataset.includeQuantity = + contractFee.includeQuantity ?? false ? '1' : '0' + + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(contractFee.feeName ?? '')}
+ ${cityssm.escapeHTML(contractFee.feeCategory ?? '')} + + ${ + contractFee.quantity === 1 + ? '' + : ` + $${contractFee.feeAmount?.toFixed(2)} + + × + ${contractFee.quantity?.toString()} + =` + } + + $${((contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0)).toFixed(2)} + + +
+ ${ + contractFee.includeQuantity ?? false + ? `` + : '' + } + +
+ ` + + tableRowElement + .querySelector('.button--editQuantity') + ?.addEventListener('click', editContractFeeQuantity) + + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractFee) + + contractFeesContainerElement + .querySelector('tbody') + ?.append(tableRowElement) + + feeAmountTotal += + (contractFee.feeAmount ?? 0) * (contractFee.quantity ?? 0) + + taxAmountTotal += + (contractFee.taxAmount ?? 0) * (contractFee.quantity ?? 0) + } + + ;( + contractFeesContainerElement.querySelector( + '#contractFees--feeAmountTotal' + ) as HTMLElement + ).textContent = `$${feeAmountTotal.toFixed(2)}` + ;( + contractFeesContainerElement.querySelector( + '#contractFees--taxAmountTotal' + ) as HTMLElement + ).textContent = `$${taxAmountTotal.toFixed(2)}` + ;( + contractFeesContainerElement.querySelector( + '#contractFees--grandTotal' + ) as HTMLElement + ).textContent = `$${(feeAmountTotal + taxAmountTotal).toFixed(2)}` + + renderContractTransactions() + } + + const addFeeButtonElement = document.querySelector( + '#button--addFee' + ) as HTMLButtonElement + + addFeeButtonElement.addEventListener('click', () => { + if (sunrise.hasUnsavedChanges()) { + bulmaJS.alert({ + message: 'Please save all unsaved changes before adding fees.', + contextualColorName: 'warning' + }) + return + } + + let feeCategories: FeeCategory[] + + let feeFilterElement: HTMLInputElement + let feeFilterResultsElement: HTMLElement + + function doAddFeeCategory(clickEvent: Event): void { + clickEvent.preventDefault() + + const feeCategoryId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).dataset.feeCategoryId ?? '', + 10 + ) + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doAddContractFeeCategory`, + { + contractId, + feeCategoryId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractFees: ContractFee[] + } + + if (responseJSON.success) { + contractFees = responseJSON.contractFees + renderContractFees() + + bulmaJS.alert({ + message: 'Fee Group Added Successfully', + contextualColorName: 'success' + }) + } else { + bulmaJS.alert({ + title: 'Error Adding Fee', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + function doAddFee(feeId: number, quantity: number | string = 1): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doAddContractFee`, + { + contractId, + feeId, + quantity + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractFees: ContractFee[] + } + + if (responseJSON.success) { + contractFees = responseJSON.contractFees + renderContractFees() + filterFees() + } else { + bulmaJS.alert({ + title: 'Error Adding Fee', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + function doSetQuantityAndAddFee(fee: Fee): void { + let quantityElement: HTMLInputElement + let quantityCloseModalFunction: () => void + + function doSetQuantity(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + doAddFee(fee.feeId, quantityElement.value) + quantityCloseModalFunction() + } + + cityssm.openHtmlModal('contract-setFeeQuantity', { + onshow(modalElement) { + ;( + modalElement.querySelector( + '#contractFeeQuantity--quantityUnit' + ) as HTMLElement + ).textContent = fee.quantityUnit ?? '' + }, + onshown(modalElement, closeModalFunction) { + quantityCloseModalFunction = closeModalFunction + + quantityElement = modalElement.querySelector( + '#contractFeeQuantity--quantity' + ) as HTMLInputElement + + modalElement + .querySelector('form') + ?.addEventListener('submit', doSetQuantity) + } + }) + } + + function tryAddFee(clickEvent: Event): void { + clickEvent.preventDefault() + + const feeId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).dataset.feeId ?? '', + 10 + ) + const feeCategoryId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).dataset.feeCategoryId ?? '', + 10 + ) + + const feeCategory = feeCategories.find( + (currentFeeCategory) => + currentFeeCategory.feeCategoryId === feeCategoryId + ) as FeeCategory + + const fee = feeCategory.fees.find( + (currentFee) => currentFee.feeId === feeId + ) as Fee + + if (fee.includeQuantity ?? false) { + doSetQuantityAndAddFee(fee) + } else { + doAddFee(feeId) + } + } + + function filterFees(): void { + const filterStringPieces = feeFilterElement.value + .trim() + .toLowerCase() + .split(' ') + + feeFilterResultsElement.innerHTML = '' + + for (const feeCategory of feeCategories) { + const categoryContainerElement = document.createElement('div') + + categoryContainerElement.className = 'container--feeCategory' + + categoryContainerElement.dataset.feeCategoryId = + feeCategory.feeCategoryId.toString() + + categoryContainerElement.innerHTML = `
+
+

+ ${cityssm.escapeHTML(feeCategory.feeCategory ?? '')} +

+
+
+
` + + if (feeCategory.isGroupedFee) { + // eslint-disable-next-line no-unsanitized/method + categoryContainerElement + .querySelector('.columns') + ?.insertAdjacentHTML( + 'beforeend', + `
+ +
` + ) + + categoryContainerElement + .querySelector('button') + ?.addEventListener('click', doAddFeeCategory) + } + + let hasFees = false + + for (const fee of feeCategory.fees) { + // Don't include already applied fees that limit quantity + if ( + contractFeesContainerElement.querySelector( + `.container--contractFee[data-fee-id='${fee.feeId}'][data-include-quantity='0']` + ) !== null + ) { + continue + } + + let includeFee = true + + const feeSearchString = + `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase() + + for (const filterStringPiece of filterStringPieces) { + if (!feeSearchString.includes(filterStringPiece)) { + includeFee = false + break + } + } + + if (!includeFee) { + continue + } + + hasFees = true + + const panelBlockElement = document.createElement( + feeCategory.isGroupedFee ? 'div' : 'a' + ) + panelBlockElement.className = 'panel-block is-block container--fee' + panelBlockElement.dataset.feeId = fee.feeId.toString() + panelBlockElement.dataset.feeCategoryId = + feeCategory.feeCategoryId.toString() + + // eslint-disable-next-line no-unsanitized/property + panelBlockElement.innerHTML = `${cityssm.escapeHTML(fee.feeName ?? '')}
+ + ${cityssm + .escapeHTML(fee.feeDescription ?? '') + .replaceAll('\n', '
')} + ` + + if (!feeCategory.isGroupedFee) { + ;(panelBlockElement as HTMLAnchorElement).href = '#' + panelBlockElement.addEventListener('click', tryAddFee) + } + ;( + categoryContainerElement.querySelector('.panel') as HTMLElement + ).append(panelBlockElement) + } + + if (hasFees) { + feeFilterResultsElement.append(categoryContainerElement) + } + } + } + + cityssm.openHtmlModal('contract-addFee', { + onshow(modalElement) { + feeFilterElement = modalElement.querySelector( + '#feeSelect--feeName' + ) as HTMLInputElement + + feeFilterResultsElement = modalElement.querySelector( + '#resultsContainer--feeSelect' + ) as HTMLElement + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doGetFees`, + { + contractId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + feeCategories: FeeCategory[] + } + + feeCategories = responseJSON.feeCategories + + feeFilterElement.disabled = false + feeFilterElement.addEventListener('keyup', filterFees) + feeFilterElement.focus() + + filterFees() + } + ) + }, + onshown() { + bulmaJS.toggleHtmlClipped() + }, + onhidden() { + renderContractFees() + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + addFeeButtonElement.focus() + } + }) + }) + + let contractTransactions = + exports.contractTransactions as ContractTransaction[] + delete exports.contractTransactions + + const contractTransactionsContainerElement = document.querySelector( + '#container--contractTransactions' + ) as HTMLElement + + function getTransactionGrandTotal(): number { + let transactionGrandTotal = 0 + + for (const contractTransaction of contractTransactions) { + transactionGrandTotal += contractTransaction.transactionAmount + } + + return transactionGrandTotal + } + + function editContractTransaction(clickEvent: Event): void { + const transactionIndex = Number.parseInt( + (clickEvent.currentTarget as HTMLButtonElement).closest('tr')?.dataset + .transactionIndex ?? '', + 10 + ) + + const transaction = contractTransactions.find( + (possibleTransaction) => + possibleTransaction.transactionIndex === transactionIndex + ) as ContractTransaction + + let editCloseModalFunction: () => void + + function doEdit(formEvent: SubmitEvent): void { + formEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doUpdateContractTransaction`, + formEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + contractTransactions: ContractTransaction[] + } + + if (responseJSON.success) { + contractTransactions = responseJSON.contractTransactions + renderContractTransactions() + editCloseModalFunction() + } else { + bulmaJS.alert({ + title: 'Error Updating Transaction', + message: 'Please try again.', + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('contract-editTransaction', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + ;( + modalElement.querySelector( + '#contractTransactionEdit--contractId' + ) as HTMLInputElement + ).value = contractId + ;( + modalElement.querySelector( + '#contractTransactionEdit--transactionIndex' + ) as HTMLInputElement + ).value = transaction.transactionIndex?.toString() ?? '' + ;( + modalElement.querySelector( + '#contractTransactionEdit--transactionAmount' + ) as HTMLInputElement + ).value = transaction.transactionAmount.toFixed(2) + ;( + modalElement.querySelector( + '#contractTransactionEdit--externalReceiptNumber' + ) as HTMLInputElement + ).value = transaction.externalReceiptNumber ?? '' + ;( + modalElement.querySelector( + '#contractTransactionEdit--transactionNote' + ) as HTMLTextAreaElement + ).value = transaction.transactionNote ?? '' + ;( + modalElement.querySelector( + '#contractTransactionEdit--transactionDateString' + ) as HTMLInputElement + ).value = transaction.transactionDateString ?? '' + ;( + modalElement.querySelector( + '#contractTransactionEdit--transactionTimeString' + ) as HTMLInputElement + ).value = transaction.transactionTimeString ?? '' + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + + ;( + modalElement.querySelector( + '#contractTransactionEdit--transactionAmount' + ) as HTMLInputElement + ).focus() + + modalElement.querySelector('form')?.addEventListener('submit', doEdit) + + editCloseModalFunction = closeModalFunction + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function deleteContractTransaction(clickEvent: Event): void { + const transactionIndex = ( + (clickEvent.currentTarget as HTMLElement).closest( + '.container--contractTransaction' + ) as HTMLElement + ).dataset.transactionIndex + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doDeleteContractTransaction`, + { + contractId, + transactionIndex + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractTransactions: ContractTransaction[] + } + + if (responseJSON.success) { + contractTransactions = responseJSON.contractTransactions + renderContractTransactions() + } else { + bulmaJS.alert({ + title: 'Error Deleting Transaction', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: 'Delete Transaction', + message: 'Are you sure you want to delete this transaction?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Transaction', + callbackFunction: doDelete + } + }) + } + + function renderContractTransactions(): void { + if (contractTransactions.length === 0) { + // eslint-disable-next-line no-unsanitized/property + contractTransactionsContainerElement.innerHTML = `
+

There are no transactions associated with this record.

+
` + + return + } + + // eslint-disable-next-line no-unsanitized/property + contractTransactionsContainerElement.innerHTML = ` + + + + + + + + + + + + +
Date${sunrise.escapedAliases.ExternalReceiptNumber}AmountOptions
Transaction Total
` + + let transactionGrandTotal = 0 + + for (const contractTransaction of contractTransactions) { + transactionGrandTotal += contractTransaction.transactionAmount + + const tableRowElement = document.createElement('tr') + tableRowElement.className = 'container--contractTransaction' + tableRowElement.dataset.transactionIndex = + contractTransaction.transactionIndex?.toString() + + let externalReceiptNumberHTML = '' + + if (contractTransaction.externalReceiptNumber !== '') { + externalReceiptNumberHTML = cityssm.escapeHTML( + contractTransaction.externalReceiptNumber ?? '' + ) + + if (sunrise.dynamicsGPIntegrationIsEnabled) { + if (contractTransaction.dynamicsGPDocument === undefined) { + externalReceiptNumberHTML += ` + + ` + } else if ( + contractTransaction.dynamicsGPDocument.documentTotal.toFixed(2) === + contractTransaction.transactionAmount.toFixed(2) + ) { + externalReceiptNumberHTML += ` + + ` + } else { + externalReceiptNumberHTML += ` + + ` + } + } + + externalReceiptNumberHTML += '
' + } + + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(contractTransaction.transactionDateString ?? '')} + + + ${externalReceiptNumberHTML} + ${cityssm.escapeHTML(contractTransaction.transactionNote ?? '')} + + + $${cityssm.escapeHTML(contractTransaction.transactionAmount.toFixed(2))} + + +
+ + +
+ ` + + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', editContractTransaction) + + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractTransaction) + + contractTransactionsContainerElement + .querySelector('tbody') + ?.append(tableRowElement) + } + + ;( + contractTransactionsContainerElement.querySelector( + '#contractTransactions--grandTotal' + ) as HTMLElement + ).textContent = `$${transactionGrandTotal.toFixed(2)}` + + const feeGrandTotal = getFeeGrandTotal() + + if (feeGrandTotal.toFixed(2) !== transactionGrandTotal.toFixed(2)) { + contractTransactionsContainerElement.insertAdjacentHTML( + 'afterbegin', + `
+
+
+
+
Outstanding Balance
+
+
+
+ $${cityssm.escapeHTML((feeGrandTotal - transactionGrandTotal).toFixed(2))} +
+
+
+
` + ) + } + } + + const addTransactionButtonElement = document.querySelector( + '#button--addTransaction' + ) as HTMLButtonElement + + addTransactionButtonElement.addEventListener('click', () => { + let transactionAmountElement: HTMLInputElement + let externalReceiptNumberElement: HTMLInputElement + + let addCloseModalFunction: () => void + + function doAddTransaction(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doAddContractTransaction`, + submitEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + contractTransactions: ContractTransaction[] + } + + if (responseJSON.success) { + contractTransactions = responseJSON.contractTransactions + addCloseModalFunction() + renderContractTransactions() + } else { + bulmaJS.confirm({ + title: 'Error Adding Transaction', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + // eslint-disable-next-line @typescript-eslint/naming-convention + function dynamicsGP_refreshExternalReceiptNumberIcon(): void { + const externalReceiptNumber = externalReceiptNumberElement.value + + const iconElement = externalReceiptNumberElement + .closest('.control') + ?.querySelector('.icon') as HTMLElement + + const helpTextElement = externalReceiptNumberElement + .closest('.field') + ?.querySelector('.help') as HTMLElement + + if (externalReceiptNumber === '') { + helpTextElement.innerHTML = ' ' + iconElement.innerHTML = + '' + return + } + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doGetDynamicsGPDocument`, + { + externalReceiptNumber + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + dynamicsGPDocument?: DynamicsGPDocument + } + + if ( + !responseJSON.success || + responseJSON.dynamicsGPDocument === undefined + ) { + helpTextElement.textContent = 'No Matching Document Found' + iconElement.innerHTML = + '' + } else if ( + transactionAmountElement.valueAsNumber === + responseJSON.dynamicsGPDocument.documentTotal + ) { + helpTextElement.textContent = 'Matching Document Found' + iconElement.innerHTML = + '' + } else { + helpTextElement.textContent = `Matching Document: $${responseJSON.dynamicsGPDocument.documentTotal.toFixed(2)}` + iconElement.innerHTML = + '' + } + } + ) + } + + cityssm.openHtmlModal('contract-addTransaction', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + ;( + modalElement.querySelector( + '#contractTransactionAdd--contractId' + ) as HTMLInputElement + ).value = contractId.toString() + + const feeGrandTotal = getFeeGrandTotal() + const transactionGrandTotal = getTransactionGrandTotal() + + transactionAmountElement = modalElement.querySelector( + '#contractTransactionAdd--transactionAmount' + ) as HTMLInputElement + + 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 (sunrise.dynamicsGPIntegrationIsEnabled) { + externalReceiptNumberElement = modalElement.querySelector( + '#contractTransactionAdd--externalReceiptNumber' + ) as HTMLInputElement + + const externalReceiptNumberControlElement = + externalReceiptNumberElement.closest('.control') as HTMLElement + + externalReceiptNumberControlElement.classList.add('has-icons-right') + + externalReceiptNumberControlElement.insertAdjacentHTML( + 'beforeend', + '' + ) + + externalReceiptNumberControlElement.insertAdjacentHTML( + 'afterend', + '

' + ) + + externalReceiptNumberElement.addEventListener( + 'change', + dynamicsGP_refreshExternalReceiptNumberIcon + ) + + transactionAmountElement.addEventListener( + 'change', + dynamicsGP_refreshExternalReceiptNumberIcon + ) + + dynamicsGP_refreshExternalReceiptNumberIcon() + } + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + + transactionAmountElement.focus() + + addCloseModalFunction = closeModalFunction + + modalElement + .querySelector('form') + ?.addEventListener('submit', doAddTransaction) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + addTransactionButtonElement.focus() + } + }) + }) + + renderContractFees() +})() diff --git a/public/javascripts/contract.editInterments.d.ts b/public/javascripts/contract.editInterments.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/contract.editInterments.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/contract.editInterments.js b/public/javascripts/contract.editInterments.js new file mode 100644 index 00000000..8bae23eb --- /dev/null +++ b/public/javascripts/contract.editInterments.js @@ -0,0 +1,257 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const contractId = document.querySelector('#contract--contractId').value; + let contractInterments = exports.contractInterments; + delete exports.contractInterments; + const intermentContainerTypes = exports.intermentContainerTypes; + delete exports.intermentContainerTypes; + function openEditContractInterment(clickEvent) { + const intermentNumber = clickEvent.currentTarget.closest('tr')?.dataset.intermentNumber; + if (intermentNumber === undefined) { + return; + } + const contractInterment = contractInterments.find((interment) => interment.intermentNumber === Number(intermentNumber)); + if (contractInterment === undefined) { + return; + } + let closeModalFunction; + function submitForm(formEvent) { + formEvent.preventDefault(); + const formElement = formEvent.currentTarget; + cityssm.postJSON('/contracts/doUpdateContractInterment', formElement, (responseJSON) => { + if (responseJSON.success) { + contractInterments = responseJSON.contractInterments; + renderContractInterments(); + closeModalFunction(); + } + }); + } + cityssm.openHtmlModal('contract-editInterment', { + // eslint-disable-next-line complexity + onshow(modalElement) { + modalElement + .querySelector('#contractIntermentEdit--contractId') + ?.setAttribute('value', contractId); + modalElement + .querySelector('#contractIntermentEdit--intermentNumber') + ?.setAttribute('value', intermentNumber); + modalElement + .querySelector('#contractIntermentEdit--deceasedName') + ?.setAttribute('value', contractInterment.deceasedName ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deceasedAddress1') + ?.setAttribute('value', contractInterment.deceasedAddress1 ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deceasedAddress2') + ?.setAttribute('value', contractInterment.deceasedAddress2 ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deceasedCity') + ?.setAttribute('value', contractInterment.deceasedCity ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deceasedProvince') + ?.setAttribute('value', contractInterment.deceasedProvince ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deceasedPostalCode') + ?.setAttribute('value', contractInterment.deceasedPostalCode ?? ''); + modalElement + .querySelector('#contractIntermentEdit--birthDateString') + ?.setAttribute('value', contractInterment.birthDateString ?? ''); + modalElement + .querySelector('#contractIntermentEdit--birthPlace') + ?.setAttribute('value', contractInterment.birthPlace ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deathDateString') + ?.setAttribute('value', contractInterment.deathDateString ?? ''); + modalElement + .querySelector('#contractIntermentEdit--deathPlace') + ?.setAttribute('value', contractInterment.deathPlace ?? ''); + const containerTypeElement = modalElement.querySelector('#contractIntermentEdit--intermentContainerTypeId'); + let containerTypeIsFound = false; + for (const containerType of intermentContainerTypes) { + const optionElement = document.createElement('option'); + optionElement.value = + containerType.intermentContainerTypeId.toString(); + optionElement.text = containerType.intermentContainerType; + if (containerType.intermentContainerTypeId === + contractInterment.intermentContainerTypeId) { + optionElement.selected = true; + containerTypeIsFound = true; + } + containerTypeElement + .querySelector(`optgroup[data-is-cremation-type="${containerType.isCremationType ? '1' : '0'}"]`) + ?.append(optionElement); + } + if ((contractInterment.intermentContainerTypeId ?? '') !== '' && + !containerTypeIsFound) { + const optionElement = document.createElement('option'); + optionElement.value = + contractInterment.intermentContainerTypeId?.toString() ?? ''; + optionElement.text = contractInterment.intermentContainerType ?? ''; + optionElement.selected = true; + containerTypeElement.append(optionElement); + } + }, + onshown(modalElement, closeModal) { + closeModalFunction = closeModal; + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#contractIntermentEdit--deceasedName').focus(); + modalElement + .querySelector('form') + ?.addEventListener('submit', submitForm); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function deleteContractInterment(clickEvent) { + const intermentNumber = clickEvent.currentTarget.closest('tr')?.dataset.intermentNumber; + if (intermentNumber === undefined) { + return; + } + function doDelete() { + cityssm.postJSON('/contracts/doDeleteContractInterment', { + contractId, + intermentNumber + }, (responseJSON) => { + if (responseJSON.success) { + contractInterments = responseJSON.contractInterments; + renderContractInterments(); + } + }); + } + bulmaJS.confirm({ + title: 'Delete Interment?', + message: 'Are you sure you want to remove this interment from the contract?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Remove Interment', + callbackFunction: doDelete + } + }); + } + function renderContractInterments() { + const containerElement = document.querySelector('#container--contractInterments'); + if (contractInterments.length === 0) { + containerElement.innerHTML = `
+

There are no interments associated with this record.

+
`; + return; + } + const tableElement = document.createElement('table'); + tableElement.className = 'table is-fullwidth is-striped is-hoverable'; + tableElement.innerHTML = ` + Name + Details + Options + + `; + for (const interment of contractInterments) { + const tableRowElement = document.createElement('tr'); + tableRowElement.dataset.intermentNumber = + interment.intermentNumber?.toString(); + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(interment.deceasedName ?? '')}
+ + ${cityssm.escapeHTML(interment.deceasedAddress1 ?? '')}
+ ${interment.deceasedAddress2 === '' ? '' : `${cityssm.escapeHTML(interment.deceasedAddress2 ?? '')}
`} + ${cityssm.escapeHTML(interment.deceasedCity ?? '')}, ${cityssm.escapeHTML(interment.deceasedProvince ?? '')}
+ ${cityssm.escapeHTML(interment.deceasedPostalCode ?? '')} + + + +
+
+ Birth: +
+
+ ${cityssm.escapeHTML(interment.birthDateString ?? '(No Birth Date)')}
+ ${cityssm.escapeHTML(interment.birthPlace ?? '(No Birth Place)')} +
+
+
+
+ Death: +
+
+ ${cityssm.escapeHTML(interment.deathDateString ?? '(No Death Date)')}
+ ${cityssm.escapeHTML(interment.deathPlace ?? '(No Death Place)')} +
+
+
+
+ Container: +
+
+ ${cityssm.escapeHTML(interment.intermentContainerType ?? '(No Container Type)')} +
+
+ + +
+ + `; + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', openEditContractInterment); + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractInterment); + tableElement.querySelector('tbody')?.append(tableRowElement); + } + containerElement.innerHTML = ''; + containerElement.append(tableElement); + } + document + .querySelector('#button--addInterment') + ?.addEventListener('click', () => { + let closeModalFunction; + function submitForm(formEvent) { + formEvent.preventDefault(); + const formElement = formEvent.currentTarget; + cityssm.postJSON('/contracts/doAddContractInterment', formElement, (responseJSON) => { + if (responseJSON.success) { + contractInterments = responseJSON.contractInterments; + renderContractInterments(); + closeModalFunction(); + } + }); + } + cityssm.openHtmlModal('contract-addInterment', { + onshow(modalElement) { + modalElement + .querySelector('#contractIntermentAdd--contractId') + ?.setAttribute('value', contractId); + const containerTypeElement = modalElement.querySelector('#contractIntermentAdd--intermentContainerTypeId'); + for (const containerType of intermentContainerTypes) { + const optionElement = document.createElement('option'); + optionElement.value = + containerType.intermentContainerTypeId.toString(); + optionElement.text = containerType.intermentContainerType; + containerTypeElement + .querySelector(`optgroup[data-is-cremation-type="${containerType.isCremationType ? '1' : '0'}"]`) + ?.append(optionElement); + } + }, + onshown(modalElement, closeModal) { + closeModalFunction = closeModal; + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#contractIntermentAdd--deceasedName').focus(); + modalElement + .querySelector('form') + ?.addEventListener('submit', submitForm); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + }); + renderContractInterments(); +})(); diff --git a/public/javascripts/contract.editInterments.ts b/public/javascripts/contract.editInterments.ts new file mode 100644 index 00000000..6b5d0248 --- /dev/null +++ b/public/javascripts/contract.editInterments.ts @@ -0,0 +1,375 @@ +import type { BulmaJS } from '@cityssm/bulma-js/types.js' +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { + ContractInterment, + IntermentContainerType +} from '../../types/recordTypes.js' + +declare const cityssm: cityssmGlobal +declare const bulmaJS: BulmaJS +declare const exports: Record +;(() => { + const contractId = ( + document.querySelector('#contract--contractId') as HTMLInputElement + ).value + + let contractInterments = exports.contractInterments as ContractInterment[] + delete exports.contractInterments + + const intermentContainerTypes = + exports.intermentContainerTypes as IntermentContainerType[] + delete exports.intermentContainerTypes + + function openEditContractInterment(clickEvent: Event): void { + const intermentNumber = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + )?.dataset.intermentNumber + + if (intermentNumber === undefined) { + return + } + + const contractInterment = contractInterments.find( + (interment) => interment.intermentNumber === Number(intermentNumber) + ) + + if (contractInterment === undefined) { + return + } + + let closeModalFunction: () => void + + function submitForm(formEvent: Event): void { + formEvent.preventDefault() + + const formElement = formEvent.currentTarget as HTMLFormElement + + cityssm.postJSON( + '/contracts/doUpdateContractInterment', + formElement, + (responseJSON: { + success: boolean + contractInterments: ContractInterment[] + }) => { + if (responseJSON.success) { + contractInterments = responseJSON.contractInterments + renderContractInterments() + closeModalFunction() + } + } + ) + } + + cityssm.openHtmlModal('contract-editInterment', { + // eslint-disable-next-line complexity + onshow(modalElement) { + modalElement + .querySelector('#contractIntermentEdit--contractId') + ?.setAttribute('value', contractId) + + modalElement + .querySelector('#contractIntermentEdit--intermentNumber') + ?.setAttribute('value', intermentNumber) + + modalElement + .querySelector('#contractIntermentEdit--deceasedName') + ?.setAttribute('value', contractInterment.deceasedName ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deceasedAddress1') + ?.setAttribute('value', contractInterment.deceasedAddress1 ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deceasedAddress2') + ?.setAttribute('value', contractInterment.deceasedAddress2 ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deceasedCity') + ?.setAttribute('value', contractInterment.deceasedCity ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deceasedProvince') + ?.setAttribute('value', contractInterment.deceasedProvince ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deceasedPostalCode') + ?.setAttribute('value', contractInterment.deceasedPostalCode ?? '') + + modalElement + .querySelector('#contractIntermentEdit--birthDateString') + ?.setAttribute('value', contractInterment.birthDateString ?? '') + + modalElement + .querySelector('#contractIntermentEdit--birthPlace') + ?.setAttribute('value', contractInterment.birthPlace ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deathDateString') + ?.setAttribute('value', contractInterment.deathDateString ?? '') + + modalElement + .querySelector('#contractIntermentEdit--deathPlace') + ?.setAttribute('value', contractInterment.deathPlace ?? '') + + const containerTypeElement = modalElement.querySelector( + '#contractIntermentEdit--intermentContainerTypeId' + ) as HTMLSelectElement + + let containerTypeIsFound = false + + for (const containerType of intermentContainerTypes) { + const optionElement = document.createElement('option') + optionElement.value = + containerType.intermentContainerTypeId.toString() + optionElement.text = containerType.intermentContainerType + + if ( + containerType.intermentContainerTypeId === + contractInterment.intermentContainerTypeId + ) { + optionElement.selected = true + containerTypeIsFound = true + } + + containerTypeElement + .querySelector( + `optgroup[data-is-cremation-type="${containerType.isCremationType ? '1' : '0'}"]` + ) + ?.append(optionElement) + } + + if ( + (contractInterment.intermentContainerTypeId ?? '') !== '' && + !containerTypeIsFound + ) { + const optionElement = document.createElement('option') + optionElement.value = + contractInterment.intermentContainerTypeId?.toString() ?? '' + optionElement.text = contractInterment.intermentContainerType ?? '' + optionElement.selected = true + containerTypeElement.append(optionElement) + } + }, + onshown(modalElement, closeModal) { + closeModalFunction = closeModal + + bulmaJS.toggleHtmlClipped() + ;( + modalElement.querySelector( + '#contractIntermentEdit--deceasedName' + ) as HTMLInputElement + ).focus() + + modalElement + .querySelector('form') + ?.addEventListener('submit', submitForm) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function deleteContractInterment(clickEvent: Event): void { + const intermentNumber = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + )?.dataset.intermentNumber + + if (intermentNumber === undefined) { + return + } + + function doDelete(): void { + cityssm.postJSON( + '/contracts/doDeleteContractInterment', + { + contractId, + intermentNumber + }, + (responseJSON: { + success: boolean + contractInterments: ContractInterment[] + }) => { + if (responseJSON.success) { + contractInterments = responseJSON.contractInterments + renderContractInterments() + } + } + ) + } + + bulmaJS.confirm({ + title: 'Delete Interment?', + message: + 'Are you sure you want to remove this interment from the contract?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Remove Interment', + callbackFunction: doDelete + } + }) + } + + function renderContractInterments(): void { + const containerElement = document.querySelector( + '#container--contractInterments' + ) as HTMLElement + + if (contractInterments.length === 0) { + containerElement.innerHTML = `
+

There are no interments associated with this record.

+
` + + return + } + + const tableElement = document.createElement('table') + tableElement.className = 'table is-fullwidth is-striped is-hoverable' + tableElement.innerHTML = ` + Name + Details + Options + + ` + + for (const interment of contractInterments) { + const tableRowElement = document.createElement('tr') + tableRowElement.dataset.intermentNumber = + interment.intermentNumber?.toString() + + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(interment.deceasedName ?? '')}
+ + ${cityssm.escapeHTML(interment.deceasedAddress1 ?? '')}
+ ${interment.deceasedAddress2 === '' ? '' : `${cityssm.escapeHTML(interment.deceasedAddress2 ?? '')}
`} + ${cityssm.escapeHTML(interment.deceasedCity ?? '')}, ${cityssm.escapeHTML( + interment.deceasedProvince ?? '' + )}
+ ${cityssm.escapeHTML(interment.deceasedPostalCode ?? '')} + + + +
+
+ Birth: +
+
+ ${cityssm.escapeHTML(interment.birthDateString ?? '(No Birth Date)')}
+ ${cityssm.escapeHTML(interment.birthPlace ?? '(No Birth Place)')} +
+
+
+
+ Death: +
+
+ ${cityssm.escapeHTML(interment.deathDateString ?? '(No Death Date)')}
+ ${cityssm.escapeHTML(interment.deathPlace ?? '(No Death Place)')} +
+
+
+
+ Container: +
+
+ ${cityssm.escapeHTML(interment.intermentContainerType ?? '(No Container Type)')} +
+
+ + +
+ + ` + + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', openEditContractInterment) + + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteContractInterment) + + tableElement.querySelector('tbody')?.append(tableRowElement) + } + + containerElement.innerHTML = '' + containerElement.append(tableElement) + } + + document + .querySelector('#button--addInterment') + ?.addEventListener('click', () => { + let closeModalFunction: () => void + + function submitForm(formEvent: Event): void { + formEvent.preventDefault() + + const formElement = formEvent.currentTarget as HTMLFormElement + + cityssm.postJSON( + '/contracts/doAddContractInterment', + formElement, + (responseJSON: { + success: boolean + contractInterments: ContractInterment[] + }) => { + if (responseJSON.success) { + contractInterments = responseJSON.contractInterments + renderContractInterments() + closeModalFunction() + } + } + ) + } + + cityssm.openHtmlModal('contract-addInterment', { + onshow(modalElement) { + modalElement + .querySelector('#contractIntermentAdd--contractId') + ?.setAttribute('value', contractId) + + const containerTypeElement = modalElement.querySelector( + '#contractIntermentAdd--intermentContainerTypeId' + ) as HTMLSelectElement + + for (const containerType of intermentContainerTypes) { + const optionElement = document.createElement('option') + optionElement.value = + containerType.intermentContainerTypeId.toString() + optionElement.text = containerType.intermentContainerType + + containerTypeElement + .querySelector( + `optgroup[data-is-cremation-type="${containerType.isCremationType ? '1' : '0'}"]` + ) + ?.append(optionElement) + } + }, + onshown(modalElement, closeModal) { + closeModalFunction = closeModal + bulmaJS.toggleHtmlClipped() + ;( + modalElement.querySelector( + '#contractIntermentAdd--deceasedName' + ) as HTMLInputElement + ).focus() + + modalElement + .querySelector('form') + ?.addEventListener('submit', submitForm) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + }) + + renderContractInterments() +})() diff --git a/public/javascripts/contract.editWorkOrders.d.ts b/public/javascripts/contract.editWorkOrders.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/contract.editWorkOrders.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/contract.editWorkOrders.js b/public/javascripts/contract.editWorkOrders.js new file mode 100644 index 00000000..985406c5 --- /dev/null +++ b/public/javascripts/contract.editWorkOrders.js @@ -0,0 +1,70 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const contractId = document.querySelector('#contract--contractId').value; + document + .querySelector('#button--createWorkOrder') + ?.addEventListener('click', (clickEvent) => { + clickEvent.preventDefault(); + let createCloseModalFunction; + function doCreate(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doCreateWorkOrder`, formEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + createCloseModalFunction(); + bulmaJS.confirm({ + title: 'Work Order Created Successfully', + message: 'Would you like to open the work order now?', + contextualColorName: 'success', + okButton: { + text: 'Yes, Open the Work Order', + callbackFunction() { + globalThis.location.href = sunrise.getWorkOrderURL(responseJSON.workOrderId, true); + } + } + }); + } + else { + bulmaJS.alert({ + title: 'Error Creating Work Order', + message: responseJSON.errorMessage, + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('contract-createWorkOrder', { + onshow(modalElement) { + ; + modalElement.querySelector('#workOrderCreate--contractId').value = contractId; + modalElement.querySelector('#workOrderCreate--workOrderOpenDateString').value = cityssm.dateToString(new Date()); + const workOrderTypeSelectElement = modalElement.querySelector('#workOrderCreate--workOrderTypeId'); + const workOrderTypes = exports + .workOrderTypes; + if (workOrderTypes.length === 1) { + workOrderTypeSelectElement.innerHTML = ''; + } + for (const workOrderType of workOrderTypes) { + const optionElement = document.createElement('option'); + optionElement.value = workOrderType.workOrderTypeId.toString(); + optionElement.textContent = workOrderType.workOrderType ?? ''; + workOrderTypeSelectElement.append(optionElement); + } + }, + onshown(modalElement, closeModalFunction) { + createCloseModalFunction = closeModalFunction; + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#workOrderCreate--workOrderTypeId').focus(); + modalElement + .querySelector('form') + ?.addEventListener('submit', doCreate); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + document.querySelector('#button--createWorkOrder').focus(); + } + }); + }); +})(); diff --git a/public/javascripts/contract.editWorkOrders.ts b/public/javascripts/contract.editWorkOrders.ts new file mode 100644 index 00000000..fa0a94d0 --- /dev/null +++ b/public/javascripts/contract.editWorkOrders.ts @@ -0,0 +1,120 @@ +import type { BulmaJS } from '@cityssm/bulma-js/types.js' +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { WorkOrderType } from '../../types/recordTypes.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 contractId = ( + document.querySelector('#contract--contractId') as HTMLInputElement + ).value + + document + .querySelector('#button--createWorkOrder') + ?.addEventListener('click', (clickEvent) => { + clickEvent.preventDefault() + + let createCloseModalFunction: () => void + + function doCreate(formEvent: SubmitEvent): void { + formEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doCreateWorkOrder`, + formEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderId?: number + } + + if (responseJSON.success) { + createCloseModalFunction() + + bulmaJS.confirm({ + title: 'Work Order Created Successfully', + message: 'Would you like to open the work order now?', + contextualColorName: 'success', + okButton: { + text: 'Yes, Open the Work Order', + callbackFunction() { + globalThis.location.href = sunrise.getWorkOrderURL( + responseJSON.workOrderId, + true + ) + } + } + }) + } else { + bulmaJS.alert({ + title: 'Error Creating Work Order', + message: responseJSON.errorMessage as string, + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('contract-createWorkOrder', { + onshow(modalElement) { + ;( + modalElement.querySelector( + '#workOrderCreate--contractId' + ) as HTMLInputElement + ).value = contractId + ;( + modalElement.querySelector( + '#workOrderCreate--workOrderOpenDateString' + ) as HTMLInputElement + ).value = cityssm.dateToString(new Date()) + + const workOrderTypeSelectElement = modalElement.querySelector( + '#workOrderCreate--workOrderTypeId' + ) as HTMLSelectElement + + const workOrderTypes = (exports as Record) + .workOrderTypes as WorkOrderType[] + + if (workOrderTypes.length === 1) { + workOrderTypeSelectElement.innerHTML = '' + } + + for (const workOrderType of workOrderTypes) { + const optionElement = document.createElement('option') + optionElement.value = workOrderType.workOrderTypeId.toString() + optionElement.textContent = workOrderType.workOrderType ?? '' + workOrderTypeSelectElement.append(optionElement) + } + }, + onshown(modalElement, closeModalFunction) { + createCloseModalFunction = closeModalFunction + bulmaJS.toggleHtmlClipped() + ;( + modalElement.querySelector( + '#workOrderCreate--workOrderTypeId' + ) as HTMLSelectElement + ).focus() + + modalElement + .querySelector('form') + ?.addEventListener('submit', doCreate) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + ;( + document.querySelector( + '#button--createWorkOrder' + ) as HTMLButtonElement + ).focus() + } + }) + }) +})() diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js index 35a9d5a0..db9e59a3 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.sunrise; + const sunrise = exports.sunrise; const searchFilterFormElement = document.querySelector('#form--searchFilters'); const searchResultsContainerElement = document.querySelector('#container--searchResults'); const limit = Number.parseInt(document.querySelector('#searchFilter--limit').value, 10); @@ -65,7 +65,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${contractTimeHTML} + href="${sunrise.getContractURL(contract.contractId)}"> ${cityssm.escapeHTML(contract.contractType ?? '')}
#${contract.contractId} @@ -73,7 +73,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${(contract.burialSiteId ?? -1) === -1 ? `(No Burial Site)` : ` + href="${sunrise.getBurialSiteURL(contract.burialSiteId)}"> ${cityssm.escapeHTML(contract.burialSiteName ?? '')} `}
${cityssm.escapeHTML(contract.cemeteryName ?? '')} @@ -92,7 +92,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${contract.printEJS ? ` + href="${sunrise.urlPrefix}/print/${contract.printEJS}/?contractId=${contract.contractId.toString()}" target="_blank"> ` : ''}`); @@ -113,7 +113,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); .querySelector('table') ?.append(resultsTbodyElement); // eslint-disable-next-line no-unsanitized/method - searchResultsContainerElement.insertAdjacentHTML('beforeend', los.getSearchResultsPagerHTML(limit, responseJSON.offset, responseJSON.count)); + searchResultsContainerElement.insertAdjacentHTML('beforeend', sunrise.getSearchResultsPagerHTML(limit, responseJSON.offset, responseJSON.count)); searchResultsContainerElement .querySelector("button[data-page='previous']") ?.addEventListener('click', previousAndGetContracts); @@ -123,8 +123,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); } function getContracts() { // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = los.getLoadingParagraphHTML(`Loading Contracts...`); - cityssm.postJSON(`${los.urlPrefix}/contracts/doSearchContracts`, searchFilterFormElement, renderContracts); + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML(`Loading Contracts...`); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doSearchContracts`, searchFilterFormElement, renderContracts); } function resetOffsetAndGetContracts() { offsetElement.value = '0'; diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts index dc9d7ca6..0295aa3e 100644 --- a/public/javascripts/contract.search.ts +++ b/public/javascripts/contract.search.ts @@ -8,7 +8,7 @@ declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.sunrise as Sunrise + const sunrise = exports.sunrise as Sunrise const searchFilterFormElement = document.querySelector( '#form--searchFilters' @@ -119,7 +119,7 @@ declare const exports: Record ${contractTimeHTML} + href="${sunrise.getContractURL(contract.contractId)}"> ${cityssm.escapeHTML(contract.contractType ?? '')}
#${contract.contractId} @@ -128,7 +128,7 @@ declare const exports: Record (contract.burialSiteId ?? -1) === -1 ? `(No Burial Site)` : ` + href="${sunrise.getBurialSiteURL(contract.burialSiteId)}"> ${cityssm.escapeHTML(contract.burialSiteName ?? '')} ` }
@@ -153,7 +153,7 @@ declare const exports: Record ${ contract.printEJS ? ` + href="${sunrise.urlPrefix}/print/${contract.printEJS}/?contractId=${contract.contractId.toString()}" target="_blank"> ` : '' @@ -181,7 +181,7 @@ declare const exports: Record // eslint-disable-next-line no-unsanitized/method searchResultsContainerElement.insertAdjacentHTML( 'beforeend', - los.getSearchResultsPagerHTML( + sunrise.getSearchResultsPagerHTML( limit, responseJSON.offset, responseJSON.count @@ -199,12 +199,12 @@ declare const exports: Record function getContracts(): void { // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = los.getLoadingParagraphHTML( + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( `Loading Contracts...` ) cityssm.postJSON( - `${los.urlPrefix}/contracts/doSearchContracts`, + `${sunrise.urlPrefix}/contracts/doSearchContracts`, searchFilterFormElement, renderContracts ) diff --git a/public/javascripts/database.admin.js b/public/javascripts/database.admin.js index 1d9ee699..ce2c0a6c 100644 --- a/public/javascripts/database.admin.js +++ b/public/javascripts/database.admin.js @@ -1,9 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.sunrise; + const sunrise = exports.sunrise; function doBackup() { - cityssm.postJSON(`${los.urlPrefix}/admin/doBackupDatabase`, {}, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doBackupDatabase`, {}, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { bulmaJS.alert({ @@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } function doCleanup() { - cityssm.postJSON(`${los.urlPrefix}/admin/doCleanupDatabase`, {}, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doCleanupDatabase`, {}, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { bulmaJS.alert({ diff --git a/public/javascripts/database.admin.ts b/public/javascripts/database.admin.ts index bee2872f..a2b0b967 100644 --- a/public/javascripts/database.admin.ts +++ b/public/javascripts/database.admin.ts @@ -1,18 +1,18 @@ 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 { Sunrise } from './types.js' declare const cityssm: cityssmGlobal declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.sunrise as LOS + const sunrise = exports.sunrise as Sunrise function doBackup(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doBackupDatabase`, + `${sunrise.urlPrefix}/admin/doBackupDatabase`, {}, (rawResponseJSON) => { const responseJSON = rawResponseJSON as @@ -46,7 +46,7 @@ declare const exports: Record function doCleanup(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doCleanupDatabase`, + `${sunrise.urlPrefix}/admin/doCleanupDatabase`, {}, (rawResponseJSON) => { const responseJSON = rawResponseJSON as diff --git a/public/javascripts/fees.admin.js b/public/javascripts/fees.admin.js index 63baafcf..ecef1188 100644 --- a/public/javascripts/fees.admin.js +++ b/public/javascripts/fees.admin.js @@ -1,7 +1,9 @@ "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.sunrise; + const sunrise = exports.sunrise; const feeCategoriesContainerElement = document.querySelector('#container--feeCategories'); let feeCategories = exports.feeCategories; delete exports.feeCategories; @@ -11,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function getFee(feeCategory, feeId) { return feeCategory.fees.find((currentFee) => currentFee.feeId === feeId); } + // eslint-disable-next-line complexity function renderFeeCategories() { if (feeCategories.length === 0) { feeCategoriesContainerElement.innerHTML = `
@@ -60,7 +63,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
- ${los.getMoveUpDownButtonFieldHTML('button--moveFeeCategoryUp', 'button--moveFeeCategoryDown')} + ${sunrise.getMoveUpDownButtonFieldHTML('button--moveFeeCategoryUp', 'button--moveFeeCategoryDown')}
@@ -101,21 +104,27 @@ Object.defineProperty(exports, "__esModule", { value: true });

${hasTagsBlock ? `

- ${fee.isRequired ?? false + ${ + // eslint-disable-next-line sonarjs/no-nested-conditional + fee.isRequired ?? false ? 'Required' : ''} - ${(fee.contractTypeId ?? -1) === -1 + ${ + // eslint-disable-next-line sonarjs/no-nested-conditional + (fee.contractTypeId ?? -1) === -1 ? '' - : ` - - ${cityssm.escapeHTML(fee.contractType ?? '')} - `} - ${(fee.burialSiteTypeId ?? -1) === -1 + : ` + + ${cityssm.escapeHTML(fee.contractType ?? '')} + `} + ${ + // eslint-disable-next-line sonarjs/no-nested-conditional + (fee.burialSiteTypeId ?? -1) === -1 ? '' - : ` - - ${cityssm.escapeHTML(fee.lotType ?? '')} - `} + : ` + + ${cityssm.escapeHTML(fee.burialSiteType ?? '')} + `}

` : ''}
@@ -145,7 +154,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
- ${los.getMoveUpDownButtonFieldHTML('button--moveFeeUp', 'button--moveFeeDown')} + ${sunrise.getMoveUpDownButtonFieldHTML('button--moveFeeUp', 'button--moveFeeDown')}
`; panelBlockElement @@ -178,7 +187,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let addCloseModalFunction; function doAddFeeCategory(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doAddFeeCategory`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doAddFeeCategory`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { feeCategories = responseJSON.feeCategories; @@ -215,7 +224,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let editCloseModalFunction; function doUpdateFeeCategory(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateFeeCategory`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doUpdateFeeCategory`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { feeCategories = responseJSON.feeCategories; @@ -249,7 +258,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ?.addEventListener('submit', doUpdateFeeCategory); modalElement.querySelector('#feeCategoryEdit--feeCategory').focus(); }, - onremoved: () => { + onremoved() { bulmaJS.toggleHtmlClipped(); } }); @@ -257,7 +266,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function confirmDeleteFeeCategory(clickEvent) { const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest('.container--feeCategory').dataset.feeCategoryId ?? '', 10); function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteFeeCategory`, { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doDeleteFeeCategory`, { feeCategoryId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; @@ -288,7 +297,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const buttonElement = clickEvent.currentTarget; const feeCategoryId = buttonElement.closest('.container--feeCategory').dataset .feeCategoryId ?? ''; - cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' + cityssm.postJSON(`${sunrise.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' ? 'doMoveFeeCategoryUp' : 'doMoveFeeCategoryDown'}`, { feeCategoryId, @@ -316,7 +325,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let addCloseModalFunction; function doAddFee(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doAddFee`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doAddFee`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { feeCategories = responseJSON.feeCategories; @@ -351,16 +360,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); optionElement.textContent = contractType.contractType; contractTypeElement.append(optionElement); } - const lotTypeElement = modalElement.querySelector('#feeAdd--burialSiteTypeId'); - for (const lotType of exports.lotTypes) { + const burialSiteTypeElement = modalElement.querySelector('#feeAdd--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); } ; modalElement.querySelector('#feeAdd--taxPercentage').value = exports.taxPercentageDefault.toString(); - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped(); @@ -423,7 +432,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let editCloseModalFunction; function doUpdateFeeAmount(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateFeeAmount`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doUpdateFeeAmount`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { feeCategories = responseJSON.feeCategories; @@ -469,7 +478,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let editModalElement; function doUpdateFee(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/admin/doUpdateFee`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doUpdateFee`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { feeCategories = responseJSON.feeCategories; @@ -488,7 +497,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function confirmDeleteFee(clickEvent) { clickEvent.preventDefault(); function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/admin/doDeleteFee`, { + cityssm.postJSON(`${sunrise.urlPrefix}/admin/doDeleteFee`, { feeId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; @@ -577,11 +586,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); contractTypeElement.append(optionElement); } const lotTypeElement = modalElement.querySelector('#feeEdit--burialSiteTypeId'); - for (const lotType of exports.lotTypes) { + for (const burialSiteType of exports.burialSiteTypes) { const optionElement = document.createElement('option'); - optionElement.value = lotType.burialSiteTypeId.toString(); - optionElement.textContent = lotType.lotType; - if (lotType.burialSiteTypeId === fee.burialSiteTypeId) { + optionElement.value = burialSiteType.burialSiteTypeId.toString(); + optionElement.textContent = burialSiteType.burialSiteType; + if (burialSiteType.burialSiteTypeId === fee.burialSiteTypeId) { optionElement.selected = true; } lotTypeElement.append(optionElement); @@ -610,7 +619,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ; modalElement.querySelector('#feeEdit--isRequired').value = '1'; } - los.populateAliases(modalElement); + sunrise.populateAliases(modalElement); }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped(); @@ -632,7 +641,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const buttonElement = clickEvent.currentTarget; const feeContainerElement = buttonElement.closest('.container--fee'); const feeId = feeContainerElement.dataset.feeId ?? ''; - cityssm.postJSON(`${los.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' + cityssm.postJSON(`${sunrise.urlPrefix}/admin/${buttonElement.dataset.direction === 'up' ? 'doMoveFeeUp' : 'doMoveFeeDown'}`, { feeId, diff --git a/public/javascripts/fees.admin.ts b/public/javascripts/fees.admin.ts index a79bdbe4..d6c5ae1b 100644 --- a/public/javascripts/fees.admin.ts +++ b/public/javascripts/fees.admin.ts @@ -1,20 +1,24 @@ +// 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 { + BurialSiteType, + ContractType, Fee, - FeeCategory, - LotType, - ContractType + FeeCategory } 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.sunrise as LOS + const sunrise = exports.sunrise as Sunrise const feeCategoriesContainerElement = document.querySelector( '#container--feeCategories' @@ -45,6 +49,7 @@ declare const exports: Record ) as Fee } + // eslint-disable-next-line complexity function renderFeeCategories(): void { if (feeCategories.length === 0) { feeCategoriesContainerElement.innerHTML = `
@@ -106,7 +111,7 @@ declare const exports: Record
- ${los.getMoveUpDownButtonFieldHTML( + ${sunrise.getMoveUpDownButtonFieldHTML( 'button--moveFeeCategoryUp', 'button--moveFeeCategoryDown' )} @@ -163,25 +168,28 @@ declare const exports: Record hasTagsBlock ? `

${ + // eslint-disable-next-line sonarjs/no-nested-conditional fee.isRequired ?? false ? 'Required' : '' } ${ + // eslint-disable-next-line sonarjs/no-nested-conditional (fee.contractTypeId ?? -1) === -1 ? '' - : ` - - ${cityssm.escapeHTML(fee.contractType ?? '')} - ` + : ` + + ${cityssm.escapeHTML(fee.contractType ?? '')} + ` } ${ + // eslint-disable-next-line sonarjs/no-nested-conditional (fee.burialSiteTypeId ?? -1) === -1 ? '' - : ` - - ${cityssm.escapeHTML(fee.lotType ?? '')} - ` + : ` + + ${cityssm.escapeHTML(fee.burialSiteType ?? '')} + ` }

` : '' @@ -219,7 +227,7 @@ declare const exports: Record
- ${los.getMoveUpDownButtonFieldHTML( + ${sunrise.getMoveUpDownButtonFieldHTML( 'button--moveFeeUp', 'button--moveFeeDown' )} @@ -282,7 +290,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/admin/doAddFeeCategory`, + `${sunrise.urlPrefix}/admin/doAddFeeCategory`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON @@ -345,7 +353,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateFeeCategory`, + `${sunrise.urlPrefix}/admin/doUpdateFeeCategory`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON @@ -400,7 +408,7 @@ declare const exports: Record ) as HTMLInputElement ).focus() }, - onremoved: () => { + onremoved() { bulmaJS.toggleHtmlClipped() } }) @@ -418,7 +426,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doDeleteFeeCategory`, + `${sunrise.urlPrefix}/admin/doDeleteFeeCategory`, { feeCategoryId }, @@ -458,7 +466,7 @@ declare const exports: Record .feeCategoryId ?? '' cityssm.postJSON( - `${los.urlPrefix}/admin/${ + `${sunrise.urlPrefix}/admin/${ buttonElement.dataset.direction === 'up' ? 'doMoveFeeCategoryUp' : 'doMoveFeeCategoryDown' @@ -504,7 +512,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/admin/doAddFee`, + `${sunrise.urlPrefix}/admin/doAddFee`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON @@ -553,15 +561,15 @@ declare const exports: Record contractTypeElement.append(optionElement) } - const lotTypeElement = modalElement.querySelector( + const burialSiteTypeElement = modalElement.querySelector( '#feeAdd--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) } ;( @@ -570,7 +578,7 @@ declare const exports: Record ) as HTMLInputElement ).value = (exports.taxPercentageDefault as number).toString() - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() @@ -674,7 +682,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateFeeAmount`, + `${sunrise.urlPrefix}/admin/doUpdateFeeAmount`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON @@ -755,7 +763,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/admin/doUpdateFee`, + `${sunrise.urlPrefix}/admin/doUpdateFee`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as ResponseJSON @@ -780,7 +788,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/admin/doDeleteFee`, + `${sunrise.urlPrefix}/admin/doDeleteFee`, { feeId }, @@ -926,12 +934,12 @@ declare const exports: Record '#feeEdit--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 + optionElement.value = burialSiteType.burialSiteTypeId.toString() + optionElement.textContent = burialSiteType.burialSiteType - if (lotType.burialSiteTypeId === fee.burialSiteTypeId) { + if (burialSiteType.burialSiteTypeId === fee.burialSiteTypeId) { optionElement.selected = true } @@ -986,7 +994,7 @@ declare const exports: Record ).value = '1' } - los.populateAliases(modalElement) + sunrise.populateAliases(modalElement) }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() @@ -1019,7 +1027,7 @@ declare const exports: Record const feeId = feeContainerElement.dataset.feeId ?? '' cityssm.postJSON( - `${los.urlPrefix}/admin/${ + `${sunrise.urlPrefix}/admin/${ buttonElement.dataset.direction === 'up' ? 'doMoveFeeUp' : 'doMoveFeeDown' diff --git a/public/javascripts/main.js b/public/javascripts/main.js index 1782fa41..f3571c5a 100644 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -64,75 +64,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); unlockFieldButtonElement.addEventListener('click', unlockField); } } - /* - * Date Pickers - */ - const datePickerBaseOptions = { - type: 'date', - dateFormat: 'yyyy-MM-dd', - showFooter: false, - color: 'info', - displayMode: 'dialog' - }; - function initializeDatePickers(containerElement) { - const dateElements = containerElement.querySelectorAll("input[type='date']"); - for (const dateElement of dateElements) { - const datePickerOptions = { ...datePickerBaseOptions }; - if (dateElement.required) { - datePickerOptions.showClearButton = false; - } - // apply min date if set - if (dateElement.min !== '') { - datePickerOptions.minDate = cityssm.dateStringToDate(dateElement.min); - } - // apply max date if set - if (dateElement.max !== '') { - datePickerOptions.maxDate = cityssm.dateStringToDate(dateElement.max); - } - const cal = exports.bulmaCalendar.attach(dateElement, datePickerOptions)[0]; - // trigger change event on original element - cal.on('save', () => { - dateElement.value = cal.value(); - dateElement.dispatchEvent(new Event('change')); - }); - // Disable html scrolling when calendar is open - cal.on('show', () => { - document.querySelector('html')?.classList.add('is-clipped'); - }); - // Reenable scrolling, if a modal window is not open - cal.on('hide', () => { - bulmaJS.toggleHtmlClipped(); - }); - // Get the datepicker container element - const datepickerElement = containerElement.querySelector(`#${cal._id}`); - // Override the previous and next month button styles - const datePickerNavButtonElements = datepickerElement.querySelectorAll('.datepicker-nav button.is-text'); - for (const datePickerNavButtonElement of datePickerNavButtonElements) { - datePickerNavButtonElement.classList.add(`is-${datePickerBaseOptions.color ?? ''}`); - datePickerNavButtonElement.classList.remove('is-text'); - } - // Override the clear button style - const clearButtonElement = datepickerElement.querySelector('.datetimepicker-clear-button'); - if (clearButtonElement !== null) { - if (dateElement.required) { - clearButtonElement.remove(); - } - else { - clearButtonElement.dataset.tooltip = 'Clear'; - clearButtonElement.setAttribute('aria-label', 'Clear'); - clearButtonElement.innerHTML = - ''; - } - } - // Apply a label - const labelElement = document.querySelector(`label[for='${dateElement.id}']`); - if (labelElement !== null) { - datepickerElement - .querySelector('.datetimepicker-dummy-input') - ?.setAttribute('aria-label', labelElement.textContent ?? ''); - } - } - } /* * Aliases */ @@ -276,7 +207,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); dynamicsGPIntegrationIsEnabled, highlightMap, initializeUnlockFieldButtons, - initializeDatePickers, populateAliases, escapedAliases, getRandomColor, diff --git a/public/javascripts/main.ts b/public/javascripts/main.ts index 7662206f..ea1ffd98 100644 --- a/public/javascripts/main.ts +++ b/public/javascripts/main.ts @@ -1,6 +1,4 @@ -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 { Sunrise } from './types.js' @@ -16,7 +14,6 @@ type RandomColorHue = type RandomColorLuminosity = 'bright' | 'light' | 'dark' declare const cityssm: cityssmGlobal -declare const bulmaJS: BulmaJS declare const exports: Record & { aliases: Record randomColor: (options?: { @@ -120,105 +117,6 @@ declare const exports: Record & { } } - /* - * Date Pickers - */ - - const datePickerBaseOptions: BulmaCalendarOptions = { - type: 'date', - dateFormat: 'yyyy-MM-dd', - showFooter: false, - color: 'info', - displayMode: 'dialog' - } - - function initializeDatePickers(containerElement: HTMLElement): void { - const dateElements: NodeListOf = - containerElement.querySelectorAll("input[type='date']") - - for (const dateElement of dateElements) { - const datePickerOptions = { ...datePickerBaseOptions } - - if (dateElement.required) { - datePickerOptions.showClearButton = false - } - - // apply min date if set - if (dateElement.min !== '') { - datePickerOptions.minDate = cityssm.dateStringToDate(dateElement.min) - } - - // apply max date if set - if (dateElement.max !== '') { - datePickerOptions.maxDate = cityssm.dateStringToDate(dateElement.max) - } - - const cal = exports.bulmaCalendar.attach( - dateElement, - datePickerOptions - )[0] - - // trigger change event on original element - cal.on('save', () => { - dateElement.value = cal.value() - dateElement.dispatchEvent(new Event('change')) - }) - - // Disable html scrolling when calendar is open - cal.on('show', () => { - document.querySelector('html')?.classList.add('is-clipped') - }) - - // Reenable scrolling, if a modal window is not open - cal.on('hide', () => { - bulmaJS.toggleHtmlClipped() - }) - - // Get the datepicker container element - const datepickerElement = containerElement.querySelector( - `#${cal._id as string}` - ) as HTMLElement - - // Override the previous and next month button styles - const datePickerNavButtonElements = datepickerElement.querySelectorAll( - '.datepicker-nav button.is-text' - ) - - for (const datePickerNavButtonElement of datePickerNavButtonElements) { - datePickerNavButtonElement.classList.add( - `is-${datePickerBaseOptions.color ?? ''}` - ) - datePickerNavButtonElement.classList.remove('is-text') - } - - // Override the clear button style - const clearButtonElement: HTMLElement | null = - datepickerElement.querySelector('.datetimepicker-clear-button') - - if (clearButtonElement !== null) { - if (dateElement.required) { - clearButtonElement.remove() - } else { - clearButtonElement.dataset.tooltip = 'Clear' - clearButtonElement.setAttribute('aria-label', 'Clear') - clearButtonElement.innerHTML = - '' - } - } - - // Apply a label - const labelElement = document.querySelector( - `label[for='${dateElement.id}']` - ) - - if (labelElement !== null) { - datepickerElement - .querySelector('.datetimepicker-dummy-input') - ?.setAttribute('aria-label', labelElement.textContent ?? '') - } - } - } - /* * Aliases */ @@ -449,7 +347,6 @@ declare const exports: Record & { dynamicsGPIntegrationIsEnabled, highlightMap, initializeUnlockFieldButtons, - initializeDatePickers, populateAliases, escapedAliases, diff --git a/public/javascripts/types.d.ts b/public/javascripts/types.d.ts index cad30279..ca74cbbc 100644 --- a/public/javascripts/types.d.ts +++ b/public/javascripts/types.d.ts @@ -2,7 +2,6 @@ export interface Sunrise { urlPrefix: string; apiKey: string; highlightMap: (mapContainerElement: HTMLElement, mapKey: string, contextualClass: 'success' | 'danger') => void; - initializeDatePickers: (containerElement: HTMLElement) => void; initializeUnlockFieldButtons: (containerElement: HTMLElement) => void; populateAliases: (containerElement: HTMLElement) => void; escapedAliases: { diff --git a/public/javascripts/types.ts b/public/javascripts/types.ts index fd8aa3aa..b34048bc 100644 --- a/public/javascripts/types.ts +++ b/public/javascripts/types.ts @@ -8,9 +8,6 @@ export interface Sunrise { contextualClass: 'success' | 'danger' ) => void - initializeDatePickers: (containerElement: HTMLElement) => void - // initializeTimePickers: (containerElement: HTMLElement) => void; - initializeUnlockFieldButtons: (containerElement: HTMLElement) => void populateAliases: (containerElement: HTMLElement) => void diff --git a/public/javascripts/workOrder.edit.js b/public/javascripts/workOrder.edit.js index f280d52d..0e822e08 100644 --- a/public/javascripts/workOrder.edit.js +++ b/public/javascripts/workOrder.edit.js @@ -1,34 +1,33 @@ "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.sunrise; + const sunrise = exports.sunrise; const workOrderId = document.querySelector('#workOrderEdit--workOrderId').value; const isCreate = workOrderId === ''; const workOrderFormElement = document.querySelector('#form--workOrderEdit'); - los.initializeDatePickers(workOrderFormElement - .querySelector('#workOrderEdit--workOrderOpenDateString') - ?.closest('.field')); - los.initializeUnlockFieldButtons(workOrderFormElement); + sunrise.initializeUnlockFieldButtons(workOrderFormElement); function setUnsavedChanges() { - los.setUnsavedChanges(); + sunrise.setUnsavedChanges(); document .querySelector("button[type='submit'][form='form--workOrderEdit']") ?.classList.remove('is-light'); } function clearUnsavedChanges() { - los.clearUnsavedChanges(); + sunrise.clearUnsavedChanges(); document .querySelector("button[type='submit'][form='form--workOrderEdit']") ?.classList.add('is-light'); } workOrderFormElement.addEventListener('submit', (submitEvent) => { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { clearUnsavedChanges(); if (isCreate) { - globalThis.location.href = los.getWorkOrderURL(responseJSON.workOrderId, true); + globalThis.location.href = sunrise.getWorkOrderURL(responseJSON.workOrderId, true); } else { bulmaJS.alert({ @@ -54,13 +53,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); * Work Order Options */ function doClose() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doCloseWorkOrder`, { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doCloseWorkOrder`, { workOrderId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { clearUnsavedChanges(); - globalThis.location.href = los.getWorkOrderURL(workOrderId); + globalThis.location.href = sunrise.getWorkOrderURL(workOrderId); } else { bulmaJS.alert({ @@ -72,13 +71,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrder`, { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doDeleteWorkOrder`, { workOrderId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { clearUnsavedChanges(); - globalThis.location.href = `${los.urlPrefix}/workOrders`; + globalThis.location.href = `${sunrise.urlPrefix}/workOrders`; } else { bulmaJS.alert({ @@ -118,10 +117,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); else { bulmaJS.confirm({ title: 'Close Work Order', - message: los.hasUnsavedChanges() + message: sunrise.hasUnsavedChanges() ? 'Are you sure you want to close this work order with unsaved changes?' : 'Are you sure you want to close this work order?', - contextualColorName: los.hasUnsavedChanges() ? 'warning' : 'info', + contextualColorName: sunrise.hasUnsavedChanges() ? 'warning' : 'info', okButton: { text: 'Yes, Close Work Order', callbackFunction: doClose @@ -143,745 +142,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); }); - /** - * Related Lots - */ - if (!isCreate) { - ; - (() => { - let workOrderLots = exports.workOrderLots; - delete exports.workOrderLots; - let workOrderContracts = exports.workOrderContracts; - delete exports.workOrderContracts; - function deleteLotOccupancy(clickEvent) { - const contractId = clickEvent.currentTarget.closest('.container--contract').dataset.contractId; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrderContract`, { - workOrderId, - contractId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderContracts = responseJSON.workOrderContracts; - renderRelatedLotsAndOccupancies(); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Relationship', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Relationship`, - message: `Are you sure you want to remove the relationship to this ${los.escapedAliases.occupancy} record from this work order? Note that the record will remain.`, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Relationship', - callbackFunction: doDelete - } - }); - } - function addBurialSite(burialSiteId, callbackFunction) { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doAddWorkOrderBurialSite`, { - workOrderId, - burialSiteId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderLots = responseJSON.workOrderLots; - renderRelatedLotsAndOccupancies(); - } - else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Lot}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - if (callbackFunction !== undefined) { - callbackFunction(responseJSON.success); - } - }); - } - function addContract(contractId, callbackFunction) { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doAddWorkOrderContract`, { - workOrderId, - contractId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderContracts = responseJSON.workOrderContracts; - renderRelatedLotsAndOccupancies(); - } - else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Occupancy}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - if (callbackFunction !== undefined) { - callbackFunction(responseJSON.success); - } - }); - } - function addBurialSiteFromLotOccupancy(clickEvent) { - const burialSiteId = clickEvent.currentTarget.dataset.burialSiteId ?? ''; - addBurialSite(burialSiteId); - } - function renderRelatedOccupancies() { - const occupanciesContainerElement = document.querySelector('#container--lotOccupancies'); - document.querySelector(".tabs a[href='#relatedTab--lotOccupancies'] .tag").textContent = workOrderContracts.length.toString(); - if (workOrderContracts.length === 0) { - // eslint-disable-next-line no-unsanitized/property - occupanciesContainerElement.innerHTML = `
-

There are no ${los.escapedAliases.occupancies} associated with this work order.

-
`; - return; - } - // eslint-disable-next-line no-unsanitized/property - occupanciesContainerElement.innerHTML = ` - - - - - - - - - - -
${los.escapedAliases.Occupancy} Type${los.escapedAliases.Lot}${los.escapedAliases.contractStartDate}End Date${los.escapedAliases.Occupants}
`; - const currentDateString = cityssm.dateToString(new Date()); - for (const contract of workOrderContracts) { - const rowElement = document.createElement('tr'); - rowElement.className = 'container--contract'; - rowElement.dataset.contractId = - contract.contractId.toString(); - const isActive = !(contract.contractEndDate && - contract.contractEndDateString < currentDateString); - const hasLotRecord = contract.burialSiteId && - workOrderLots.some((lot) => contract.burialSiteId === lot.burialSiteId); - // eslint-disable-next-line no-unsanitized/property - rowElement.innerHTML = ` - ${isActive - ? `` - : ``} - - - ${cityssm.escapeHTML(contract.contractType ?? '')} -
- #${contract.contractId} - `; - if (contract.burialSiteId) { - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML('beforeend', ` - ${cityssm.escapeHTML(contract.burialSiteName ?? '')} - ${hasLotRecord - ? '' - : ` `} - `); - } - else { - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML('beforeend', `(No ${los.escapedAliases.Lot})`); - } - let occupantsHTML = ''; - for (const occupant of contract.contractOccupants) { - occupantsHTML += `
  • - - - - ${cityssm.escapeHTML(occupant.occupantName ?? '')} - ${cityssm.escapeHTML(occupant.occupantFamilyName ?? '')} -
    • `; - } - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML('beforeend', ` - ${contract.contractStartDateString} - - ${contract.contractEndDate - ? contract.contractEndDateString - : '(No End Date)'} - - ${contract.contractOccupants.length === 0 - ? `(No ${los.escapedAliases.Occupants})` - : `
      ${occupantsHTML}
    `} - - - `); - rowElement - .querySelector('.button--addBurialSite') - ?.addEventListener('click', addBurialSiteFromLotOccupancy); - rowElement - .querySelector('.button--deleteLotOccupancy') - ?.addEventListener('click', deleteLotOccupancy); - occupanciesContainerElement.querySelector('tbody')?.append(rowElement); - } - } - function openEditLotStatus(clickEvent) { - const burialSiteId = Number.parseInt(clickEvent.currentTarget.closest('.container--lot').dataset.burialSiteId ?? '', 10); - const lot = workOrderLots.find((possibleLot) => possibleLot.burialSiteId === burialSiteId); - let editCloseModalFunction; - function doUpdateBurialSiteStatus(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doUpdateBurialSiteStatus`, submitEvent.currentTarget, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderLots = responseJSON.workOrderLots; - renderRelatedLotsAndOccupancies(); - editCloseModalFunction(); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Relationship', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - cityssm.openHtmlModal('lot-editLotStatus', { - onshow(modalElement) { - los.populateAliases(modalElement); - modalElement.querySelector('#lotStatusEdit--burialSiteId').value = burialSiteId.toString(); - modalElement.querySelector('#lotStatusEdit--burialSiteName').value = lot.burialSiteName ?? ''; - const lotStatusElement = modalElement.querySelector('#lotStatusEdit--burialSiteStatusId'); - let lotStatusFound = false; - for (const lotStatus of exports.lotStatuses) { - const optionElement = document.createElement('option'); - optionElement.value = lotStatus.burialSiteStatusId.toString(); - optionElement.textContent = lotStatus.lotStatus; - if (lotStatus.burialSiteStatusId === lot.burialSiteStatusId) { - lotStatusFound = true; - } - lotStatusElement.append(optionElement); - } - if (!lotStatusFound && lot.burialSiteStatusId) { - const optionElement = document.createElement('option'); - optionElement.value = lot.burialSiteStatusId.toString(); - optionElement.textContent = lot.lotStatus ?? ''; - lotStatusElement.append(optionElement); - } - if (lot.burialSiteStatusId) { - lotStatusElement.value = lot.burialSiteStatusId.toString(); - } - // eslint-disable-next-line no-unsanitized/method - modalElement - .querySelector('form') - ?.insertAdjacentHTML('beforeend', ``); - }, - onshown(modalElement, closeModalFunction) { - editCloseModalFunction = closeModalFunction; - bulmaJS.toggleHtmlClipped(); - modalElement - .querySelector('form') - ?.addEventListener('submit', doUpdateBurialSiteStatus); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - } - }); - } - function deleteLot(clickEvent) { - const burialSiteId = clickEvent.currentTarget.closest('.container--lot').dataset.burialSiteId; - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrderBurialSite`, { - workOrderId, - burialSiteId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderLots = responseJSON.workOrderLots; - renderRelatedLotsAndOccupancies(); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Relationship', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Relationship`, - message: `Are you sure you want to remove the relationship to this ${los.escapedAliases.occupancy} record from this work order? Note that the record will remain.`, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Relationship', - callbackFunction: doDelete - } - }); - } - function renderRelatedLots() { - const lotsContainerElement = document.querySelector('#container--lots'); - document.querySelector(".tabs a[href='#relatedTab--lots'] .tag").textContent = workOrderLots.length.toString(); - if (workOrderLots.length === 0) { - // eslint-disable-next-line no-unsanitized/property - lotsContainerElement.innerHTML = `
    -

    There are no ${los.escapedAliases.lots} associated with this work order.

    -
    `; - return; - } - // eslint-disable-next-line no-unsanitized/property - lotsContainerElement.innerHTML = ` - - - - - - - - -
    ${los.escapedAliases.Lot}${los.escapedAliases.Map}${los.escapedAliases.Lot} TypeStatus
    `; - for (const lot of workOrderLots) { - const rowElement = document.createElement('tr'); - rowElement.className = 'container--lot'; - rowElement.dataset.burialSiteId = lot.burialSiteId.toString(); - // eslint-disable-next-line no-unsanitized/property - rowElement.innerHTML = ` - - ${cityssm.escapeHTML(lot.burialSiteName ?? '')} - - - ${cityssm.escapeHTML(lot.cemeteryName ?? '')} - - ${cityssm.escapeHTML(lot.lotType ?? '')} - - ${lot.burialSiteStatusId - ? cityssm.escapeHTML(lot.lotStatus ?? '') - : '(No Status)'} - - - - `; - rowElement - .querySelector('.button--editLotStatus') - ?.addEventListener('click', openEditLotStatus); - rowElement - .querySelector('.button--deleteLot') - ?.addEventListener('click', deleteLot); - lotsContainerElement.querySelector('tbody')?.append(rowElement); - } - } - function renderRelatedLotsAndOccupancies() { - renderRelatedOccupancies(); - renderRelatedLots(); - } - renderRelatedLotsAndOccupancies(); - function doAddLotOccupancy(clickEvent) { - const rowElement = clickEvent.currentTarget.closest('tr'); - const contractId = rowElement.dataset.contractId ?? ''; - addContract(contractId, (success) => { - if (success) { - rowElement.remove(); - } - }); - } - document - .querySelector('#button--addContract') - ?.addEventListener('click', () => { - let searchFormElement; - let searchResultsContainerElement; - function doSearch(event) { - if (event) { - event.preventDefault(); - } - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = - los.getLoadingParagraphHTML('Searching...'); - cityssm.postJSON(`${los.urlPrefix}/contracts/doSearchLotOccupancies`, searchFormElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.lotOccupancies.length === 0) { - searchResultsContainerElement.innerHTML = `
    -

    There are no records that meet the search criteria.

    -
    `; - return; - } - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = ` - - - - - - - - - -
    ${los.escapedAliases.Occupancy} Type${los.escapedAliases.Lot}${los.escapedAliases.contractStartDate}End Date${los.escapedAliases.Occupants}
    `; - for (const contract of responseJSON.lotOccupancies) { - const rowElement = document.createElement('tr'); - rowElement.className = 'container--contract'; - rowElement.dataset.contractId = - contract.contractId.toString(); - rowElement.innerHTML = ` - - - - ${cityssm.escapeHTML(contract.contractType ?? '')} - `; - if (contract.burialSiteId) { - rowElement.insertAdjacentHTML('beforeend', `${cityssm.escapeHTML(contract.burialSiteName ?? '')}`); - } - else { - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML('beforeend', `(No ${los.escapedAliases.Lot})`); - } - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML('beforeend', ` - ${contract.contractStartDateString} - - ${contract.contractEndDate - ? contract.contractEndDateString - : '(No End Date)'} - - ${contract.contractOccupants.length === 0 - ? ` - (No ${cityssm.escapeHTML(los.escapedAliases.Occupants)}) - ` - : cityssm.escapeHTML(`${contract.contractOccupants[0].occupantName} - ${contract.contractOccupants[0] - .occupantFamilyName}`) + - (contract.contractOccupants.length > 1 - ? ` plus - ${(contract.contractOccupants.length - 1).toString()}` - : '')}`); - rowElement - .querySelector('.button--addContract') - ?.addEventListener('click', doAddLotOccupancy); - searchResultsContainerElement - .querySelector('tbody') - ?.append(rowElement); - } - }); - } - cityssm.openHtmlModal('workOrder-addContract', { - onshow(modalElement) { - los.populateAliases(modalElement); - searchFormElement = modalElement.querySelector('form'); - searchResultsContainerElement = modalElement.querySelector('#resultsContainer--contractAdd'); - modalElement.querySelector('#contractSearch--notWorkOrderId').value = workOrderId; - modalElement.querySelector('#contractSearch--occupancyEffectiveDateString').value = document.querySelector('#workOrderEdit--workOrderOpenDateString').value; - doSearch(); - }, - onshown(modalElement) { - bulmaJS.toggleHtmlClipped(); - const occupantNameElement = modalElement.querySelector('#contractSearch--occupantName'); - occupantNameElement.addEventListener('change', doSearch); - occupantNameElement.focus(); - modalElement.querySelector('#contractSearch--burialSiteName').addEventListener('change', doSearch); - searchFormElement.addEventListener('submit', doSearch); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - document.querySelector('#button--addContract').focus(); - } - }); - }); - function doAddLot(clickEvent) { - const rowElement = clickEvent.currentTarget.closest('tr'); - const burialSiteId = rowElement.dataset.burialSiteId ?? ''; - addBurialSite(burialSiteId, (success) => { - if (success) { - rowElement.remove(); - } - }); - } - document - .querySelector('#button--addBurialSite') - ?.addEventListener('click', () => { - let searchFormElement; - let searchResultsContainerElement; - function doSearch(event) { - if (event) { - event.preventDefault(); - } - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = - los.getLoadingParagraphHTML('Searching...'); - cityssm.postJSON(`${los.urlPrefix}/burialSites/doSearchBurialSites`, searchFormElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.lots.length === 0) { - searchResultsContainerElement.innerHTML = `
    -

    There are no records that meet the search criteria.

    -
    `; - return; - } - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = ` - - - - - - - - -
    ${los.escapedAliases.Lot}${los.escapedAliases.Map}${los.escapedAliases.Lot} TypeStatus
    `; - for (const lot of responseJSON.lots) { - const rowElement = document.createElement('tr'); - rowElement.className = 'container--lot'; - rowElement.dataset.burialSiteId = lot.burialSiteId.toString(); - rowElement.innerHTML = ` - - - ${cityssm.escapeHTML(lot.burialSiteName ?? '')} - - ${cityssm.escapeHTML(lot.cemeteryName ?? '')} - - ${cityssm.escapeHTML(lot.lotType ?? '')} - - ${cityssm.escapeHTML(lot.lotStatus ?? '')} - `; - rowElement - .querySelector('.button--addBurialSite') - ?.addEventListener('click', doAddLot); - searchResultsContainerElement - .querySelector('tbody') - ?.append(rowElement); - } - }); - } - cityssm.openHtmlModal('workOrder-addBurialSite', { - onshow(modalElement) { - los.populateAliases(modalElement); - searchFormElement = modalElement.querySelector('form'); - searchResultsContainerElement = modalElement.querySelector('#resultsContainer--lotAdd'); - modalElement.querySelector('#lotSearch--notWorkOrderId').value = workOrderId; - const lotStatusElement = modalElement.querySelector('#lotSearch--burialSiteStatusId'); - for (const lotStatus of exports.lotStatuses) { - const optionElement = document.createElement('option'); - optionElement.value = lotStatus.burialSiteStatusId.toString(); - optionElement.textContent = lotStatus.lotStatus; - lotStatusElement.append(optionElement); - } - doSearch(); - }, - onshown(modalElement) { - bulmaJS.toggleHtmlClipped(); - const burialSiteNameElement = modalElement.querySelector('#lotSearch--burialSiteName'); - burialSiteNameElement.addEventListener('change', doSearch); - burialSiteNameElement.focus(); - modalElement - .querySelector('#lotSearch--burialSiteStatusId') - ?.addEventListener('change', doSearch); - searchFormElement.addEventListener('submit', doSearch); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - document.querySelector('#button--addBurialSite').focus(); - } - }); - }); - })(); - } - /** - * Comments - */ - ; - (() => { - let workOrderComments = exports.workOrderComments; - delete exports.workOrderComments; - function openEditWorkOrderComment(clickEvent) { - const workOrderCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset - .workOrderCommentId ?? '', 10); - const workOrderComment = workOrderComments.find((currentComment) => currentComment.workOrderCommentId === workOrderCommentId); - let editFormElement; - let editCloseModalFunction; - function editComment(submitEvent) { - submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doUpdateWorkOrderComment`, editFormElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderComments = responseJSON.workOrderComments; - editCloseModalFunction(); - renderWorkOrderComments(); - } - else { - bulmaJS.alert({ - title: 'Error Updating Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - cityssm.openHtmlModal('workOrder-editComment', { - onshow(modalElement) { - ; - modalElement.querySelector('#workOrderCommentEdit--workOrderId').value = workOrderId; - modalElement.querySelector('#workOrderCommentEdit--workOrderCommentId').value = workOrderCommentId.toString(); - modalElement.querySelector('#workOrderCommentEdit--workOrderComment').value = workOrderComment.workOrderComment ?? ''; - const workOrderCommentDateStringElement = modalElement.querySelector('#workOrderCommentEdit--workOrderCommentDateString'); - workOrderCommentDateStringElement.value = - workOrderComment.workOrderCommentDateString ?? ''; - const currentDateString = cityssm.dateToString(new Date()); - workOrderCommentDateStringElement.max = - workOrderComment.workOrderCommentDateString <= currentDateString - ? currentDateString - : workOrderComment.workOrderCommentDateString ?? ''; - modalElement.querySelector('#workOrderCommentEdit--workOrderCommentTimeString').value = workOrderComment.workOrderCommentTimeString ?? ''; - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped(); - los.initializeDatePickers(modalElement); - modalElement.querySelector('#workOrderCommentEdit--workOrderComment').focus(); - editFormElement = modalElement.querySelector('form'); - editFormElement.addEventListener('submit', editComment); - editCloseModalFunction = closeModalFunction; - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - } - }); - } - function deleteWorkOrderComment(clickEvent) { - const workOrderCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset - .workOrderCommentId ?? '', 10); - function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrderComment`, { - workOrderId, - workOrderCommentId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderComments = responseJSON.workOrderComments; - renderWorkOrderComments(); - } - else { - bulmaJS.alert({ - title: 'Error Removing Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: 'Remove Comment?', - message: 'Are you sure you want to remove this comment?', - okButton: { - text: 'Yes, Remove Comment', - callbackFunction: doDelete - }, - contextualColorName: 'warning' - }); - } - function renderWorkOrderComments() { - const containerElement = document.querySelector('#container--workOrderComments'); - if (workOrderComments.length === 0) { - containerElement.innerHTML = `
    -

    There are no comments to display.

    -
    `; - return; - } - const tableElement = document.createElement('table'); - tableElement.className = 'table is-fullwidth is-striped is-hoverable'; - tableElement.innerHTML = ` - Commentor - Comment Date - Comment - Options - - `; - for (const workOrderComment of workOrderComments) { - const tableRowElement = document.createElement('tr'); - tableRowElement.dataset.workOrderCommentId = - workOrderComment.workOrderCommentId?.toString(); - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML(workOrderComment.recordCreate_userName ?? '')} - - ${workOrderComment.workOrderCommentDateString} - ${workOrderComment.workOrderCommentTime === 0 - ? '' - : workOrderComment.workOrderCommentTimePeriodString} - - ${cityssm.escapeHTML(workOrderComment.workOrderComment ?? '')} - -
    - - -
    - `; - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', openEditWorkOrderComment); - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteWorkOrderComment); - tableElement.querySelector('tbody')?.append(tableRowElement); - } - containerElement.innerHTML = ''; - containerElement.append(tableElement); - } - function openAddCommentModal() { - let addCommentCloseModalFunction; - function doAddComment(formEvent) { - formEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doAddWorkOrderComment`, formEvent.currentTarget, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - workOrderComments = responseJSON.workOrderComments; - renderWorkOrderComments(); - addCommentCloseModalFunction(); - } - }); - } - cityssm.openHtmlModal('workOrder-addComment', { - onshow(modalElement) { - los.populateAliases(modalElement); - modalElement.querySelector('#workOrderCommentAdd--workOrderId').value = workOrderId; - modalElement - .querySelector('form') - ?.addEventListener('submit', doAddComment); - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped(); - addCommentCloseModalFunction = closeModalFunction; - modalElement.querySelector('#workOrderCommentAdd--workOrderComment').focus(); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - document.querySelector('#workOrderComments--add').focus(); - } - }); - } - document - .querySelector('#workOrderComments--add') - ?.addEventListener('click', openAddCommentModal); - if (!isCreate) { - renderWorkOrderComments(); - } - })(); /* * Milestones */ @@ -895,9 +155,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); clearPanelBlockElements(targetPanelElement); // eslint-disable-next-line no-unsanitized/method targetPanelElement.insertAdjacentHTML('beforeend', `
    - ${los.getLoadingParagraphHTML('Loading conflicting milestones...')} + ${sunrise.getLoadingParagraphHTML('Loading conflicting milestones...')}
    `); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doGetWorkOrderMilestones`, { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doGetWorkOrderMilestones`, { workOrderMilestoneDateFilter: 'date', workOrderMilestoneDateString }, (rawResponseJSON) => { @@ -952,7 +212,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId ?? '', 10); const workOrderMilestone = workOrderMilestones.find((currentMilestone) => currentMilestone.workOrderMilestoneId === workOrderMilestoneId); function doComplete() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`, { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`, { workOrderId, workOrderMilestoneId }, processMilestoneResponse); @@ -977,7 +237,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); clickEvent.preventDefault(); const workOrderMilestoneId = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId; function doReopen() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doReopenWorkOrderMilestone`, { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doReopenWorkOrderMilestone`, { workOrderId, workOrderMilestoneId }, processMilestoneResponse); @@ -996,7 +256,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); clickEvent.preventDefault(); const workOrderMilestoneId = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId; function doDelete() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`, { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`, { workOrderMilestoneId, workOrderId }, processMilestoneResponse); @@ -1019,7 +279,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); let workOrderMilestoneDateStringElement; function doEdit(submitEvent) { submitEvent.preventDefault(); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doUpdateWorkOrderMilestone`, submitEvent.currentTarget, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doUpdateWorkOrderMilestone`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON; processMilestoneResponse(responseJSON); if (responseJSON.success) { @@ -1069,8 +329,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); onshown(modalElement, closeModalFunction) { editCloseModalFunction = closeModalFunction; bulmaJS.toggleHtmlClipped(); - los.initializeDatePickers(modalElement); - // los.initializeTimePickers(modalElement); modalElement.querySelector('form')?.addEventListener('submit', doEdit); const conflictingMilestonePanelElement = document.querySelector('#milestoneEdit--conflictingMilestonesPanel'); workOrderMilestoneDateStringElement.addEventListener('change', () => { @@ -1179,7 +437,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } const currentDateString = cityssm.dateToString(new Date()); function _doAdd() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doAddWorkOrderMilestone`, addFormElement, (rawResponseJSON) => { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doAddWorkOrderMilestone`, addFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON; processMilestoneResponse(responseJSON); if (responseJSON.success) { @@ -1221,8 +479,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); }, onshown(modalElement, closeModalFunction) { addCloseModalFunction = closeModalFunction; - los.initializeDatePickers(modalElement); - // los.initializeTimePickers(modalElement); bulmaJS.toggleHtmlClipped(); modalElement.querySelector('#milestoneAdd--workOrderMilestoneTypeId').focus(); addFormElement = modalElement.querySelector('form'); diff --git a/public/javascripts/workOrder.edit.ts b/public/javascripts/workOrder.edit.ts index f5ccc4aa..eca25183 100644 --- a/public/javascripts/workOrder.edit.ts +++ b/public/javascripts/workOrder.edit.ts @@ -1,22 +1,22 @@ +// 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 { - Lot, - LotOccupancy, - LotStatus, - WorkOrderComment, WorkOrderMilestone, WorkOrderMilestoneType } 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.sunrise as LOS + const sunrise = exports.sunrise as Sunrise const workOrderId = ( document.querySelector('#workOrderEdit--workOrderId') as HTMLInputElement @@ -28,22 +28,17 @@ declare const exports: Record '#form--workOrderEdit' ) as HTMLFormElement - los.initializeDatePickers( - workOrderFormElement - .querySelector('#workOrderEdit--workOrderOpenDateString') - ?.closest('.field') as HTMLElement - ) - los.initializeUnlockFieldButtons(workOrderFormElement) + sunrise.initializeUnlockFieldButtons(workOrderFormElement) function setUnsavedChanges(): void { - los.setUnsavedChanges() + sunrise.setUnsavedChanges() document .querySelector("button[type='submit'][form='form--workOrderEdit']") ?.classList.remove('is-light') } function clearUnsavedChanges(): void { - los.clearUnsavedChanges() + sunrise.clearUnsavedChanges() document .querySelector("button[type='submit'][form='form--workOrderEdit']") ?.classList.add('is-light') @@ -53,7 +48,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`, + `${sunrise.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -66,7 +61,7 @@ declare const exports: Record clearUnsavedChanges() if (isCreate) { - globalThis.location.href = los.getWorkOrderURL( + globalThis.location.href = sunrise.getWorkOrderURL( responseJSON.workOrderId, true ) @@ -101,7 +96,7 @@ declare const exports: Record function doClose(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doCloseWorkOrder`, + `${sunrise.urlPrefix}/workOrders/doCloseWorkOrder`, { workOrderId }, @@ -113,7 +108,7 @@ declare const exports: Record if (responseJSON.success) { clearUnsavedChanges() - globalThis.location.href = los.getWorkOrderURL(workOrderId) + globalThis.location.href = sunrise.getWorkOrderURL(workOrderId) } else { bulmaJS.alert({ title: 'Error Closing Work Order', @@ -127,7 +122,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doDeleteWorkOrder`, + `${sunrise.urlPrefix}/workOrders/doDeleteWorkOrder`, { workOrderId }, @@ -139,7 +134,7 @@ declare const exports: Record if (responseJSON.success) { clearUnsavedChanges() - globalThis.location.href = `${los.urlPrefix}/workOrders` + globalThis.location.href = `${sunrise.urlPrefix}/workOrders` } else { bulmaJS.alert({ title: 'Error Deleting Work Order', @@ -184,10 +179,10 @@ declare const exports: Record } else { bulmaJS.confirm({ title: 'Close Work Order', - message: los.hasUnsavedChanges() + message: sunrise.hasUnsavedChanges() ? 'Are you sure you want to close this work order with unsaved changes?' : 'Are you sure you want to close this work order?', - contextualColorName: los.hasUnsavedChanges() ? 'warning' : 'info', + contextualColorName: sunrise.hasUnsavedChanges() ? 'warning' : 'info', okButton: { text: 'Yes, Close Work Order', callbackFunction: doClose @@ -212,1142 +207,6 @@ declare const exports: Record }) }) - /** - * Related Lots - */ - if (!isCreate) { - ;(() => { - let workOrderLots = exports.workOrderLots as Lot[] - delete exports.workOrderLots - - let workOrderContracts = - exports.workOrderContracts as LotOccupancy[] - delete exports.workOrderContracts - - function deleteLotOccupancy(clickEvent: Event): void { - const contractId = ( - (clickEvent.currentTarget as HTMLElement).closest( - '.container--contract' - ) as HTMLElement - ).dataset.contractId - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doDeleteWorkOrderContract`, - { - workOrderId, - contractId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderContracts: LotOccupancy[] - } - - if (responseJSON.success) { - workOrderContracts = responseJSON.workOrderContracts - renderRelatedLotsAndOccupancies() - } else { - bulmaJS.alert({ - title: 'Error Deleting Relationship', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Relationship`, - message: `Are you sure you want to remove the relationship to this ${los.escapedAliases.occupancy} record from this work order? Note that the record will remain.`, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Relationship', - callbackFunction: doDelete - } - }) - } - - function addBurialSite( - burialSiteId: number | string, - callbackFunction?: (success: boolean) => void - ): void { - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doAddWorkOrderBurialSite`, - { - workOrderId, - burialSiteId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderLots: Lot[] - } - - if (responseJSON.success) { - workOrderLots = responseJSON.workOrderLots - renderRelatedLotsAndOccupancies() - } else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Lot}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - - if (callbackFunction !== undefined) { - callbackFunction(responseJSON.success) - } - } - ) - } - - function addContract( - contractId: number | string, - callbackFunction?: (success?: boolean) => void - ): void { - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doAddWorkOrderContract`, - { - workOrderId, - contractId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderContracts: LotOccupancy[] - } - - if (responseJSON.success) { - workOrderContracts = responseJSON.workOrderContracts - renderRelatedLotsAndOccupancies() - } else { - bulmaJS.alert({ - title: `Error Adding ${los.escapedAliases.Occupancy}`, - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - - if (callbackFunction !== undefined) { - callbackFunction(responseJSON.success) - } - } - ) - } - - function addBurialSiteFromLotOccupancy(clickEvent: Event): void { - const burialSiteId = - (clickEvent.currentTarget as HTMLElement).dataset.burialSiteId ?? '' - addBurialSite(burialSiteId) - } - - function renderRelatedOccupancies(): void { - const occupanciesContainerElement = document.querySelector( - '#container--lotOccupancies' - ) as HTMLElement - - ;( - document.querySelector( - ".tabs a[href='#relatedTab--lotOccupancies'] .tag" - ) as HTMLElement - ).textContent = workOrderContracts.length.toString() - - if (workOrderContracts.length === 0) { - // eslint-disable-next-line no-unsanitized/property - occupanciesContainerElement.innerHTML = `
    -

    There are no ${los.escapedAliases.occupancies} associated with this work order.

    -
    ` - - return - } - - // eslint-disable-next-line no-unsanitized/property - occupanciesContainerElement.innerHTML = ` - - - - - - - - - - -
    ${los.escapedAliases.Occupancy} Type${los.escapedAliases.Lot}${los.escapedAliases.contractStartDate}End Date${los.escapedAliases.Occupants}
    ` - - const currentDateString = cityssm.dateToString(new Date()) - - for (const contract of workOrderContracts) { - const rowElement = document.createElement('tr') - rowElement.className = 'container--contract' - rowElement.dataset.contractId = - contract.contractId.toString() - - const isActive = !( - contract.contractEndDate && - contract.contractEndDateString! < currentDateString - ) - - const hasLotRecord = - contract.burialSiteId && - workOrderLots.some((lot) => contract.burialSiteId === lot.burialSiteId) - - // eslint-disable-next-line no-unsanitized/property - rowElement.innerHTML = ` - ${ - isActive - ? `` - : `` - } - - - ${cityssm.escapeHTML(contract.contractType ?? '')} -
    - #${contract.contractId} - ` - - if (contract.burialSiteId) { - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML( - 'beforeend', - ` - ${cityssm.escapeHTML(contract.burialSiteName ?? '')} - ${ - hasLotRecord - ? '' - : ` ` - } - ` - ) - } else { - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML( - 'beforeend', - `(No ${los.escapedAliases.Lot})` - ) - } - - let occupantsHTML = '' - - for (const occupant of contract.contractOccupants!) { - occupantsHTML += `
  • - - - - ${cityssm.escapeHTML(occupant.occupantName ?? '')} - ${cityssm.escapeHTML(occupant.occupantFamilyName ?? '')} -
    • ` - } - - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML( - 'beforeend', - ` - ${contract.contractStartDateString} - - ${ - contract.contractEndDate - ? contract.contractEndDateString - : '(No End Date)' - } - - ${ - contract.contractOccupants!.length === 0 - ? `(No ${los.escapedAliases.Occupants})` - : `
      ${occupantsHTML}
    ` - } - - - ` - ) - - rowElement - .querySelector('.button--addBurialSite') - ?.addEventListener('click', addBurialSiteFromLotOccupancy) - - rowElement - .querySelector('.button--deleteLotOccupancy') - ?.addEventListener('click', deleteLotOccupancy) - - occupanciesContainerElement.querySelector('tbody')?.append(rowElement) - } - } - - function openEditLotStatus(clickEvent: Event): void { - const burialSiteId = Number.parseInt( - ( - (clickEvent.currentTarget as HTMLElement).closest( - '.container--lot' - ) as HTMLElement - ).dataset.burialSiteId ?? '', - 10 - ) - - const lot = workOrderLots.find( - (possibleLot) => possibleLot.burialSiteId === burialSiteId - ) as Lot - - let editCloseModalFunction: () => void - - function doUpdateBurialSiteStatus(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doUpdateBurialSiteStatus`, - submitEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderLots: Lot[] - } - - if (responseJSON.success) { - workOrderLots = responseJSON.workOrderLots - renderRelatedLotsAndOccupancies() - editCloseModalFunction() - } else { - bulmaJS.alert({ - title: 'Error Deleting Relationship', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('lot-editLotStatus', { - onshow(modalElement) { - los.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#lotStatusEdit--burialSiteId' - ) as HTMLInputElement - ).value = burialSiteId.toString() - ;( - modalElement.querySelector( - '#lotStatusEdit--burialSiteName' - ) as HTMLInputElement - ).value = lot.burialSiteName ?? '' - - const lotStatusElement = modalElement.querySelector( - '#lotStatusEdit--burialSiteStatusId' - ) as HTMLSelectElement - - let lotStatusFound = false - - for (const lotStatus of exports.lotStatuses as LotStatus[]) { - const optionElement = document.createElement('option') - optionElement.value = lotStatus.burialSiteStatusId.toString() - optionElement.textContent = lotStatus.lotStatus - - if (lotStatus.burialSiteStatusId === lot.burialSiteStatusId) { - lotStatusFound = true - } - - lotStatusElement.append(optionElement) - } - - if (!lotStatusFound && lot.burialSiteStatusId) { - const optionElement = document.createElement('option') - optionElement.value = lot.burialSiteStatusId.toString() - optionElement.textContent = lot.lotStatus ?? '' - lotStatusElement.append(optionElement) - } - - if (lot.burialSiteStatusId) { - lotStatusElement.value = lot.burialSiteStatusId.toString() - } - - // eslint-disable-next-line no-unsanitized/method - modalElement - .querySelector('form') - ?.insertAdjacentHTML( - 'beforeend', - `` - ) - }, - onshown(modalElement, closeModalFunction) { - editCloseModalFunction = closeModalFunction - - bulmaJS.toggleHtmlClipped() - - modalElement - .querySelector('form') - ?.addEventListener('submit', doUpdateBurialSiteStatus) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function deleteLot(clickEvent: Event): void { - const burialSiteId = ( - (clickEvent.currentTarget as HTMLElement).closest( - '.container--lot' - ) as HTMLElement - ).dataset.burialSiteId - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doDeleteWorkOrderBurialSite`, - { - workOrderId, - burialSiteId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderLots: Lot[] - } - - if (responseJSON.success) { - workOrderLots = responseJSON.workOrderLots - renderRelatedLotsAndOccupancies() - } else { - bulmaJS.alert({ - title: 'Error Deleting Relationship', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: `Delete ${los.escapedAliases.Occupancy} Relationship`, - message: `Are you sure you want to remove the relationship to this ${los.escapedAliases.occupancy} record from this work order? Note that the record will remain.`, - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Relationship', - callbackFunction: doDelete - } - }) - } - - function renderRelatedLots(): void { - const lotsContainerElement = document.querySelector( - '#container--lots' - ) as HTMLElement - - ;( - document.querySelector( - ".tabs a[href='#relatedTab--lots'] .tag" - ) as HTMLElement - ).textContent = workOrderLots.length.toString() - - if (workOrderLots.length === 0) { - // eslint-disable-next-line no-unsanitized/property - lotsContainerElement.innerHTML = `
    -

    There are no ${los.escapedAliases.lots} associated with this work order.

    -
    ` - - return - } - - // eslint-disable-next-line no-unsanitized/property - lotsContainerElement.innerHTML = ` - - - - - - - - -
    ${los.escapedAliases.Lot}${los.escapedAliases.Map}${los.escapedAliases.Lot} TypeStatus
    ` - - for (const lot of workOrderLots) { - const rowElement = document.createElement('tr') - rowElement.className = 'container--lot' - - rowElement.dataset.burialSiteId = lot.burialSiteId.toString() - - // eslint-disable-next-line no-unsanitized/property - rowElement.innerHTML = ` - - ${cityssm.escapeHTML(lot.burialSiteName ?? '')} - - - ${cityssm.escapeHTML(lot.cemeteryName ?? '')} - - ${cityssm.escapeHTML(lot.lotType ?? '')} - - ${ - lot.burialSiteStatusId - ? cityssm.escapeHTML(lot.lotStatus ?? '') - : '(No Status)' - } - - - - ` - - rowElement - .querySelector('.button--editLotStatus') - ?.addEventListener('click', openEditLotStatus) - - rowElement - .querySelector('.button--deleteLot') - ?.addEventListener('click', deleteLot) - - lotsContainerElement.querySelector('tbody')?.append(rowElement) - } - } - - function renderRelatedLotsAndOccupancies(): void { - renderRelatedOccupancies() - renderRelatedLots() - } - - renderRelatedLotsAndOccupancies() - - function doAddLotOccupancy(clickEvent: Event): void { - const rowElement = (clickEvent.currentTarget as HTMLElement).closest( - 'tr' - ) as HTMLTableRowElement - - const contractId = rowElement.dataset.contractId ?? '' - - addContract(contractId, (success) => { - if (success) { - rowElement.remove() - } - }) - } - - document - .querySelector('#button--addContract') - ?.addEventListener('click', () => { - let searchFormElement: HTMLFormElement - let searchResultsContainerElement: HTMLElement - - function doSearch(event?: Event): void { - if (event) { - event.preventDefault() - } - - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = - los.getLoadingParagraphHTML('Searching...') - - cityssm.postJSON( - `${los.urlPrefix}/contracts/doSearchLotOccupancies`, - searchFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - lotOccupancies: LotOccupancy[] - } - - if (responseJSON.lotOccupancies.length === 0) { - searchResultsContainerElement.innerHTML = `
    -

    There are no records that meet the search criteria.

    -
    ` - - return - } - - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = ` - - - - - - - - - -
    ${los.escapedAliases.Occupancy} Type${los.escapedAliases.Lot}${los.escapedAliases.contractStartDate}End Date${los.escapedAliases.Occupants}
    ` - - for (const contract of responseJSON.lotOccupancies) { - const rowElement = document.createElement('tr') - rowElement.className = 'container--contract' - rowElement.dataset.contractId = - contract.contractId.toString() - - rowElement.innerHTML = ` - - - - ${cityssm.escapeHTML(contract.contractType ?? '')} - ` - - if (contract.burialSiteId) { - rowElement.insertAdjacentHTML( - 'beforeend', - `${cityssm.escapeHTML(contract.burialSiteName ?? '')}` - ) - } else { - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML( - 'beforeend', - `(No ${los.escapedAliases.Lot})` - ) - } - - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML( - 'beforeend', - ` - ${contract.contractStartDateString} - - ${ - contract.contractEndDate - ? contract.contractEndDateString - : '(No End Date)' - } - - ${ - contract.contractOccupants!.length === 0 - ? ` - (No ${cityssm.escapeHTML( - los.escapedAliases.Occupants - )}) - ` - : cityssm.escapeHTML( - `${contract.contractOccupants![0].occupantName} - ${ - contract.contractOccupants![0] - .occupantFamilyName - }` - ) + - (contract.contractOccupants!.length > 1 - ? ` plus - ${( - contract.contractOccupants!.length - 1 - ).toString()}` - : '') - }` - ) - - rowElement - .querySelector('.button--addContract') - ?.addEventListener('click', doAddLotOccupancy) - - searchResultsContainerElement - .querySelector('tbody') - ?.append(rowElement) - } - } - ) - } - - cityssm.openHtmlModal('workOrder-addContract', { - onshow(modalElement) { - los.populateAliases(modalElement) - - searchFormElement = modalElement.querySelector( - 'form' - ) as HTMLFormElement - - searchResultsContainerElement = modalElement.querySelector( - '#resultsContainer--contractAdd' - ) as HTMLElement - ;( - modalElement.querySelector( - '#contractSearch--notWorkOrderId' - ) as HTMLInputElement - ).value = workOrderId - ;( - modalElement.querySelector( - '#contractSearch--occupancyEffectiveDateString' - ) as HTMLInputElement - ).value = ( - document.querySelector( - '#workOrderEdit--workOrderOpenDateString' - ) as HTMLInputElement - ).value - - doSearch() - }, - onshown(modalElement) { - bulmaJS.toggleHtmlClipped() - - const occupantNameElement = modalElement.querySelector( - '#contractSearch--occupantName' - ) as HTMLInputElement - - occupantNameElement.addEventListener('change', doSearch) - occupantNameElement.focus() - ;( - modalElement.querySelector( - '#contractSearch--burialSiteName' - ) as HTMLInputElement - ).addEventListener('change', doSearch) - - searchFormElement.addEventListener('submit', doSearch) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - ;( - document.querySelector( - '#button--addContract' - ) as HTMLButtonElement - ).focus() - } - }) - }) - - function doAddLot(clickEvent: Event): void { - const rowElement = (clickEvent.currentTarget as HTMLElement).closest( - 'tr' - ) as HTMLTableRowElement - - const burialSiteId = rowElement.dataset.burialSiteId ?? '' - - addBurialSite(burialSiteId, (success) => { - if (success) { - rowElement.remove() - } - }) - } - - document - .querySelector('#button--addBurialSite') - ?.addEventListener('click', () => { - let searchFormElement: HTMLFormElement - let searchResultsContainerElement: HTMLElement - - function doSearch(event?: Event): void { - if (event) { - event.preventDefault() - } - - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = - los.getLoadingParagraphHTML('Searching...') - - cityssm.postJSON( - `${los.urlPrefix}/burialSites/doSearchBurialSites`, - searchFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { lots: Lot[] } - - if (responseJSON.lots.length === 0) { - searchResultsContainerElement.innerHTML = `
    -

    There are no records that meet the search criteria.

    -
    ` - - return - } - - // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = ` - - - - - - - - -
    ${los.escapedAliases.Lot}${los.escapedAliases.Map}${los.escapedAliases.Lot} TypeStatus
    ` - - for (const lot of responseJSON.lots) { - const rowElement = document.createElement('tr') - rowElement.className = 'container--lot' - rowElement.dataset.burialSiteId = lot.burialSiteId.toString() - - rowElement.innerHTML = ` - - - ${cityssm.escapeHTML(lot.burialSiteName ?? '')} - - ${cityssm.escapeHTML(lot.cemeteryName ?? '')} - - ${cityssm.escapeHTML(lot.lotType ?? '')} - - ${cityssm.escapeHTML(lot.lotStatus ?? '')} - ` - - rowElement - .querySelector('.button--addBurialSite') - ?.addEventListener('click', doAddLot) - - searchResultsContainerElement - .querySelector('tbody') - ?.append(rowElement) - } - } - ) - } - - cityssm.openHtmlModal('workOrder-addBurialSite', { - onshow(modalElement) { - los.populateAliases(modalElement) - - searchFormElement = modalElement.querySelector( - 'form' - ) as HTMLFormElement - - searchResultsContainerElement = modalElement.querySelector( - '#resultsContainer--lotAdd' - ) as HTMLElement - ;( - modalElement.querySelector( - '#lotSearch--notWorkOrderId' - ) as HTMLInputElement - ).value = workOrderId - - const lotStatusElement = modalElement.querySelector( - '#lotSearch--burialSiteStatusId' - ) as HTMLSelectElement - - for (const lotStatus of exports.lotStatuses as LotStatus[]) { - const optionElement = document.createElement('option') - optionElement.value = lotStatus.burialSiteStatusId.toString() - optionElement.textContent = lotStatus.lotStatus - lotStatusElement.append(optionElement) - } - - doSearch() - }, - onshown(modalElement) { - bulmaJS.toggleHtmlClipped() - - const burialSiteNameElement = modalElement.querySelector( - '#lotSearch--burialSiteName' - ) as HTMLInputElement - - burialSiteNameElement.addEventListener('change', doSearch) - burialSiteNameElement.focus() - - modalElement - .querySelector('#lotSearch--burialSiteStatusId') - ?.addEventListener('change', doSearch) - - searchFormElement.addEventListener('submit', doSearch) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - ;( - document.querySelector('#button--addBurialSite') as HTMLButtonElement - ).focus() - } - }) - }) - })() - } - - /** - * Comments - */ - ;(() => { - let workOrderComments = exports.workOrderComments as WorkOrderComment[] - delete exports.workOrderComments - - function openEditWorkOrderComment(clickEvent: Event): void { - const workOrderCommentId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset - .workOrderCommentId ?? '', - 10 - ) - - const workOrderComment = workOrderComments.find( - (currentComment) => - currentComment.workOrderCommentId === workOrderCommentId - ) as WorkOrderComment - - let editFormElement: HTMLFormElement - let editCloseModalFunction: () => void - - function editComment(submitEvent: SubmitEvent): void { - submitEvent.preventDefault() - - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doUpdateWorkOrderComment`, - editFormElement, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderComments: WorkOrderComment[] - } - - if (responseJSON.success) { - workOrderComments = responseJSON.workOrderComments - editCloseModalFunction() - renderWorkOrderComments() - } else { - bulmaJS.alert({ - title: 'Error Updating Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - cityssm.openHtmlModal('workOrder-editComment', { - onshow(modalElement) { - ;( - modalElement.querySelector( - '#workOrderCommentEdit--workOrderId' - ) as HTMLInputElement - ).value = workOrderId - ;( - modalElement.querySelector( - '#workOrderCommentEdit--workOrderCommentId' - ) as HTMLInputElement - ).value = workOrderCommentId.toString() - ;( - modalElement.querySelector( - '#workOrderCommentEdit--workOrderComment' - ) as HTMLInputElement - ).value = workOrderComment.workOrderComment ?? '' - - const workOrderCommentDateStringElement = modalElement.querySelector( - '#workOrderCommentEdit--workOrderCommentDateString' - ) as HTMLInputElement - - workOrderCommentDateStringElement.value = - workOrderComment.workOrderCommentDateString ?? '' - - const currentDateString = cityssm.dateToString(new Date()) - - workOrderCommentDateStringElement.max = - workOrderComment.workOrderCommentDateString! <= currentDateString - ? currentDateString - : workOrderComment.workOrderCommentDateString ?? '' - ;( - modalElement.querySelector( - '#workOrderCommentEdit--workOrderCommentTimeString' - ) as HTMLInputElement - ).value = workOrderComment.workOrderCommentTimeString ?? '' - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - - los.initializeDatePickers(modalElement) - ;( - modalElement.querySelector( - '#workOrderCommentEdit--workOrderComment' - ) as HTMLTextAreaElement - ).focus() - - editFormElement = modalElement.querySelector( - 'form' - ) as HTMLFormElement - editFormElement.addEventListener('submit', editComment) - - editCloseModalFunction = closeModalFunction - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function deleteWorkOrderComment(clickEvent: Event): void { - const workOrderCommentId = Number.parseInt( - (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset - .workOrderCommentId ?? '', - 10 - ) - - function doDelete(): void { - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doDeleteWorkOrderComment`, - { - workOrderId, - workOrderCommentId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - errorMessage?: string - workOrderComments: WorkOrderComment[] - } - - if (responseJSON.success) { - workOrderComments = responseJSON.workOrderComments - renderWorkOrderComments() - } else { - bulmaJS.alert({ - title: 'Error Removing Comment', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Remove Comment?', - message: 'Are you sure you want to remove this comment?', - okButton: { - text: 'Yes, Remove Comment', - callbackFunction: doDelete - }, - contextualColorName: 'warning' - }) - } - - function renderWorkOrderComments(): void { - const containerElement = document.querySelector( - '#container--workOrderComments' - ) as HTMLElement - - if (workOrderComments.length === 0) { - containerElement.innerHTML = `
    -

    There are no comments to display.

    -
    ` - return - } - - const tableElement = document.createElement('table') - tableElement.className = 'table is-fullwidth is-striped is-hoverable' - tableElement.innerHTML = ` - Commentor - Comment Date - Comment - Options - - ` - - for (const workOrderComment of workOrderComments) { - const tableRowElement = document.createElement('tr') - - tableRowElement.dataset.workOrderCommentId = - workOrderComment.workOrderCommentId?.toString() - - // eslint-disable-next-line no-unsanitized/property - tableRowElement.innerHTML = ` - ${cityssm.escapeHTML(workOrderComment.recordCreate_userName ?? '')} - - ${workOrderComment.workOrderCommentDateString} - ${ - workOrderComment.workOrderCommentTime === 0 - ? '' - : workOrderComment.workOrderCommentTimePeriodString - } - - ${cityssm.escapeHTML(workOrderComment.workOrderComment ?? '')} - -
    - - -
    - ` - - tableRowElement - .querySelector('.button--edit') - ?.addEventListener('click', openEditWorkOrderComment) - - tableRowElement - .querySelector('.button--delete') - ?.addEventListener('click', deleteWorkOrderComment) - - tableElement.querySelector('tbody')?.append(tableRowElement) - } - - containerElement.innerHTML = '' - containerElement.append(tableElement) - } - - function openAddCommentModal(): void { - let addCommentCloseModalFunction: () => void - - function doAddComment(formEvent: SubmitEvent): void { - formEvent.preventDefault() - - cityssm.postJSON( - `${los.urlPrefix}/workOrders/doAddWorkOrderComment`, - formEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { - success: boolean - workOrderComments: WorkOrderComment[] - } - - if (responseJSON.success) { - workOrderComments = responseJSON.workOrderComments - renderWorkOrderComments() - addCommentCloseModalFunction() - } - } - ) - } - - cityssm.openHtmlModal('workOrder-addComment', { - onshow(modalElement) { - los.populateAliases(modalElement) - ;( - modalElement.querySelector( - '#workOrderCommentAdd--workOrderId' - ) as HTMLInputElement - ).value = workOrderId - - modalElement - .querySelector('form') - ?.addEventListener('submit', doAddComment) - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - addCommentCloseModalFunction = closeModalFunction - ;( - modalElement.querySelector( - '#workOrderCommentAdd--workOrderComment' - ) as HTMLTextAreaElement - ).focus() - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - ;( - document.querySelector( - '#workOrderComments--add' - ) as HTMLButtonElement - ).focus() - } - }) - } - - document - .querySelector('#workOrderComments--add') - ?.addEventListener('click', openAddCommentModal) - - if (!isCreate) { - renderWorkOrderComments() - } - })() - /* * Milestones */ @@ -1371,12 +230,12 @@ declare const exports: Record targetPanelElement.insertAdjacentHTML( 'beforeend', `
    - ${los.getLoadingParagraphHTML('Loading conflicting milestones...')} + ${sunrise.getLoadingParagraphHTML('Loading conflicting milestones...')}
    ` ) cityssm.postJSON( - `${los.urlPrefix}/workOrders/doGetWorkOrderMilestones`, + `${sunrise.urlPrefix}/workOrders/doGetWorkOrderMilestones`, { workOrderMilestoneDateFilter: 'date', workOrderMilestoneDateString @@ -1470,7 +329,7 @@ declare const exports: Record function doComplete(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`, + `${sunrise.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`, { workOrderId, workOrderMilestoneId @@ -1509,7 +368,7 @@ declare const exports: Record function doReopen(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doReopenWorkOrderMilestone`, + `${sunrise.urlPrefix}/workOrders/doReopenWorkOrderMilestone`, { workOrderId, workOrderMilestoneId @@ -1541,7 +400,7 @@ declare const exports: Record function doDelete(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`, + `${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`, { workOrderMilestoneId, workOrderId @@ -1585,7 +444,7 @@ declare const exports: Record submitEvent.preventDefault() cityssm.postJSON( - `${los.urlPrefix}/workOrders/doUpdateWorkOrderMilestone`, + `${sunrise.urlPrefix}/workOrders/doUpdateWorkOrderMilestone`, submitEvent.currentTarget, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -1682,8 +541,6 @@ declare const exports: Record bulmaJS.toggleHtmlClipped() - los.initializeDatePickers(modalElement) - // los.initializeTimePickers(modalElement); modalElement.querySelector('form')?.addEventListener('submit', doEdit) const conflictingMilestonePanelElement = document.querySelector( @@ -1825,7 +682,7 @@ declare const exports: Record let workOrderMilestoneDateStringElement: HTMLInputElement let addCloseModalFunction: () => void - function doAdd(submitEvent: SubmitEvent): void { + function doAdd(submitEvent?: SubmitEvent): void { if (submitEvent) { submitEvent.preventDefault() } @@ -1834,7 +691,7 @@ declare const exports: Record function _doAdd(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doAddWorkOrderMilestone`, + `${sunrise.urlPrefix}/workOrders/doAddWorkOrderMilestone`, addFormElement, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -1904,9 +761,6 @@ declare const exports: Record onshown(modalElement, closeModalFunction) { addCloseModalFunction = closeModalFunction - los.initializeDatePickers(modalElement) - // los.initializeTimePickers(modalElement); - bulmaJS.toggleHtmlClipped() ;( modalElement.querySelector( diff --git a/public/javascripts/workOrder.editComments.d.ts b/public/javascripts/workOrder.editComments.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/workOrder.editComments.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/workOrder.editComments.js b/public/javascripts/workOrder.editComments.js new file mode 100644 index 00000000..29b4db15 --- /dev/null +++ b/public/javascripts/workOrder.editComments.js @@ -0,0 +1,181 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const workOrderId = document.querySelector('#workOrderEdit--workOrderId').value; + let workOrderComments = exports.workOrderComments; + delete exports.workOrderComments; + function openEditWorkOrderComment(clickEvent) { + const workOrderCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .workOrderCommentId ?? '', 10); + const workOrderComment = workOrderComments.find((currentComment) => currentComment.workOrderCommentId === workOrderCommentId); + let editFormElement; + let editCloseModalFunction; + function editComment(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doUpdateWorkOrderComment`, editFormElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderComments = responseJSON.workOrderComments; + editCloseModalFunction(); + renderWorkOrderComments(); + } + else { + bulmaJS.alert({ + title: 'Error Updating Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('workOrder-editComment', { + onshow(modalElement) { + ; + modalElement.querySelector('#workOrderCommentEdit--workOrderId').value = workOrderId; + modalElement.querySelector('#workOrderCommentEdit--workOrderCommentId').value = workOrderCommentId.toString(); + modalElement.querySelector('#workOrderCommentEdit--comment').value = workOrderComment.comment ?? ''; + const workOrderCommentDateStringElement = modalElement.querySelector('#workOrderCommentEdit--commentDateString'); + workOrderCommentDateStringElement.value = + workOrderComment.commentDateString ?? ''; + const currentDateString = cityssm.dateToString(new Date()); + workOrderCommentDateStringElement.max = + workOrderComment.commentDateString <= currentDateString + ? currentDateString + : workOrderComment.commentDateString ?? ''; + modalElement.querySelector('#workOrderCommentEdit--commentTimeString').value = workOrderComment.commentTimeString ?? ''; + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#workOrderCommentEdit--comment').focus(); + editFormElement = modalElement.querySelector('form'); + editFormElement.addEventListener('submit', editComment); + editCloseModalFunction = closeModalFunction; + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function deleteWorkOrderComment(clickEvent) { + const workOrderCommentId = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .workOrderCommentId ?? '', 10); + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderComment`, { + workOrderId, + workOrderCommentId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderComments = responseJSON.workOrderComments; + renderWorkOrderComments(); + } + else { + bulmaJS.alert({ + title: 'Error Removing Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: 'Remove Comment?', + message: 'Are you sure you want to remove this comment?', + okButton: { + text: 'Yes, Remove Comment', + callbackFunction: doDelete + }, + contextualColorName: 'warning' + }); + } + function renderWorkOrderComments() { + const containerElement = document.querySelector('#container--workOrderComments'); + if (workOrderComments.length === 0) { + containerElement.innerHTML = `
    +

    There are no comments to display.

    +
    `; + return; + } + const tableElement = document.createElement('table'); + tableElement.className = 'table is-fullwidth is-striped is-hoverable'; + tableElement.innerHTML = ` + Author + Comment Date + Comment + Options + + `; + for (const workOrderComment of workOrderComments) { + const tableRowElement = document.createElement('tr'); + tableRowElement.dataset.workOrderCommentId = + workOrderComment.workOrderCommentId?.toString(); + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(workOrderComment.recordCreate_userName ?? '')} + + ${workOrderComment.commentDateString} + ${workOrderComment.commentTime === 0 + ? '' + : workOrderComment.commentTimePeriodString} + + ${cityssm.escapeHTML(workOrderComment.comment ?? '')} + +
    + + +
    + `; + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', openEditWorkOrderComment); + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteWorkOrderComment); + tableElement.querySelector('tbody')?.append(tableRowElement); + } + containerElement.innerHTML = ''; + containerElement.append(tableElement); + } + function openAddCommentModal() { + let addCommentCloseModalFunction; + function doAddComment(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doAddWorkOrderComment`, formEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderComments = responseJSON.workOrderComments; + renderWorkOrderComments(); + addCommentCloseModalFunction(); + } + }); + } + cityssm.openHtmlModal('workOrder-addComment', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + modalElement.querySelector('#workOrderCommentAdd--workOrderId').value = workOrderId; + modalElement + .querySelector('form') + ?.addEventListener('submit', doAddComment); + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped(); + addCommentCloseModalFunction = closeModalFunction; + modalElement.querySelector('#workOrderCommentAdd--comment').focus(); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + document.querySelector('#workOrderComments--add').focus(); + } + }); + } + document + .querySelector('#workOrderComments--add') + ?.addEventListener('click', openAddCommentModal); + renderWorkOrderComments(); +})(); diff --git a/public/javascripts/workOrder.editComments.ts b/public/javascripts/workOrder.editComments.ts new file mode 100644 index 00000000..fa5d88a3 --- /dev/null +++ b/public/javascripts/workOrder.editComments.ts @@ -0,0 +1,294 @@ +import type { BulmaJS } from '@cityssm/bulma-js/types.js' +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { WorkOrderComment } from '../../types/recordTypes.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 workOrderId = ( + document.querySelector('#workOrderEdit--workOrderId') as HTMLInputElement + ).value + + let workOrderComments = exports.workOrderComments as WorkOrderComment[] + delete exports.workOrderComments + + function openEditWorkOrderComment(clickEvent: Event): void { + const workOrderCommentId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset + .workOrderCommentId ?? '', + 10 + ) + + const workOrderComment = workOrderComments.find( + (currentComment) => + currentComment.workOrderCommentId === workOrderCommentId + ) as WorkOrderComment + + let editFormElement: HTMLFormElement + let editCloseModalFunction: () => void + + function editComment(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doUpdateWorkOrderComment`, + editFormElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderComments: WorkOrderComment[] + } + + if (responseJSON.success) { + workOrderComments = responseJSON.workOrderComments + editCloseModalFunction() + renderWorkOrderComments() + } else { + bulmaJS.alert({ + title: 'Error Updating Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('workOrder-editComment', { + onshow(modalElement) { + ;( + modalElement.querySelector( + '#workOrderCommentEdit--workOrderId' + ) as HTMLInputElement + ).value = workOrderId + ;( + modalElement.querySelector( + '#workOrderCommentEdit--workOrderCommentId' + ) as HTMLInputElement + ).value = workOrderCommentId.toString() + ;( + modalElement.querySelector( + '#workOrderCommentEdit--comment' + ) as HTMLInputElement + ).value = workOrderComment.comment ?? '' + + const workOrderCommentDateStringElement = modalElement.querySelector( + '#workOrderCommentEdit--commentDateString' + ) as HTMLInputElement + + workOrderCommentDateStringElement.value = + workOrderComment.commentDateString ?? '' + + const currentDateString = cityssm.dateToString(new Date()) + + workOrderCommentDateStringElement.max = + workOrderComment.commentDateString! <= currentDateString + ? currentDateString + : workOrderComment.commentDateString ?? '' + ;( + modalElement.querySelector( + '#workOrderCommentEdit--commentTimeString' + ) as HTMLInputElement + ).value = workOrderComment.commentTimeString ?? '' + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + ;( + modalElement.querySelector( + '#workOrderCommentEdit--comment' + ) as HTMLTextAreaElement + ).focus() + + editFormElement = modalElement.querySelector('form') as HTMLFormElement + editFormElement.addEventListener('submit', editComment) + + editCloseModalFunction = closeModalFunction + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function deleteWorkOrderComment(clickEvent: Event): void { + const workOrderCommentId = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset + .workOrderCommentId ?? '', + 10 + ) + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderComment`, + { + workOrderId, + workOrderCommentId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderComments: WorkOrderComment[] + } + + if (responseJSON.success) { + workOrderComments = responseJSON.workOrderComments + renderWorkOrderComments() + } else { + bulmaJS.alert({ + title: 'Error Removing Comment', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: 'Remove Comment?', + message: 'Are you sure you want to remove this comment?', + okButton: { + text: 'Yes, Remove Comment', + callbackFunction: doDelete + }, + contextualColorName: 'warning' + }) + } + + function renderWorkOrderComments(): void { + const containerElement = document.querySelector( + '#container--workOrderComments' + ) as HTMLElement + + if (workOrderComments.length === 0) { + containerElement.innerHTML = `
    +

    There are no comments to display.

    +
    ` + return + } + + const tableElement = document.createElement('table') + tableElement.className = 'table is-fullwidth is-striped is-hoverable' + tableElement.innerHTML = ` + Author + Comment Date + Comment + Options + + ` + + for (const workOrderComment of workOrderComments) { + const tableRowElement = document.createElement('tr') + + tableRowElement.dataset.workOrderCommentId = + workOrderComment.workOrderCommentId?.toString() + + // eslint-disable-next-line no-unsanitized/property + tableRowElement.innerHTML = ` + ${cityssm.escapeHTML(workOrderComment.recordCreate_userName ?? '')} + + ${workOrderComment.commentDateString} + ${ + workOrderComment.commentTime === 0 + ? '' + : workOrderComment.commentTimePeriodString + } + + ${cityssm.escapeHTML(workOrderComment.comment ?? '')} + +
    + + +
    + ` + + tableRowElement + .querySelector('.button--edit') + ?.addEventListener('click', openEditWorkOrderComment) + + tableRowElement + .querySelector('.button--delete') + ?.addEventListener('click', deleteWorkOrderComment) + + tableElement.querySelector('tbody')?.append(tableRowElement) + } + + containerElement.innerHTML = '' + containerElement.append(tableElement) + } + + function openAddCommentModal(): void { + let addCommentCloseModalFunction: () => void + + function doAddComment(formEvent: SubmitEvent): void { + formEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doAddWorkOrderComment`, + formEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + workOrderComments: WorkOrderComment[] + } + + if (responseJSON.success) { + workOrderComments = responseJSON.workOrderComments + renderWorkOrderComments() + addCommentCloseModalFunction() + } + } + ) + } + + cityssm.openHtmlModal('workOrder-addComment', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + ;( + modalElement.querySelector( + '#workOrderCommentAdd--workOrderId' + ) as HTMLInputElement + ).value = workOrderId + + modalElement + .querySelector('form') + ?.addEventListener('submit', doAddComment) + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + addCommentCloseModalFunction = closeModalFunction + ;( + modalElement.querySelector( + '#workOrderCommentAdd--comment' + ) as HTMLTextAreaElement + ).focus() + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + ;( + document.querySelector('#workOrderComments--add') as HTMLButtonElement + ).focus() + } + }) + } + + document + .querySelector('#workOrderComments--add') + ?.addEventListener('click', openAddCommentModal) + + renderWorkOrderComments() +})() diff --git a/public/javascripts/workOrder.editRelated.d.ts b/public/javascripts/workOrder.editRelated.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/public/javascripts/workOrder.editRelated.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public/javascripts/workOrder.editRelated.js b/public/javascripts/workOrder.editRelated.js new file mode 100644 index 00000000..c6f208d3 --- /dev/null +++ b/public/javascripts/workOrder.editRelated.js @@ -0,0 +1,547 @@ +"use strict"; +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable max-lines */ +Object.defineProperty(exports, "__esModule", { value: true }); +(() => { + const sunrise = exports.sunrise; + const workOrderId = document.querySelector('#workOrderEdit--workOrderId').value; + let workOrderBurialSites = exports.workOrderBurialSites; + delete exports.workOrderBurialSites; + let workOrderContracts = exports.workOrderContracts; + delete exports.workOrderContracts; + function deleteContract(clickEvent) { + const contractId = clickEvent.currentTarget.closest('.container--contract').dataset.contractId; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderContract`, { + workOrderId, + contractId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderContracts = responseJSON.workOrderContracts; + renderRelatedBurialSitesAndContracts(); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Relationship', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: `Delete Contract Relationship`, + message: `Are you sure you want to remove the relationship to this contract record from this work order? + Note that the contract will remain.`, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Relationship', + callbackFunction: doDelete + } + }); + } + function addBurialSite(burialSiteId, callbackFunction) { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doAddWorkOrderBurialSite`, { + workOrderId, + burialSiteId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderBurialSites = responseJSON.workOrderBurialSites; + renderRelatedBurialSitesAndContracts(); + } + else { + bulmaJS.alert({ + title: 'Error Adding Burial Site', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + if (callbackFunction !== undefined) { + callbackFunction(responseJSON.success); + } + }); + } + function addContract(contractId, callbackFunction) { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doAddWorkOrderContract`, { + workOrderId, + contractId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderContracts = responseJSON.workOrderContracts; + renderRelatedBurialSitesAndContracts(); + } + else { + bulmaJS.alert({ + title: `Error Adding Contract`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + if (callbackFunction !== undefined) { + callbackFunction(responseJSON.success); + } + }); + } + function addBurialSiteFromContract(clickEvent) { + const burialSiteId = clickEvent.currentTarget.dataset.burialSiteId ?? ''; + addBurialSite(burialSiteId); + } + // eslint-disable-next-line complexity + function renderRelatedContracts() { + const contractsContainerElement = document.querySelector('#container--contracts'); + document.querySelector(".tabs a[href='#relatedTab--contracts'] .tag").textContent = workOrderContracts.length.toString(); + if (workOrderContracts.length === 0) { + contractsContainerElement.innerHTML = `
    +

    There are no contracts associated with this work order.

    +
    `; + return; + } + contractsContainerElement.innerHTML = ` + + + + + + + + + + +
    Contract TypeBurial SiteContract DateEnd DateInterments
    `; + const currentDateString = cityssm.dateToString(new Date()); + for (const contract of workOrderContracts) { + const rowElement = document.createElement('tr'); + rowElement.className = 'container--contract'; + rowElement.dataset.contractId = contract.contractId.toString(); + const isActive = !(contract.contractEndDate && + contract.contractEndDateString < currentDateString); + const hasBurialSiteRecord = contract.burialSiteId && + workOrderBurialSites.some((burialSite) => contract.burialSiteId === burialSite.burialSiteId); + // eslint-disable-next-line no-unsanitized/property + rowElement.innerHTML = ` + ${isActive + ? `` + : ``} + + + ${cityssm.escapeHTML(contract.contractType ?? '')} +
    + #${contract.contractId} + `; + if (contract.burialSiteId) { + // eslint-disable-next-line no-unsanitized/method + rowElement.insertAdjacentHTML('beforeend', ` + ${cityssm.escapeHTML(contract.burialSiteName ?? '')} + ${hasBurialSiteRecord + ? '' + : ` `} + `); + } + else { + rowElement.insertAdjacentHTML('beforeend', `(No Burial Site)`); + } + let intermentsHTML = ''; + for (const interment of contract.contractInterments ?? []) { + intermentsHTML += `
  • + + + + ${cityssm.escapeHTML(interment.deceasedName ?? '')} +
    • `; + } + // eslint-disable-next-line no-unsanitized/method + rowElement.insertAdjacentHTML('beforeend', ` + ${contract.contractStartDateString} + + ${contract.contractEndDate + ? contract.contractEndDateString + : '(No End Date)'} + + ${contract.contractInterments.length === 0 + ? `(No Interments)` + : `
      ${intermentsHTML}
    `} + + + `); + rowElement + .querySelector('.button--addBurialSite') + ?.addEventListener('click', addBurialSiteFromContract); + rowElement + .querySelector('.button--deleteContract') + ?.addEventListener('click', deleteContract); + contractsContainerElement.querySelector('tbody')?.append(rowElement); + } + } + function openEditBurialSiteStatus(clickEvent) { + const burialSiteId = Number.parseInt(clickEvent.currentTarget.closest('.container--burialSite').dataset.burialSiteId ?? '', 10); + const burialSite = workOrderBurialSites.find((potentialBurialSite) => potentialBurialSite.burialSiteId === burialSiteId); + let editCloseModalFunction; + function doUpdateBurialSiteStatus(submitEvent) { + submitEvent.preventDefault(); + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doUpdateBurialSiteStatus`, submitEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderBurialSites = responseJSON.workOrderBurialSites; + renderRelatedBurialSitesAndContracts(); + editCloseModalFunction(); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Relationship', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + cityssm.openHtmlModal('burialSite-editBurialSiteStatus', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + modalElement.querySelector('#burialSiteStatusEdit--burialSiteId').value = burialSiteId.toString(); + modalElement.querySelector('#burialSiteStatusEdit--burialSiteName').value = burialSite.burialSiteName ?? ''; + const burialSiteStatusElement = modalElement.querySelector('#burialSiteStatusEdit--burialSiteStatusId'); + let statusFound = false; + for (const burialSiteStatus of exports.burialSiteStatuses) { + const optionElement = document.createElement('option'); + optionElement.value = burialSiteStatus.burialSiteStatusId.toString(); + optionElement.textContent = burialSiteStatus.burialSiteStatus; + if (burialSiteStatus.burialSiteStatusId === + burialSite.burialSiteStatusId) { + statusFound = true; + } + burialSiteStatusElement.append(optionElement); + } + if (!statusFound && burialSite.burialSiteStatusId) { + const optionElement = document.createElement('option'); + optionElement.value = burialSite.burialSiteStatusId.toString(); + optionElement.textContent = burialSite.burialSiteStatus ?? ''; + burialSiteStatusElement.append(optionElement); + } + if (burialSite.burialSiteStatusId) { + burialSiteStatusElement.value = + burialSite.burialSiteStatusId.toString(); + } + // eslint-disable-next-line no-unsanitized/method + modalElement + .querySelector('form') + ?.insertAdjacentHTML('beforeend', ``); + }, + onshown(modalElement, closeModalFunction) { + editCloseModalFunction = closeModalFunction; + bulmaJS.toggleHtmlClipped(); + modalElement + .querySelector('form') + ?.addEventListener('submit', doUpdateBurialSiteStatus); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function deleteBurialSite(clickEvent) { + const burialSiteId = clickEvent.currentTarget.closest('.container--burialSite').dataset.burialSiteId; + function doDelete() { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderBurialSite`, { + workOrderId, + burialSiteId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + workOrderBurialSites = responseJSON.workOrderBurialSites; + renderRelatedBurialSitesAndContracts(); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Relationship', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: `Delete Burial Site Relationship`, + message: `Are you sure you want to remove the relationship to this burial site from this work order? + Note that the record will remain.`, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Relationship', + callbackFunction: doDelete + } + }); + } + function renderRelatedBurialSites() { + const burialSitesContainerElement = document.querySelector('#container--burialSites'); + document.querySelector(".tabs a[href='#relatedTab--burialSites'] .tag").textContent = workOrderBurialSites.length.toString(); + if (workOrderBurialSites.length === 0) { + burialSitesContainerElement.innerHTML = `
    +

    There are no burial sites associated with this work order.

    +
    `; + return; + } + burialSitesContainerElement.innerHTML = ` + + + + + + + + +
    Burial SiteCemeteryBurial Site TypeStatus
    `; + for (const burialSite of workOrderBurialSites) { + const rowElement = document.createElement('tr'); + rowElement.className = 'container--burialSite'; + rowElement.dataset.burialSiteId = burialSite.burialSiteId.toString(); + // eslint-disable-next-line no-unsanitized/property + rowElement.innerHTML = ` + + ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} + + + ${cityssm.escapeHTML(burialSite.cemeteryName ?? '')} + + ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')} + + ${burialSite.burialSiteStatusId + ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '') + : '(No Status)'} + + + + `; + rowElement + .querySelector('.button--editBurialSiteStatus') + ?.addEventListener('click', openEditBurialSiteStatus); + rowElement + .querySelector('.button--deleteBurialSite') + ?.addEventListener('click', deleteBurialSite); + burialSitesContainerElement.querySelector('tbody')?.append(rowElement); + } + } + function renderRelatedBurialSitesAndContracts() { + renderRelatedContracts(); + renderRelatedBurialSites(); + } + renderRelatedBurialSitesAndContracts(); + function doAddContract(clickEvent) { + const rowElement = clickEvent.currentTarget.closest('tr'); + const contractId = rowElement.dataset.contractId ?? ''; + addContract(contractId, (success) => { + if (success) { + rowElement.remove(); + } + }); + } + document + .querySelector('#button--addContract') + ?.addEventListener('click', () => { + let searchFormElement; + let searchResultsContainerElement; + function doSearch(event) { + if (event) { + event.preventDefault(); + } + // eslint-disable-next-line no-unsanitized/property + searchResultsContainerElement.innerHTML = + sunrise.getLoadingParagraphHTML('Searching...'); + cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doSearchContracts`, searchFormElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.contracts.length === 0) { + searchResultsContainerElement.innerHTML = `
    +

    There are no records that meet the search criteria.

    +
    `; + return; + } + searchResultsContainerElement.innerHTML = ` + + + + + + + + + +
    Contract TypeBurial SiteContract DateEnd DateInterments
    `; + for (const contract of responseJSON.contracts) { + const rowElement = document.createElement('tr'); + rowElement.className = 'container--contract'; + rowElement.dataset.contractId = contract.contractId.toString(); + rowElement.innerHTML = ` + + + + ${cityssm.escapeHTML(contract.contractType ?? '')} + `; + if (contract.burialSiteId) { + rowElement.insertAdjacentHTML('beforeend', `${cityssm.escapeHTML(contract.burialSiteName ?? '')}`); + } + else { + rowElement.insertAdjacentHTML('beforeend', `(No Burial Site)`); + } + // eslint-disable-next-line no-unsanitized/method + rowElement.insertAdjacentHTML('beforeend', ` + ${contract.contractStartDateString} + + ${contract.contractEndDate + ? contract.contractEndDateString + : '(No End Date)'} + + ${(contract.contractInterments ?? []).length === 0 + ? ` + (No ${cityssm.escapeHTML(contract.isPreneed ?? false + ? 'Recipients' + : 'Deceased')}) + ` + : cityssm.escapeHTML(contract.contractInterments[0].deceasedName) + + (contract.contractInterments.length > 1 + ? ` plus + ${(contract.contractInterments.length - 1).toString()}` + : '')}`); + rowElement + .querySelector('.button--addContract') + ?.addEventListener('click', doAddContract); + searchResultsContainerElement + .querySelector('tbody') + ?.append(rowElement); + } + }); + } + cityssm.openHtmlModal('workOrder-addContract', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + searchFormElement = modalElement.querySelector('form'); + searchResultsContainerElement = modalElement.querySelector('#resultsContainer--contractAdd'); + modalElement.querySelector('#contractSearch--notWorkOrderId').value = workOrderId; + modalElement.querySelector('#contractSearch--contractEffectiveDateString').value = document.querySelector('#workOrderEdit--workOrderOpenDateString').value; + doSearch(); + }, + onshown(modalElement) { + bulmaJS.toggleHtmlClipped(); + const deceasedNameElement = modalElement.querySelector('#contractSearch--deceasedName'); + deceasedNameElement.addEventListener('change', doSearch); + deceasedNameElement.focus(); + modalElement.querySelector('#contractSearch--burialSiteName').addEventListener('change', doSearch); + searchFormElement.addEventListener('submit', doSearch); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + document.querySelector('#button--addContract').focus(); + } + }); + }); + function doAddBurialSite(clickEvent) { + const rowElement = clickEvent.currentTarget.closest('tr'); + const burialSiteId = rowElement.dataset.burialSiteId ?? ''; + addBurialSite(burialSiteId, (success) => { + if (success) { + rowElement.remove(); + } + }); + } + document + .querySelector('#button--addBurialSite') + ?.addEventListener('click', () => { + let searchFormElement; + let searchResultsContainerElement; + function doSearch(event) { + if (event) { + event.preventDefault(); + } + // eslint-disable-next-line no-unsanitized/property + searchResultsContainerElement.innerHTML = + sunrise.getLoadingParagraphHTML('Searching...'); + cityssm.postJSON(`${sunrise.urlPrefix}/burialSites/doSearchBurialSites`, searchFormElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.burialSites.length === 0) { + searchResultsContainerElement.innerHTML = `
    +

    There are no records that meet the search criteria.

    +
    `; + return; + } + searchResultsContainerElement.innerHTML = ` + + + + + + + + +
    Burial SiteCemeteryBurial Site TypeStatus
    `; + for (const burialSite of responseJSON.burialSites) { + const rowElement = document.createElement('tr'); + rowElement.className = 'container--burialSite'; + rowElement.dataset.burialSiteId = burialSite.burialSiteId.toString(); + rowElement.innerHTML = ` + + + ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} + + ${cityssm.escapeHTML(burialSite.cemeteryName ?? '')} + + ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')} + + ${cityssm.escapeHTML(burialSite.burialSiteStatus ?? '')} + `; + rowElement + .querySelector('.button--addBurialSite') + ?.addEventListener('click', doAddBurialSite); + searchResultsContainerElement + .querySelector('tbody') + ?.append(rowElement); + } + }); + } + cityssm.openHtmlModal('workOrder-addBurialSite', { + onshow(modalElement) { + sunrise.populateAliases(modalElement); + searchFormElement = modalElement.querySelector('form'); + searchResultsContainerElement = modalElement.querySelector('#resultsContainer--burialSiteAdd'); + modalElement.querySelector('#burialSiteSearch--notWorkOrderId').value = workOrderId; + const burialSiteStatusElement = modalElement.querySelector('#burialSiteSearch--burialSiteStatusId'); + for (const burialSiteStatus of exports.burialSiteStatuses) { + const optionElement = document.createElement('option'); + optionElement.value = burialSiteStatus.burialSiteStatusId.toString(); + optionElement.textContent = burialSiteStatus.burialSiteStatus; + burialSiteStatusElement.append(optionElement); + } + doSearch(); + }, + onshown(modalElement) { + bulmaJS.toggleHtmlClipped(); + const burialSiteNameElement = modalElement.querySelector('#burialSiteSearch--burialSiteName'); + burialSiteNameElement.addEventListener('change', doSearch); + burialSiteNameElement.focus(); + modalElement + .querySelector('#burialSiteSearch--burialSiteStatusId') + ?.addEventListener('change', doSearch); + searchFormElement.addEventListener('submit', doSearch); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + document.querySelector('#button--addBurialSite').focus(); + } + }); + }); +})(); diff --git a/public/javascripts/workOrder.editRelated.ts b/public/javascripts/workOrder.editRelated.ts new file mode 100644 index 00000000..607ab0a9 --- /dev/null +++ b/public/javascripts/workOrder.editRelated.ts @@ -0,0 +1,856 @@ +// 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 { + BurialSite, + BurialSiteStatus, + Contract +} from '../../types/recordTypes.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 workOrderId = ( + document.querySelector('#workOrderEdit--workOrderId') as HTMLInputElement + ).value + + let workOrderBurialSites = exports.workOrderBurialSites as BurialSite[] + delete exports.workOrderBurialSites + + let workOrderContracts = exports.workOrderContracts as Contract[] + delete exports.workOrderContracts + + function deleteContract(clickEvent: Event): void { + const contractId = ( + (clickEvent.currentTarget as HTMLElement).closest( + '.container--contract' + ) as HTMLElement + ).dataset.contractId + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderContract`, + { + workOrderId, + contractId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderContracts: Contract[] + } + + if (responseJSON.success) { + workOrderContracts = responseJSON.workOrderContracts + renderRelatedBurialSitesAndContracts() + } else { + bulmaJS.alert({ + title: 'Error Deleting Relationship', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: `Delete Contract Relationship`, + message: `Are you sure you want to remove the relationship to this contract record from this work order? + Note that the contract will remain.`, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Relationship', + callbackFunction: doDelete + } + }) + } + + function addBurialSite( + burialSiteId: number | string, + callbackFunction?: (success: boolean) => void + ): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doAddWorkOrderBurialSite`, + { + workOrderId, + burialSiteId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderBurialSites: BurialSite[] + } + + if (responseJSON.success) { + workOrderBurialSites = responseJSON.workOrderBurialSites + renderRelatedBurialSitesAndContracts() + } else { + bulmaJS.alert({ + title: 'Error Adding Burial Site', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + + if (callbackFunction !== undefined) { + callbackFunction(responseJSON.success) + } + } + ) + } + + function addContract( + contractId: number | string, + callbackFunction?: (success?: boolean) => void + ): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doAddWorkOrderContract`, + { + workOrderId, + contractId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderContracts: Contract[] + } + + if (responseJSON.success) { + workOrderContracts = responseJSON.workOrderContracts + renderRelatedBurialSitesAndContracts() + } else { + bulmaJS.alert({ + title: `Error Adding Contract`, + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + + if (callbackFunction !== undefined) { + callbackFunction(responseJSON.success) + } + } + ) + } + + function addBurialSiteFromContract(clickEvent: Event): void { + const burialSiteId = + (clickEvent.currentTarget as HTMLElement).dataset.burialSiteId ?? '' + addBurialSite(burialSiteId) + } + + // eslint-disable-next-line complexity + function renderRelatedContracts(): void { + const contractsContainerElement = document.querySelector( + '#container--contracts' + ) as HTMLElement + + ;( + document.querySelector( + ".tabs a[href='#relatedTab--contracts'] .tag" + ) as HTMLElement + ).textContent = workOrderContracts.length.toString() + + if (workOrderContracts.length === 0) { + contractsContainerElement.innerHTML = `
    +

    There are no contracts associated with this work order.

    +
    ` + + return + } + + contractsContainerElement.innerHTML = ` + + + + + + + + + + +
    Contract TypeBurial SiteContract DateEnd DateInterments
    ` + + const currentDateString = cityssm.dateToString(new Date()) + + for (const contract of workOrderContracts) { + const rowElement = document.createElement('tr') + rowElement.className = 'container--contract' + rowElement.dataset.contractId = contract.contractId.toString() + + const isActive = !( + contract.contractEndDate && + contract.contractEndDateString! < currentDateString + ) + + const hasBurialSiteRecord = + contract.burialSiteId && + workOrderBurialSites.some( + (burialSite) => contract.burialSiteId === burialSite.burialSiteId + ) + + // eslint-disable-next-line no-unsanitized/property + rowElement.innerHTML = ` + ${ + isActive + ? `` + : `` + } + + + ${cityssm.escapeHTML(contract.contractType ?? '')} +
    + #${contract.contractId} + ` + + if (contract.burialSiteId) { + // eslint-disable-next-line no-unsanitized/method + rowElement.insertAdjacentHTML( + 'beforeend', + ` + ${cityssm.escapeHTML(contract.burialSiteName ?? '')} + ${ + hasBurialSiteRecord + ? '' + : ` ` + } + ` + ) + } else { + rowElement.insertAdjacentHTML( + 'beforeend', + `(No Burial Site)` + ) + } + + let intermentsHTML = '' + + for (const interment of contract.contractInterments ?? []) { + intermentsHTML += `
  • + + + + ${cityssm.escapeHTML(interment.deceasedName ?? '')} +
    • ` + } + + // eslint-disable-next-line no-unsanitized/method + rowElement.insertAdjacentHTML( + 'beforeend', + ` + ${contract.contractStartDateString} + + ${ + contract.contractEndDate + ? contract.contractEndDateString + : '(No End Date)' + } + + ${ + contract.contractInterments!.length === 0 + ? `(No Interments)` + : `
      ${intermentsHTML}
    ` + } + + + ` + ) + + rowElement + .querySelector('.button--addBurialSite') + ?.addEventListener('click', addBurialSiteFromContract) + + rowElement + .querySelector('.button--deleteContract') + ?.addEventListener('click', deleteContract) + + contractsContainerElement.querySelector('tbody')?.append(rowElement) + } + } + + function openEditBurialSiteStatus(clickEvent: Event): void { + const burialSiteId = Number.parseInt( + ( + (clickEvent.currentTarget as HTMLElement).closest( + '.container--burialSite' + ) as HTMLElement + ).dataset.burialSiteId ?? '', + 10 + ) + + const burialSite = workOrderBurialSites.find( + (potentialBurialSite) => potentialBurialSite.burialSiteId === burialSiteId + ) as BurialSite + + let editCloseModalFunction: () => void + + function doUpdateBurialSiteStatus(submitEvent: SubmitEvent): void { + submitEvent.preventDefault() + + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doUpdateBurialSiteStatus`, + submitEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderBurialSites: BurialSite[] + } + + if (responseJSON.success) { + workOrderBurialSites = responseJSON.workOrderBurialSites + renderRelatedBurialSitesAndContracts() + editCloseModalFunction() + } else { + bulmaJS.alert({ + title: 'Error Deleting Relationship', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + cityssm.openHtmlModal('burialSite-editBurialSiteStatus', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + ;( + modalElement.querySelector( + '#burialSiteStatusEdit--burialSiteId' + ) as HTMLInputElement + ).value = burialSiteId.toString() + ;( + modalElement.querySelector( + '#burialSiteStatusEdit--burialSiteName' + ) as HTMLInputElement + ).value = burialSite.burialSiteName ?? '' + + const burialSiteStatusElement = modalElement.querySelector( + '#burialSiteStatusEdit--burialSiteStatusId' + ) as HTMLSelectElement + + let statusFound = false + + for (const burialSiteStatus of exports.burialSiteStatuses as BurialSiteStatus[]) { + const optionElement = document.createElement('option') + optionElement.value = burialSiteStatus.burialSiteStatusId.toString() + optionElement.textContent = burialSiteStatus.burialSiteStatus + + if ( + burialSiteStatus.burialSiteStatusId === + burialSite.burialSiteStatusId + ) { + statusFound = true + } + + burialSiteStatusElement.append(optionElement) + } + + if (!statusFound && burialSite.burialSiteStatusId) { + const optionElement = document.createElement('option') + optionElement.value = burialSite.burialSiteStatusId.toString() + optionElement.textContent = burialSite.burialSiteStatus ?? '' + burialSiteStatusElement.append(optionElement) + } + + if (burialSite.burialSiteStatusId) { + burialSiteStatusElement.value = + burialSite.burialSiteStatusId.toString() + } + + // eslint-disable-next-line no-unsanitized/method + modalElement + .querySelector('form') + ?.insertAdjacentHTML( + 'beforeend', + `` + ) + }, + onshown(modalElement, closeModalFunction) { + editCloseModalFunction = closeModalFunction + + bulmaJS.toggleHtmlClipped() + + modalElement + .querySelector('form') + ?.addEventListener('submit', doUpdateBurialSiteStatus) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function deleteBurialSite(clickEvent: Event): void { + const burialSiteId = ( + (clickEvent.currentTarget as HTMLElement).closest( + '.container--burialSite' + ) as HTMLElement + ).dataset.burialSiteId + + function doDelete(): void { + cityssm.postJSON( + `${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderBurialSite`, + { + workOrderId, + burialSiteId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + success: boolean + errorMessage?: string + workOrderBurialSites: BurialSite[] + } + + if (responseJSON.success) { + workOrderBurialSites = responseJSON.workOrderBurialSites + renderRelatedBurialSitesAndContracts() + } else { + bulmaJS.alert({ + title: 'Error Deleting Relationship', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: `Delete Burial Site Relationship`, + message: `Are you sure you want to remove the relationship to this burial site from this work order? + Note that the record will remain.`, + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Relationship', + callbackFunction: doDelete + } + }) + } + + function renderRelatedBurialSites(): void { + const burialSitesContainerElement = document.querySelector( + '#container--burialSites' + ) as HTMLElement + + ;( + document.querySelector( + ".tabs a[href='#relatedTab--burialSites'] .tag" + ) as HTMLElement + ).textContent = workOrderBurialSites.length.toString() + + if (workOrderBurialSites.length === 0) { + burialSitesContainerElement.innerHTML = `
    +

    There are no burial sites associated with this work order.

    +
    ` + + return + } + + burialSitesContainerElement.innerHTML = ` + + + + + + + + +
    Burial SiteCemeteryBurial Site TypeStatus
    ` + + for (const burialSite of workOrderBurialSites) { + const rowElement = document.createElement('tr') + rowElement.className = 'container--burialSite' + + rowElement.dataset.burialSiteId = burialSite.burialSiteId.toString() + + // eslint-disable-next-line no-unsanitized/property + rowElement.innerHTML = ` + + ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} + + + ${cityssm.escapeHTML(burialSite.cemeteryName ?? '')} + + ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')} + + ${ + burialSite.burialSiteStatusId + ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '') + : '(No Status)' + } + + + + ` + + rowElement + .querySelector('.button--editBurialSiteStatus') + ?.addEventListener('click', openEditBurialSiteStatus) + + rowElement + .querySelector('.button--deleteBurialSite') + ?.addEventListener('click', deleteBurialSite) + + burialSitesContainerElement.querySelector('tbody')?.append(rowElement) + } + } + + function renderRelatedBurialSitesAndContracts(): void { + renderRelatedContracts() + renderRelatedBurialSites() + } + + renderRelatedBurialSitesAndContracts() + + function doAddContract(clickEvent: Event): void { + const rowElement = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + ) as HTMLTableRowElement + + const contractId = rowElement.dataset.contractId ?? '' + + addContract(contractId, (success) => { + if (success) { + rowElement.remove() + } + }) + } + + document + .querySelector('#button--addContract') + ?.addEventListener('click', () => { + let searchFormElement: HTMLFormElement + let searchResultsContainerElement: HTMLElement + + function doSearch(event?: Event): void { + if (event) { + event.preventDefault() + } + + // eslint-disable-next-line no-unsanitized/property + searchResultsContainerElement.innerHTML = + sunrise.getLoadingParagraphHTML('Searching...') + + cityssm.postJSON( + `${sunrise.urlPrefix}/contracts/doSearchContracts`, + searchFormElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { + contracts: Contract[] + } + + if (responseJSON.contracts.length === 0) { + searchResultsContainerElement.innerHTML = `
    +

    There are no records that meet the search criteria.

    +
    ` + + return + } + + searchResultsContainerElement.innerHTML = ` + + + + + + + + + +
    Contract TypeBurial SiteContract DateEnd DateInterments
    ` + + for (const contract of responseJSON.contracts) { + const rowElement = document.createElement('tr') + rowElement.className = 'container--contract' + rowElement.dataset.contractId = contract.contractId.toString() + + rowElement.innerHTML = ` + + + + ${cityssm.escapeHTML(contract.contractType ?? '')} + ` + + if (contract.burialSiteId) { + rowElement.insertAdjacentHTML( + 'beforeend', + `${cityssm.escapeHTML(contract.burialSiteName ?? '')}` + ) + } else { + rowElement.insertAdjacentHTML( + 'beforeend', + `(No Burial Site)` + ) + } + + // eslint-disable-next-line no-unsanitized/method + rowElement.insertAdjacentHTML( + 'beforeend', + ` + ${contract.contractStartDateString} + + ${ + contract.contractEndDate + ? contract.contractEndDateString + : '(No End Date)' + } + + ${ + (contract.contractInterments ?? []).length === 0 + ? ` + (No ${cityssm.escapeHTML( + contract.isPreneed ?? false + ? 'Recipients' + : 'Deceased' + )}) + ` + : cityssm.escapeHTML( + contract.contractInterments![0].deceasedName + ) + + (contract.contractInterments!.length > 1 + ? ` plus + ${( + contract.contractInterments!.length - 1 + ).toString()}` + : '') + }` + ) + + rowElement + .querySelector('.button--addContract') + ?.addEventListener('click', doAddContract) + + searchResultsContainerElement + .querySelector('tbody') + ?.append(rowElement) + } + } + ) + } + + cityssm.openHtmlModal('workOrder-addContract', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + + searchFormElement = modalElement.querySelector( + 'form' + ) as HTMLFormElement + + searchResultsContainerElement = modalElement.querySelector( + '#resultsContainer--contractAdd' + ) as HTMLElement + ;( + modalElement.querySelector( + '#contractSearch--notWorkOrderId' + ) as HTMLInputElement + ).value = workOrderId + ;( + modalElement.querySelector( + '#contractSearch--contractEffectiveDateString' + ) as HTMLInputElement + ).value = ( + document.querySelector( + '#workOrderEdit--workOrderOpenDateString' + ) as HTMLInputElement + ).value + + doSearch() + }, + onshown(modalElement) { + bulmaJS.toggleHtmlClipped() + + const deceasedNameElement = modalElement.querySelector( + '#contractSearch--deceasedName' + ) as HTMLInputElement + + deceasedNameElement.addEventListener('change', doSearch) + deceasedNameElement.focus() + ;( + modalElement.querySelector( + '#contractSearch--burialSiteName' + ) as HTMLInputElement + ).addEventListener('change', doSearch) + + searchFormElement.addEventListener('submit', doSearch) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + ;( + document.querySelector('#button--addContract') as HTMLButtonElement + ).focus() + } + }) + }) + + function doAddBurialSite(clickEvent: Event): void { + const rowElement = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + ) as HTMLTableRowElement + + const burialSiteId = rowElement.dataset.burialSiteId ?? '' + + addBurialSite(burialSiteId, (success) => { + if (success) { + rowElement.remove() + } + }) + } + + document + .querySelector('#button--addBurialSite') + ?.addEventListener('click', () => { + let searchFormElement: HTMLFormElement + let searchResultsContainerElement: HTMLElement + + function doSearch(event?: Event): void { + if (event) { + event.preventDefault() + } + + // eslint-disable-next-line no-unsanitized/property + searchResultsContainerElement.innerHTML = + sunrise.getLoadingParagraphHTML('Searching...') + + cityssm.postJSON( + `${sunrise.urlPrefix}/burialSites/doSearchBurialSites`, + searchFormElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as { burialSites: BurialSite[] } + + if (responseJSON.burialSites.length === 0) { + searchResultsContainerElement.innerHTML = `
    +

    There are no records that meet the search criteria.

    +
    ` + + return + } + + searchResultsContainerElement.innerHTML = ` + + + + + + + + +
    Burial SiteCemeteryBurial Site TypeStatus
    ` + + for (const burialSite of responseJSON.burialSites) { + const rowElement = document.createElement('tr') + rowElement.className = 'container--burialSite' + rowElement.dataset.burialSiteId = burialSite.burialSiteId.toString() + + rowElement.innerHTML = ` + + + ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} + + ${cityssm.escapeHTML(burialSite.cemeteryName ?? '')} + + ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')} + + ${cityssm.escapeHTML(burialSite.burialSiteStatus ?? '')} + ` + + rowElement + .querySelector('.button--addBurialSite') + ?.addEventListener('click', doAddBurialSite) + + searchResultsContainerElement + .querySelector('tbody') + ?.append(rowElement) + } + } + ) + } + + cityssm.openHtmlModal('workOrder-addBurialSite', { + onshow(modalElement) { + sunrise.populateAliases(modalElement) + + searchFormElement = modalElement.querySelector( + 'form' + ) as HTMLFormElement + + searchResultsContainerElement = modalElement.querySelector( + '#resultsContainer--burialSiteAdd' + ) as HTMLElement + ;( + modalElement.querySelector( + '#burialSiteSearch--notWorkOrderId' + ) as HTMLInputElement + ).value = workOrderId + + const burialSiteStatusElement = modalElement.querySelector( + '#burialSiteSearch--burialSiteStatusId' + ) as HTMLSelectElement + + for (const burialSiteStatus of exports.burialSiteStatuses as BurialSiteStatus[]) { + const optionElement = document.createElement('option') + optionElement.value = burialSiteStatus.burialSiteStatusId.toString() + optionElement.textContent = burialSiteStatus.burialSiteStatus + burialSiteStatusElement.append(optionElement) + } + + doSearch() + }, + onshown(modalElement) { + bulmaJS.toggleHtmlClipped() + + const burialSiteNameElement = modalElement.querySelector( + '#burialSiteSearch--burialSiteName' + ) as HTMLInputElement + + burialSiteNameElement.addEventListener('change', doSearch) + burialSiteNameElement.focus() + + modalElement + .querySelector('#burialSiteSearch--burialSiteStatusId') + ?.addEventListener('change', doSearch) + + searchFormElement.addEventListener('submit', doSearch) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + ;( + document.querySelector( + '#button--addBurialSite' + ) as HTMLButtonElement + ).focus() + } + }) + }) +})() diff --git a/public/javascripts/workOrder.milestoneCalendar.js b/public/javascripts/workOrder.milestoneCalendar.js index a411242a..b8c92ab5 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.sunrise; + const sunrise = exports.sunrise; const workOrderSearchFiltersFormElement = document.querySelector('#form--searchFilters'); const workOrderMilestoneDateFilterElement = workOrderSearchFiltersFormElement.querySelector('#searchFilter--workOrderMilestoneDateFilter'); const workOrderMilestoneDateStringElement = workOrderSearchFiltersFormElement.querySelector('#searchFilter--workOrderMilestoneDateString'); @@ -46,7 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); data-tooltip="${cityssm.escapeHTML(lot.cemeteryName ?? '')}"> + aria-label="${sunrise.escapedAliases.Lot}"> ${cityssm.escapeHTML(lot.burialSiteName ?? '')} `; @@ -57,7 +57,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); data-tooltip="${cityssm.escapeHTML(occupant.lotOccupantType ?? '')}"> + aria-label="${sunrise.escapedAliases.Occupancy}"> ${cityssm.escapeHTML(occupant.occupantName ?? '')} ${cityssm.escapeHTML(occupant.occupantFamilyName ?? '')} @@ -83,8 +83,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${cityssm.escapeHTML(milestone.workOrderMilestoneDescription ?? '')}
    - - + + ${cityssm.escapeHTML(milestone.workOrderNumber ?? '')}
    ${cityssm.escapeHTML(milestone.workOrderDescription ?? '')} @@ -101,8 +101,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); event.preventDefault(); } // eslint-disable-next-line no-unsanitized/property - milestoneCalendarContainerElement.innerHTML = los.getLoadingParagraphHTML('Loading Milestones...'); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doGetWorkOrderMilestones`, workOrderSearchFiltersFormElement, (responseJSON) => { + milestoneCalendarContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Loading Milestones...'); + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doGetWorkOrderMilestones`, workOrderSearchFiltersFormElement, (responseJSON) => { renderMilestones(responseJSON.workOrderMilestones); }); } @@ -111,7 +111,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); workOrderMilestoneDateStringElement.closest('fieldset').disabled = workOrderMilestoneDateFilterElement.value !== 'date'; getMilestones(); }); - los.initializeDatePickers(workOrderSearchFiltersFormElement); workOrderMilestoneDateStringElement.addEventListener('change', getMilestones); workOrderSearchFiltersFormElement.addEventListener('submit', getMilestones); getMilestones(); diff --git a/public/javascripts/workOrder.milestoneCalendar.ts b/public/javascripts/workOrder.milestoneCalendar.ts index 5d9d1f7c..48bee877 100644 --- a/public/javascripts/workOrder.milestoneCalendar.ts +++ b/public/javascripts/workOrder.milestoneCalendar.ts @@ -3,14 +3,15 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { LOS } from '../../types/globalTypes.js' import type { WorkOrderMilestone } from '../../types/recordTypes.js' +import type { Sunrise } from './types.js' + declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.sunrise as LOS + const sunrise = exports.sunrise as Sunrise const workOrderSearchFiltersFormElement = document.querySelector( '#form--searchFilters' @@ -84,7 +85,7 @@ declare const exports: Record data-tooltip="${cityssm.escapeHTML(lot.cemeteryName ?? '')}"> + aria-label="${sunrise.escapedAliases.Lot}"> ${cityssm.escapeHTML(lot.burialSiteName ?? '')} ` @@ -98,7 +99,7 @@ declare const exports: Record )}"> + aria-label="${sunrise.escapedAliases.Occupancy}"> ${cityssm.escapeHTML(occupant.occupantName ?? '')} ${cityssm.escapeHTML(occupant.occupantFamilyName ?? '')} @@ -131,8 +132,8 @@ declare const exports: Record ${cityssm.escapeHTML(milestone.workOrderMilestoneDescription ?? '')}
    - - + + ${cityssm.escapeHTML(milestone.workOrderNumber ?? '')}
    ${cityssm.escapeHTML(milestone.workOrderDescription ?? '')} @@ -154,12 +155,12 @@ declare const exports: Record } // eslint-disable-next-line no-unsanitized/property - milestoneCalendarContainerElement.innerHTML = los.getLoadingParagraphHTML( + milestoneCalendarContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( 'Loading Milestones...' ) cityssm.postJSON( - `${los.urlPrefix}/workOrders/doGetWorkOrderMilestones`, + `${sunrise.urlPrefix}/workOrders/doGetWorkOrderMilestones`, workOrderSearchFiltersFormElement, (responseJSON) => { renderMilestones( @@ -182,8 +183,6 @@ declare const exports: Record getMilestones() }) - los.initializeDatePickers(workOrderSearchFiltersFormElement) - workOrderMilestoneDateStringElement.addEventListener('change', getMilestones) workOrderSearchFiltersFormElement.addEventListener('submit', getMilestones) diff --git a/public/javascripts/workOrder.outlook.js b/public/javascripts/workOrder.outlook.js index a8b3782a..35133ac3 100644 --- a/public/javascripts/workOrder.outlook.js +++ b/public/javascripts/workOrder.outlook.js @@ -3,12 +3,12 @@ /* eslint-disable unicorn/prefer-module */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.sunrise; + const sunrise = exports.sunrise; const workOrderTypeIdsElement = document.querySelector('#icsFilters--workOrderTypeIds'); const workOrderMilestoneTypeIdsElement = document.querySelector('#icsFilters--workOrderMilestoneTypeIds'); const calendarLinkElement = document.querySelector('#icsFilters--calendarURL'); function updateCalendarURL() { - let url = `${window.location.href.slice(0, Math.max(0, window.location.href.indexOf(window.location.pathname) + 1)) + los.urlPrefix}api/${los.apiKey}/milestoneICS/?`; + let url = `${globalThis.location.href.slice(0, Math.max(0, globalThis.location.href.indexOf(globalThis.location.pathname) + 1)) + sunrise.urlPrefix}api/${sunrise.apiKey}/milestoneICS/?`; if (!workOrderTypeIdsElement.disabled && workOrderTypeIdsElement.selectedOptions.length > 0) { url += 'workOrderTypeIds='; diff --git a/public/javascripts/workOrder.outlook.ts b/public/javascripts/workOrder.outlook.ts index 343b0cf6..44e62c0f 100644 --- a/public/javascripts/workOrder.outlook.ts +++ b/public/javascripts/workOrder.outlook.ts @@ -1,11 +1,11 @@ // eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair /* eslint-disable unicorn/prefer-module */ -import type { LOS } from '../../types/globalTypes.js' +import type { Sunrise } from './types.js' declare const exports: Record ;(() => { - const los = exports.sunrise as LOS + const sunrise = exports.sunrise as Sunrise const workOrderTypeIdsElement = document.querySelector( '#icsFilters--workOrderTypeIds' @@ -21,11 +21,11 @@ declare const exports: Record function updateCalendarURL(): void { let url = `${ - window.location.href.slice( + globalThis.location.href.slice( 0, - Math.max(0, window.location.href.indexOf(window.location.pathname) + 1) - ) + los.urlPrefix - }api/${los.apiKey}/milestoneICS/?` + Math.max(0, globalThis.location.href.indexOf(globalThis.location.pathname) + 1) + ) + sunrise.urlPrefix + }api/${sunrise.apiKey}/milestoneICS/?` if ( !workOrderTypeIdsElement.disabled && diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js index b0c31b96..a7f9d3ad 100644 --- a/public/javascripts/workOrder.search.js +++ b/public/javascripts/workOrder.search.js @@ -1,13 +1,13 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.sunrise; + const sunrise = exports.sunrise; const workOrderPrints = exports.workOrderPrints; const searchFilterFormElement = document.querySelector('#form--searchFilters'); - los.initializeDatePickers(searchFilterFormElement); const searchResultsContainerElement = document.querySelector('#container--searchResults'); const limit = Number.parseInt(document.querySelector('#searchFilter--limit').value, 10); const offsetElement = document.querySelector('#searchFilter--offset'); + // eslint-disable-next-line complexity function renderWorkOrders(rawResponseJSON) { const responseJSON = rawResponseJSON; if (responseJSON.workOrders.length === 0) { @@ -19,38 +19,33 @@ Object.defineProperty(exports, "__esModule", { value: true }); const resultsTbodyElement = document.createElement('tbody'); for (const workOrder of responseJSON.workOrders) { let relatedHTML = ''; - for (const lot of workOrder.workOrderLots ?? []) { + for (const burialSite of workOrder.workOrderBurialSites ?? []) { relatedHTML += `
  • + data-tooltip="${cityssm.escapeHTML(burialSite.cemeteryName ?? '')}"> + aria-label="Burial Site"> - ${cityssm.escapeHTML((lot.burialSiteName ?? '') === '' - ? `(No ${los.escapedAliases.Lot} Name)` - : lot.burialSiteName ?? '')} + ${cityssm.escapeHTML((burialSite.burialSiteName ?? '') === '' + ? `(No Burial Site Name)` + : burialSite.burialSiteName ?? '')}
    • `; } - for (const occupancy of workOrder.workOrderContracts ?? []) { - for (const occupant of occupancy.contractOccupants ?? []) { + for (const contract of workOrder.workOrderContracts ?? []) { + for (const interment of contract.contractInterments ?? []) { relatedHTML += `
  • + data-tooltip="${cityssm.escapeHTML(contract.isPreneed ?? false ? 'Recipient' : 'Deceased')}"> - + - ${cityssm.escapeHTML((occupant.occupantName ?? '') === '' && - (occupant.occupantFamilyName ?? '') === '' - ? '(No Name)' - : `${occupant.occupantName} ${occupant.occupantFamilyName}`)} + ${cityssm.escapeHTML(interment.deceasedName ?? '')}
    • `; } } // eslint-disable-next-line no-unsanitized/method resultsTbodyElement.insertAdjacentHTML('beforeend', ` - + ${workOrder.workOrderNumber?.trim() === '' ? '(No Number)' : cityssm.escapeHTML(workOrder.workOrderNumber ?? '')} @@ -67,19 +62,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
    • + data-tooltip="${sunrise.escapedAliases.WorkOrderOpenDate}"> - + ${workOrder.workOrderOpenDateString}
      • -
    • +
    • - + ${workOrder.workOrderCloseDate ? workOrder.workOrderCloseDateString - : `(No ${los.escapedAliases.WorkOrderCloseDate})`} + : `(No ${sunrise.escapedAliases.WorkOrderCloseDate})`}
    @@ -92,7 +87,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${workOrderPrints.length > 0 ? `     @@ -111,7 +106,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); `; // eslint-disable-next-line no-unsanitized/method - searchResultsContainerElement.insertAdjacentHTML('beforeend', los.getSearchResultsPagerHTML(limit, responseJSON.offset, responseJSON.count)); + searchResultsContainerElement.insertAdjacentHTML('beforeend', sunrise.getSearchResultsPagerHTML(limit, responseJSON.offset, responseJSON.count)); searchResultsContainerElement .querySelector('table') ?.append(resultsTbodyElement); @@ -124,8 +119,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); } function getWorkOrders() { // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = los.getLoadingParagraphHTML('Loading Work Orders...'); - cityssm.postJSON(`${los.urlPrefix}/workOrders/doSearchWorkOrders`, searchFilterFormElement, renderWorkOrders); + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Loading Work Orders...'); + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doSearchWorkOrders`, searchFilterFormElement, renderWorkOrders); } function resetOffsetAndGetWorkOrders() { offsetElement.value = '0'; diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts index 2562bf17..a36aebaf 100644 --- a/public/javascripts/workOrder.search.ts +++ b/public/javascripts/workOrder.search.ts @@ -1,13 +1,14 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { LOS } from '../../types/globalTypes.js' import type { WorkOrder } from '../../types/recordTypes.js' +import type { Sunrise } from './types.js' + declare const cityssm: cityssmGlobal declare const exports: Record ;(() => { - const los = exports.sunrise as LOS + const sunrise = exports.sunrise as Sunrise const workOrderPrints = exports.workOrderPrints as string[] @@ -15,8 +16,6 @@ declare const exports: Record '#form--searchFilters' ) as HTMLFormElement - los.initializeDatePickers(searchFilterFormElement) - const searchResultsContainerElement = document.querySelector( '#container--searchResults' ) as HTMLElement @@ -30,6 +29,7 @@ declare const exports: Record '#searchFilter--offset' ) as HTMLInputElement + // eslint-disable-next-line complexity function renderWorkOrders(rawResponseJSON: unknown): void { const responseJSON = rawResponseJSON as { count: number @@ -50,40 +50,31 @@ declare const exports: Record for (const workOrder of responseJSON.workOrders) { let relatedHTML = '' - for (const lot of workOrder.workOrderLots ?? []) { + for (const burialSite of workOrder.workOrderBurialSites ?? []) { relatedHTML += `
  • + data-tooltip="${cityssm.escapeHTML(burialSite.cemeteryName ?? '')}"> + aria-label="Burial Site"> ${cityssm.escapeHTML( - (lot.burialSiteName ?? '') === '' - ? `(No ${los.escapedAliases.Lot} Name)` - : lot.burialSiteName ?? '' + (burialSite.burialSiteName ?? '') === '' + ? `(No Burial Site Name)` + : burialSite.burialSiteName ?? '' )}
    • ` } - for (const occupancy of workOrder.workOrderContracts ?? []) { - for (const occupant of occupancy.contractOccupants ?? []) { + for (const contract of workOrder.workOrderContracts ?? []) { + for (const interment of contract.contractInterments ?? []) { relatedHTML += `
  • - + - ${cityssm.escapeHTML( - (occupant.occupantName ?? '') === '' && - (occupant.occupantFamilyName ?? '') === '' - ? '(No Name)' - : `${occupant.occupantName} ${occupant.occupantFamilyName}` - )} + ${cityssm.escapeHTML(interment.deceasedName ?? '')}
    • ` } } @@ -93,7 +84,7 @@ declare const exports: Record 'beforeend', `     - + @@ -248,6 +248,34 @@ <%= contractInterment.deceasedPostalCode %> + <% } %> @@ -389,7 +417,7 @@
    - + ${ workOrder.workOrderNumber?.trim() === '' ? '(No Number)' @@ -114,20 +105,20 @@ declare const exports: Record
    • + data-tooltip="${sunrise.escapedAliases.WorkOrderOpenDate}"> - + ${workOrder.workOrderOpenDateString}
      • -
    • +
    • - + ${ workOrder.workOrderCloseDate ? workOrder.workOrderCloseDateString - : `(No ${los.escapedAliases.WorkOrderCloseDate})` + : `(No ${sunrise.escapedAliases.WorkOrderCloseDate})` }
    @@ -146,7 +137,7 @@ declare const exports: Record workOrderPrints.length > 0 ? `    		 @@ -171,7 +162,7 @@ declare const exports: Record // eslint-disable-next-line no-unsanitized/method searchResultsContainerElement.insertAdjacentHTML( 'beforeend', - los.getSearchResultsPagerHTML( + sunrise.getSearchResultsPagerHTML( limit, responseJSON.offset, responseJSON.count @@ -193,12 +184,12 @@ declare const exports: Record function getWorkOrders(): void { // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = los.getLoadingParagraphHTML( + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( 'Loading Work Orders...' ) cityssm.postJSON( - `${los.urlPrefix}/workOrders/doSearchWorkOrders`, + `${sunrise.urlPrefix}/workOrders/doSearchWorkOrders`, searchFilterFormElement, renderWorkOrders ) diff --git a/public/javascripts/workOrder.view.js b/public/javascripts/workOrder.view.js index bc120421..54b75873 100644 --- a/public/javascripts/workOrder.view.js +++ b/public/javascripts/workOrder.view.js @@ -1,37 +1,37 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); (() => { - const los = exports.sunrise; - const reopenWorkOrderButtonElement = document.querySelector('#button--reopenWorkOrder'); - if (reopenWorkOrderButtonElement !== null) { - const workOrderId = reopenWorkOrderButtonElement.dataset.workOrderId ?? ''; - reopenWorkOrderButtonElement.addEventListener('click', () => { - function doReopen() { - cityssm.postJSON(`${los.urlPrefix}/workOrders/doReopenWorkOrder`, { - workOrderId - }, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - globalThis.location.href = los.getWorkOrderURL(workOrderId, true, true); - } - else { - bulmaJS.alert({ - title: 'Error Reopening Work Order', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: 'Reopen Work Order', - message: 'Are you sure you want to remove the close date from this work order and reopen it?', - contextualColorName: 'warning', - okButton: { - text: 'Yes, Reopen Work Order', - callbackFunction: doReopen + const sunrise = exports.sunrise; + document + .querySelector('#button--reopenWorkOrder') + ?.addEventListener('click', (clickEvent) => { + const workOrderId = clickEvent.currentTarget.dataset.workOrderId ?? + ''; + function doReopen() { + cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doReopenWorkOrder`, { + workOrderId + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + globalThis.location.href = sunrise.getWorkOrderURL(workOrderId, true, true); + } + else { + bulmaJS.alert({ + title: 'Error Reopening Work Order', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }); } }); + } + bulmaJS.confirm({ + title: 'Reopen Work Order', + message: 'Are you sure you want to remove the close date from this work order and reopen it?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Reopen Work Order', + callbackFunction: doReopen + } }); - } + }); })(); diff --git a/public/javascripts/workOrder.view.ts b/public/javascripts/workOrder.view.ts index c4e3feba..14c33a27 100644 --- a/public/javascripts/workOrder.view.ts +++ b/public/javascripts/workOrder.view.ts @@ -1,25 +1,25 @@ 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 { Sunrise } from './types.js' declare const cityssm: cityssmGlobal declare const bulmaJS: BulmaJS declare const exports: Record ;(() => { - const los = exports.sunrise as LOS + const sunrise = exports.sunrise as Sunrise - const reopenWorkOrderButtonElement: HTMLButtonElement | null = - document.querySelector('#button--reopenWorkOrder') + document + .querySelector('#button--reopenWorkOrder') + ?.addEventListener('click', (clickEvent) => { + const workOrderId = + (clickEvent.currentTarget as HTMLButtonElement).dataset.workOrderId ?? + '' - if (reopenWorkOrderButtonElement !== null) { - const workOrderId = reopenWorkOrderButtonElement.dataset.workOrderId ?? '' - - reopenWorkOrderButtonElement.addEventListener('click', () => { function doReopen(): void { cityssm.postJSON( - `${los.urlPrefix}/workOrders/doReopenWorkOrder`, + `${sunrise.urlPrefix}/workOrders/doReopenWorkOrder`, { workOrderId }, @@ -30,7 +30,7 @@ declare const exports: Record } if (responseJSON.success) { - globalThis.location.href = los.getWorkOrderURL( + globalThis.location.href = sunrise.getWorkOrderURL( workOrderId, true, true @@ -57,5 +57,4 @@ declare const exports: Record } }) }) - } })() diff --git a/routes/contracts.js b/routes/contracts.js index 44695c34..89a0b512 100644 --- a/routes/contracts.js +++ b/routes/contracts.js @@ -6,12 +6,14 @@ import handler_view from '../handlers/contracts-get/view.js'; import handler_doAddContractComment from '../handlers/contracts-post/doAddContractComment.js'; import handler_doAddContractFee from '../handlers/contracts-post/doAddContractFee.js'; import handler_doAddContractFeeCategory from '../handlers/contracts-post/doAddContractFeeCategory.js'; +import handler_doAddContractInterment from '../handlers/contracts-post/doAddContractInterment.js'; import handler_doAddContractTransaction from '../handlers/contracts-post/doAddContractTransaction.js'; import handler_doCopyContract from '../handlers/contracts-post/doCopyContract.js'; import handler_doCreateContract from '../handlers/contracts-post/doCreateContract.js'; import handler_doDeleteContract from '../handlers/contracts-post/doDeleteContract.js'; import handler_doDeleteContractComment from '../handlers/contracts-post/doDeleteContractComment.js'; import handler_doDeleteContractFee from '../handlers/contracts-post/doDeleteContractFee.js'; +import handler_doDeleteContractInterment from '../handlers/contracts-post/doDeleteContractInterment.js'; import handler_doDeleteContractTransaction from '../handlers/contracts-post/doDeleteContractTransaction.js'; import handler_doGetContractTypeFields from '../handlers/contracts-post/doGetContractTypeFields.js'; import handler_doGetDynamicsGPDocument from '../handlers/contracts-post/doGetDynamicsGPDocument.js'; @@ -20,6 +22,7 @@ import handler_doSearchContracts from '../handlers/contracts-post/doSearchContra import handler_doUpdateContract from '../handlers/contracts-post/doUpdateContract.js'; import handler_doUpdateContractComment from '../handlers/contracts-post/doUpdateContractComment.js'; import handler_doUpdateContractFeeQuantity from '../handlers/contracts-post/doUpdateContractFeeQuantity.js'; +import handler_doUpdateContractInterment from '../handlers/contracts-post/doUpdateContractInterment.js'; import handler_doUpdateContractTransaction from '../handlers/contracts-post/doUpdateContractTransaction.js'; import { updateGetHandler, updatePostHandler } from '../handlers/permissions.js'; import { getConfigProperty } from '../helpers/config.helpers.js'; @@ -38,6 +41,10 @@ router.get('/:contractId/edit', updateGetHandler, handler_edit); router.post('/doUpdateContract', updatePostHandler, handler_doUpdateContract); router.post('/doCopyContract', updatePostHandler, handler_doCopyContract); router.post('/doDeleteContract', updatePostHandler, handler_doDeleteContract); +// Interments +router.post('/doAddContractInterment', updatePostHandler, handler_doAddContractInterment); +router.post('/doUpdateContractInterment', updatePostHandler, handler_doUpdateContractInterment); +router.post('/doDeleteContractInterment', updatePostHandler, handler_doDeleteContractInterment); // Comments router.post('/doAddContractComment', updatePostHandler, handler_doAddContractComment); router.post('/doUpdateContractComment', updatePostHandler, handler_doUpdateContractComment); diff --git a/routes/contracts.ts b/routes/contracts.ts index b8e0fb7c..4944f19c 100644 --- a/routes/contracts.ts +++ b/routes/contracts.ts @@ -7,12 +7,14 @@ import handler_view from '../handlers/contracts-get/view.js' import handler_doAddContractComment from '../handlers/contracts-post/doAddContractComment.js' import handler_doAddContractFee from '../handlers/contracts-post/doAddContractFee.js' import handler_doAddContractFeeCategory from '../handlers/contracts-post/doAddContractFeeCategory.js' +import handler_doAddContractInterment from '../handlers/contracts-post/doAddContractInterment.js' import handler_doAddContractTransaction from '../handlers/contracts-post/doAddContractTransaction.js' import handler_doCopyContract from '../handlers/contracts-post/doCopyContract.js' import handler_doCreateContract from '../handlers/contracts-post/doCreateContract.js' import handler_doDeleteContract from '../handlers/contracts-post/doDeleteContract.js' import handler_doDeleteContractComment from '../handlers/contracts-post/doDeleteContractComment.js' import handler_doDeleteContractFee from '../handlers/contracts-post/doDeleteContractFee.js' +import handler_doDeleteContractInterment from '../handlers/contracts-post/doDeleteContractInterment.js' import handler_doDeleteContractTransaction from '../handlers/contracts-post/doDeleteContractTransaction.js' import handler_doGetContractTypeFields from '../handlers/contracts-post/doGetContractTypeFields.js' import handler_doGetDynamicsGPDocument from '../handlers/contracts-post/doGetDynamicsGPDocument.js' @@ -21,6 +23,7 @@ import handler_doSearchContracts from '../handlers/contracts-post/doSearchContra import handler_doUpdateContract from '../handlers/contracts-post/doUpdateContract.js' import handler_doUpdateContractComment from '../handlers/contracts-post/doUpdateContractComment.js' import handler_doUpdateContractFeeQuantity from '../handlers/contracts-post/doUpdateContractFeeQuantity.js' +import handler_doUpdateContractInterment from '../handlers/contracts-post/doUpdateContractInterment.js' import handler_doUpdateContractTransaction from '../handlers/contracts-post/doUpdateContractTransaction.js' import { updateGetHandler, updatePostHandler } from '../handlers/permissions.js' import { getConfigProperty } from '../helpers/config.helpers.js' @@ -31,10 +34,7 @@ export const router = Router() router.get('/', handler_search) -router.post( - '/doSearchContracts', - handler_doSearchContracts -) +router.post('/doSearchContracts', handler_doSearchContracts) // Create @@ -46,11 +46,7 @@ router.post( handler_doGetContractTypeFields ) -router.post( - '/doCreateContract', - updatePostHandler, - handler_doCreateContract -) +router.post('/doCreateContract', updatePostHandler, handler_doCreateContract) // View @@ -58,28 +54,32 @@ router.get('/:contractId', handler_view) // Edit -router.get( - '/:contractId/edit', - updateGetHandler, - handler_edit +router.get('/:contractId/edit', updateGetHandler, handler_edit) + +router.post('/doUpdateContract', updatePostHandler, handler_doUpdateContract) + +router.post('/doCopyContract', updatePostHandler, handler_doCopyContract) + +router.post('/doDeleteContract', updatePostHandler, handler_doDeleteContract) + +// Interments + +router.post( + '/doAddContractInterment', + updatePostHandler, + handler_doAddContractInterment ) router.post( - '/doUpdateContract', + '/doUpdateContractInterment', updatePostHandler, - handler_doUpdateContract + handler_doUpdateContractInterment ) router.post( - '/doCopyContract', + '/doDeleteContractInterment', updatePostHandler, - handler_doCopyContract -) - -router.post( - '/doDeleteContract', - updatePostHandler, - handler_doDeleteContract + handler_doDeleteContractInterment ) // Comments @@ -104,17 +104,9 @@ router.post( // Fees -router.post( - '/doGetFees', - updatePostHandler, - handler_doGetFees -) +router.post('/doGetFees', updatePostHandler, handler_doGetFees) -router.post( - '/doAddContractFee', - updatePostHandler, - handler_doAddContractFee -) +router.post('/doAddContractFee', updatePostHandler, handler_doAddContractFee) router.post( '/doAddContractFeeCategory', diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index 2b25172f..905788fb 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -481,7 +481,7 @@ async function importFromPrepaidCSV() { const possibleLotOccupancies = await getContracts({ burialSiteId: lot.burialSiteId, contractTypeId: importIds.preneedContractType.contractTypeId, - occupantName: prepaidRow.CMPP_PREPAID_FOR_NAME, + deceasedName: prepaidRow.CMPP_PREPAID_FOR_NAME, contractStartDateString }, { includeOccupants: false, diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index 6edb51fb..bc4ad9bc 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -902,7 +902,7 @@ async function importFromPrepaidCSV(): Promise { { burialSiteId: lot.burialSiteId, contractTypeId: importIds.preneedContractType.contractTypeId, - occupantName: prepaidRow.CMPP_PREPAID_FOR_NAME, + deceasedName: prepaidRow.CMPP_PREPAID_FOR_NAME, contractStartDateString }, { diff --git a/test/functions.js b/test/functions.js index 804cec3b..53c7be34 100644 --- a/test/functions.js +++ b/test/functions.js @@ -146,42 +146,42 @@ describe('functions.sqlFilters', () => { }); describe('OccupancyTime filter', () => { it('creates three different filters', () => { - const currentFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('current'); + const currentFilter = sqlFilterFunctions.getContractTimeWhereClause('current'); assert.notStrictEqual(currentFilter.sqlWhereClause, ''); - const pastFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('past'); + const pastFilter = sqlFilterFunctions.getContractTimeWhereClause('past'); assert.notStrictEqual(pastFilter.sqlWhereClause, ''); - const futureFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('future'); + const futureFilter = sqlFilterFunctions.getContractTimeWhereClause('future'); assert.notStrictEqual(futureFilter, ''); assert.notStrictEqual(currentFilter.sqlWhereClause, pastFilter.sqlWhereClause); assert.notStrictEqual(currentFilter.sqlWhereClause, futureFilter.sqlWhereClause); assert.notStrictEqual(pastFilter.sqlWhereClause, futureFilter.sqlWhereClause); }); it('handles empty filter', () => { - const filter = sqlFilterFunctions.getOccupancyTimeWhereClause(''); + const filter = sqlFilterFunctions.getContractTimeWhereClause(''); assert.strictEqual(filter.sqlWhereClause, ''); assert.strictEqual(filter.sqlParameters.length, 0); }); it('handles undefined filter', () => { - const filter = sqlFilterFunctions.getOccupancyTimeWhereClause(undefined, 'o'); + const filter = sqlFilterFunctions.getContractTimeWhereClause(undefined, 'o'); assert.strictEqual(filter.sqlWhereClause, ''); assert.strictEqual(filter.sqlParameters.length, 0); }); }); describe('OccupantName filter', () => { it('returns filter', () => { - const filter = sqlFilterFunctions.getOccupantNameWhereClause('TEST1 TEST2', 'o'); + const filter = sqlFilterFunctions.getDeceasedNameWhereClause('TEST1 TEST2', 'o'); assert.strictEqual(filter.sqlWhereClause, ' and (instr(lower(o.occupantName), ?) or instr(lower(o.occupantFamilyName), ?)) and (instr(lower(o.occupantName), ?) or instr(lower(o.occupantFamilyName), ?))'); assert.ok(filter.sqlParameters.length === 4); assert.ok(filter.sqlParameters.includes('test1')); assert.ok(filter.sqlParameters.includes('test2')); }); it('handles empty filter', () => { - const filter = sqlFilterFunctions.getOccupantNameWhereClause(''); + const filter = sqlFilterFunctions.getDeceasedNameWhereClause(''); assert.strictEqual(filter.sqlWhereClause, ''); assert.strictEqual(filter.sqlParameters.length, 0); }); it('handles undefined filter', () => { - const filter = sqlFilterFunctions.getOccupantNameWhereClause(undefined, 'o'); + const filter = sqlFilterFunctions.getDeceasedNameWhereClause(undefined, 'o'); assert.strictEqual(filter.sqlWhereClause, ''); assert.strictEqual(filter.sqlParameters.length, 0); }); diff --git a/test/functions.ts b/test/functions.ts index 4a35460a..dc9ee167 100644 --- a/test/functions.ts +++ b/test/functions.ts @@ -242,14 +242,14 @@ describe('functions.sqlFilters', () => { describe('OccupancyTime filter', () => { it('creates three different filters', () => { const currentFilter = - sqlFilterFunctions.getOccupancyTimeWhereClause('current') + sqlFilterFunctions.getContractTimeWhereClause('current') assert.notStrictEqual(currentFilter.sqlWhereClause, '') - const pastFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('past') + const pastFilter = sqlFilterFunctions.getContractTimeWhereClause('past') assert.notStrictEqual(pastFilter.sqlWhereClause, '') const futureFilter = - sqlFilterFunctions.getOccupancyTimeWhereClause('future') + sqlFilterFunctions.getContractTimeWhereClause('future') assert.notStrictEqual(futureFilter, '') assert.notStrictEqual( @@ -267,13 +267,13 @@ describe('functions.sqlFilters', () => { }) it('handles empty filter', () => { - const filter = sqlFilterFunctions.getOccupancyTimeWhereClause('') + const filter = sqlFilterFunctions.getContractTimeWhereClause('') assert.strictEqual(filter.sqlWhereClause, '') assert.strictEqual(filter.sqlParameters.length, 0) }) it('handles undefined filter', () => { - const filter = sqlFilterFunctions.getOccupancyTimeWhereClause( + const filter = sqlFilterFunctions.getContractTimeWhereClause( undefined, 'o' ) @@ -284,7 +284,7 @@ describe('functions.sqlFilters', () => { describe('OccupantName filter', () => { it('returns filter', () => { - const filter = sqlFilterFunctions.getOccupantNameWhereClause( + const filter = sqlFilterFunctions.getDeceasedNameWhereClause( 'TEST1 TEST2', 'o' ) @@ -301,14 +301,14 @@ describe('functions.sqlFilters', () => { }) it('handles empty filter', () => { - const filter = sqlFilterFunctions.getOccupantNameWhereClause('') + const filter = sqlFilterFunctions.getDeceasedNameWhereClause('') assert.strictEqual(filter.sqlWhereClause, '') assert.strictEqual(filter.sqlParameters.length, 0) }) it('handles undefined filter', () => { - const filter = sqlFilterFunctions.getOccupantNameWhereClause( + const filter = sqlFilterFunctions.getDeceasedNameWhereClause( undefined, 'o' ) diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts index 3d93dedd..8a54aa08 100644 --- a/types/recordTypes.d.ts +++ b/types/recordTypes.d.ts @@ -244,6 +244,11 @@ export interface Contract extends Record { funeralHomeId?: number; funeralHomeName?: string; funeralDirectorName?: string; + funeralHomeAddress1?: string; + funeralHomeAddress2?: string; + funeralHomeCity?: string; + funeralHomeProvince?: string; + funeralHomePostalCode?: string; funeralDate?: number; funeralDateString?: string; funeralTime?: number; diff --git a/types/recordTypes.ts b/types/recordTypes.ts index 48ad1e72..8275db12 100644 --- a/types/recordTypes.ts +++ b/types/recordTypes.ts @@ -315,6 +315,11 @@ export interface Contract extends Record { funeralHomeId?: number funeralHomeName?: string funeralDirectorName?: string + funeralHomeAddress1?: string + funeralHomeAddress2?: string + funeralHomeCity?: string + funeralHomeProvince?: string + funeralHomePostalCode?: string funeralDate?: number funeralDateString?: string diff --git a/views/_footerA.ejs b/views/_footerA.ejs index 44c821ac..88da9a0d 100644 --- a/views/_footerA.ejs +++ b/views/_footerA.ejs @@ -22,7 +22,6 @@ - - + <%- include('_footerB'); -%> diff --git a/views/contract-edit.ejs b/views/contract-edit.ejs index 13a0b32f..834addd8 100644 --- a/views/contract-edit.ejs +++ b/views/contract-edit.ejs @@ -841,6 +841,7 @@ exports.provinceDefault = "<%= configFunctions.getConfigProperty('settings.provinceDefault') %>"; exports.contractInterments = <%- JSON.stringify(contract.contractInterments) %>; + exports.intermentContainerTypes = <%- JSON.stringify(intermentContainerTypes) %>; exports.contractComments = <%- JSON.stringify(contract.contractComments) %>; exports.contractFees = <%- JSON.stringify(contract.contractFees) %>; exports.contractTransactions = <%- JSON.stringify(contract.contractTransactions) %>; @@ -850,5 +851,11 @@ +<% if (!isCreate) { %> + + + + +<% } %> <%- include('_footerB'); -%> diff --git a/views/contract-view.ejs b/views/contract-view.ejs index 3a74b6e2..eef1b476 100644 --- a/views/contract-view.ejs +++ b/views/contract-view.ejs @@ -39,7 +39,7 @@ <% if (contractTypePrints.length > 0) { %> <% if (contractTypePrints.length === 1) { %>
    - + Print @@ -226,7 +226,7 @@
    <%= (contract.isPreneed ? "Recipient" : "Deceased") %>AddressDetails
    +
    +
    + Birth: +
    +
    + <%= contractInterment.birthDateString ?? '(No Birth Date)' %>
    + <%= contractInterment.birthPlace ?? '(No Birth Place)' %> +
    +
    +
    +
    + Death: +
    +
    + <%= contractInterment.deathDateString ?? '(No Death Date)' %>
    + <%= contractInterment.deathPlace ?? '(No Death Place)' %> +
    +
    +
    +
    + Container: +
    +
    + <%= contractInterment.intermentContainerType ?? '(No Container Type)' %> +
    +
    +
    <% } %>
    -
    +
    @@ -460,10 +488,10 @@ <%= contractComment.recordCreate_userName %> - <%= contractComment.contractCommentDateString %> - <%= (contractComment.contractCommentTime === 0 ? "" : contractComment.contractCommentTimePeriodString) %> + <%= contractComment.commentDateString %> + <%= (contractComment.commentTime === 0 ? "" : contractComment.commentTimePeriodString) %> - <%= contractComment.contractComment %> + <%= contractComment.comment %> <% } %> diff --git a/views/print/pdf/ssm.cemetery.burialPermit.ejs b/views/print/pdf/ssm.cemetery.burialPermit.ejs index d88c44b4..0b37bb76 100644 --- a/views/print/pdf/ssm.cemetery.burialPermit.ejs +++ b/views/print/pdf/ssm.cemetery.burialPermit.ejs @@ -1,13 +1,5 @@ -<% - const funeralDirectorLotOccupantType = "Funeral Director"; - const funeralDirectorOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, funeralDirectorLotOccupantType); +<% const deceased = contract.contractInterments[0]; %> - const deceasedLotOccupantType = "Deceased"; - const deceasedOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, deceasedLotOccupantType); - - const deathDateOccupantTypeField = "Death Date"; - const deathPlaceOccupantTypeField = "Death Place"; -%> <%= headTitle %> @@ -21,21 +13,18 @@

    Burial Permit

    - Under the Vital Statistics Act - and the regulations, - subject to the limitations thereof, - this permit is granted to:
    + Under the Vital Statistics Act + and the regulations, + subject to the limitations thereof, + this permit is granted to:

    - <% if (funeralDirectorOccupants.length > 0) { %> - <% const funeralDirector = funeralDirectorOccupants[0]; %> - <%= funeralDirector.occupantName %> <%= funeralDirector.occupantFamilyName %>
    - <%= funeralDirector.occupantAddress1 %>
    - <% if (funeralDirector.occupantAddress2) { %><%= funeralDirector.occupantAddress2 %>
    <% } %> - <%= funeralDirector.occupantCity %>, <%= funeralDirector.occupantProvince %>
    - <%= funeralDirector.occupantPostalCode %> - <% } %> + <%= contract.funeralHomeName %>
    + <%= contract.funeralHomeAddress1 %>
    + <% if (contract.funeralHomeAddress2) { %><%= contract.funeralHomeAddress2 %>
    <% } %> + <%= contract.funeralHomeCity %>, <%= contract.funeralHomeProvince %>
    + <%= contract.funeralHomePostalCode %>

    @@ -43,26 +32,25 @@

    - <% if (deceasedOccupants.length > 0) { %> - <% const deceased = deceasedOccupants[0]; %> - <%= deceased.occupantName %> <%= deceased.occupantFamilyName %> + <% if (!contract.isPreneed && deceased !== undefined) { %> + <%= deceased.deceasedName %> <% } %>

    - who died at - -   - <%= contractFunctions.getFieldValueByContractTypeField(contract, deathPlaceOccupantTypeField); %> -   - - in Ontario on - -   - <%= contractFunctions.getFieldValueByContractTypeField(contract, deathDateOccupantTypeField); %> -   - - . + who died at + +   + <%= deceased?.deathPlace ?? '' %> +   + + in Ontario on + +   + <%= deceased?.deathDateString %> +   + + .

    diff --git a/views/print/pdf/ssm.cemetery.contract.ejs b/views/print/pdf/ssm.cemetery.contract.ejs index 9c02ea99..0c415c0a 100644 --- a/views/print/pdf/ssm.cemetery.contract.ejs +++ b/views/print/pdf/ssm.cemetery.contract.ejs @@ -1,30 +1,3 @@ -<% - const purchaserLotOccupantTypes = ["Purchaser", "Preneed Owner"]; - - let purchaserOccupants = []; - for (const purchaserLotOccupantType of purchaserLotOccupantTypes) { - purchaserOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, purchaserLotOccupantType); - if (purchaserOccupants.length > 0) { - break; - } - } - - const purchaser = purchaserOccupants.length > 0 ? purchaserOccupants[0] : undefined; - - const recipientLotOccupantTypes = ["Deceased", "Preneed Owner", "Purchaser"]; - - let recipientOccupants = []; - for (const recipientLotOccupantType of recipientLotOccupantTypes) { - recipientOccupants = contractFunctions.filterOccupantsByLotOccupantType(contract, recipientLotOccupantType); - if (recipientOccupants.length > 0) { - break; - } - } - - const recipient = recipientOccupants.length > 0 ? recipientOccupants[0] : undefined; - - const recipientFields = ["Birth Date", "Birth Place"] -%> <%= headTitle %> @@ -98,7 +71,7 @@

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

    @@ -111,77 +84,59 @@ - + - + - + - + - + - + - +
    Name: - <%= purchaser ? purchaser.occupantName + ' ' + purchaser.occupantFamilyName : "" %> + <%= contract.purchaserName %>
    Address:<%= purchaser ? purchaser.occupantAddress1 : "" %> <%= contract.purchaserAddress1 %> 
    <%= purchaser ? purchaser.occupantAddress2 : "" %> <%= contract.purchaserAddress2 %> 
    City:<%= purchaser ? purchaser.occupantCity : "" %> <%= contract.purchaserCity %> 
    Province:<%= purchaser ? purchaser.occupantProvince : "" %> <%= contract.purchaserProvince %> 
    Postal Code:<%= purchaser ? purchaser.occupantPostalCode : "" %> <%= contract.purchaserPostalCode %> 
    Telephone:<%= purchaser ? purchaser.occupantPhoneNumber : "" %> <%= contract.purchaserPhoneNumber %> 
    E-mail:<%= purchaser ? purchaser.occupantEmailAddress : "" %> <%= contract.purchaserEmail %> 

    Recipient

    + <% + const recipient = contract.contractInterments[0] + %> - + - + - + - + - - - - - - - + - <% - for (const fieldName of recipientFields) { - %> - - - <% - const field = contract.contractFields.find((possibleField) => { - return possibleField.contractTypeField === fieldName; - }); - %> - - - <% - } - %>
    Name: - <%= recipient ? recipient.occupantName + ' ' + recipient.occupantFamilyName : "" %> + <%= recipient ? recipient.deceasedName : "" %>
    Address:<%= recipient ? recipient.occupantAddress1 : "" %> <%= recipient ? recipient.deceasedAddress1 : "" %> 
    <%= recipient ? recipient.occupantAddress2 : "" %> <%= recipient ? recipient.deceasedAddress2 : "" %> 
    City:<%= recipient ? recipient.occupantCity : "" %> <%= recipient ? recipient.deceasedCity : "" %> 
    Province:<%= recipient ? recipient.occupantProvince : "" %> <%= recipient ? recipient.deceasedProvince : "" %> 
    Postal Code:<%= recipient ? recipient.occupantPostalCode : "" %> 
    Telephone:<%= recipient ? recipient.occupantPhoneNumber : "" %> 
    E-mail:<%= recipient ? recipient.occupantEmailAddress : "" %> <%= recipient ? recipient.deceasedPostalCode : "" %> 
    <%= fieldName %>:<%= field?.contractFieldValue ?? "" %> 
    @@ -191,7 +146,7 @@

    Purchaser's relationship to Recipient: - <%= purchaser ? (purchaser.occupantComment ?? '') : '' %> + <%= contract.purchaserRelationship %>  

    diff --git a/views/print/pdf/workOrder.ejs b/views/print/pdf/workOrder.ejs index be4b4059..bd1f6cbb 100644 --- a/views/print/pdf/workOrder.ejs +++ b/views/print/pdf/workOrder.ejs @@ -8,7 +8,7 @@ <%- include('_workOrder-header.ejs'); %> - <% if (workOrder.workOrderLots.length > 0) { %> + <% if (workOrder.workOrderBurialSites.length > 0) { %>

    Burial Sites

    @@ -21,43 +21,41 @@ - <% for (const lot of workOrder.workOrderLots) { %> + <% for (const burialSite of workOrder.workOrderBurialSites) { %> - - - - + + + + <% } %>
    <%= lot.burialSiteName %><%= lot.cemeteryName %><%= lot.lotType %><%= lot.lotStatus %><%= burialSite.burialSiteName %><%= burialSite.cemeteryName %><%= burialSite.burialSiteType %><%= burialSite.burialSiteStatus %>
    <% } %> - <% if (workOrder.workOrderLotOccupancies.length > 0) { %> -

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

    + <% if (workOrder.workOrderContracts.length > 0) { %> +

    Contracts

    - + - + - <% for (const occupancy of workOrder.workOrderLotOccupancies) { %> + <% for (const contract of workOrder.workOrderContracts) { %> - - - - + + + + diff --git a/views/workOrder-edit.ejs b/views/workOrder-edit.ejs index 65f89122..3b361fe8 100644 --- a/views/workOrder-edit.ejs +++ b/views/workOrder-edit.ejs @@ -131,160 +131,160 @@
    - -
    -
    -
    -
    - -
    -
    - " id="workOrderEdit--workOrderNumber" name="workOrderNumber" type="text" value="<%= workOrder.workOrderNumber %>" maxlength="50" readonly accesskey="f" <%= (isCreate ? "" : " required") %> /> -
    -
    - -
    -
    - <% if (isCreate) { %> -

    Leave work order number blank to autopopulate.

    - <% } %> -
    -
    -
    - -
    -
    - -
    -
    -
    -
    + +
    +
    +
    +
    + +
    +
    + />
    -
    - -
    - -
    -
    -
    -
    -
    - -
    - <% - const currentDateString = dateTimeFunctions.dateToString(new Date()); - %> - - - - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    +
    +
    +
    + <% if (isCreate) { %> +

    Leave work order number blank to autopopulate.

    + <% } %>
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + <% + const currentDateString = dateTimeFunctions.dateToString(new Date()); + %> + + + + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    <% if (!isCreate) { %>
    -

    Related Burial Sites

    -
    - <% - const tabToSelect = (workOrder.workOrderLotOccupancies.length > 0 || workOrder.workOrderLots.length === 0 ? "lotOccupancies" : "lots"); - %> -
    - -
    -
    -
    " id="relatedTab--lotOccupancies"> -
    - -
    -
    -
    -
    " id="relatedTab--lots"> -
    - -
    -
    -
    -
    +

    Related Burial Sites

    +
    + <% + const tabToSelect = (workOrder.workOrderContracts.length > 0 || workOrder.workOrderBurialSites.length === 0 ? "contracts" : "burialSites"); + %> +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    <% } %> <% if (!isCreate) { %>
    -
    -
    -
    -
    -

    - Comments -

    -
    -
    -
    -
    - -
    -
    +
    +
    +
    +
    +

    + Comments +

    +
    +
    +
    + +
    +
    -
    +
    +
    <% } %>
    @@ -292,42 +292,42 @@
    -
    -
    -
    -

    Milestones

    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - - - Download iCalendar - - - - Export as CSV - -
    -
    -
    -
    -
    +
    +
    +
    +

    Milestones

    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + + + Download iCalendar + + + + Export as CSV + +
    +
    +
    +
    +
    +
    @@ -340,14 +340,18 @@ <% if (!isCreate) { %> <% } %> - + +<% if (!isCreate) { %> + + +<% } %> <%- include('_footerB'); -%> \ No newline at end of file diff --git a/views/workOrder-search.ejs b/views/workOrder-search.ejs index 83d4cbec..38f96a53 100644 --- a/views/workOrder-search.ejs +++ b/views/workOrder-search.ejs @@ -1,128 +1,127 @@ <%- include('_header'); -%>
    -
    - <%- include('_menu-workOrders'); -%> -
    -
    - - -

    - Work Order Search -

    - - <% if (user.userProperties.canUpdate) { %> -
    - - - Create a New Work Order +
    + <%- include('_menu-workOrders'); -%> +
    +
    +
    - <% } %> + + + -
    -
    - - +

    + Work Order Search +

    -
    -
    -
    - -
    -
    - -
    - - - -
    + <% if (user.userProperties.canUpdate) { %> +
    + + + Create a New Work Order + +
    + <% } %> + +
    + + + + +
    +
    +
    + +
    +
    +
    -
    -
    -
    - -
    -
    - -
    - - - -
    -
    - -
    -
    -
    - -
    - - - - -
    -
    + + +
    -
    -
    -
    - -
    - - - - -
    -
    -
    -
    -
    - -
    - - - - -
    -
    +
    +
    +
    + +
    +
    +
    + + + +
    - -
    - -
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    +
    <%- include('_footerA'); -%> - + <%- include('_footerB'); -%> \ No newline at end of file diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs index cff7bc09..c5db0b11 100644 --- a/views/workOrder-view.ejs +++ b/views/workOrder-view.ejs @@ -127,51 +127,48 @@

    Related Burial Sites

    <% - const tabToSelect = (workOrder.workOrderLotOccupancies.length > 0 || workOrder.workOrderLots.length === 0 ? "lotOccupancies" : "lots"); + const tabToSelect = (workOrder.workOrderContracts.length > 0 || workOrder.workOrderBurialSites.length === 0 ? "contracts" : "burialSites"); %>
    -
    " id="relatedTab--lotOccupancies"> - <% if (workOrder.workOrderLotOccupancies.length === 0) { %> +
    " id="relatedTab--contracts"> + <% if (workOrder.workOrderContracts.length === 0) { %>

    - There are no - <%= configFunctions.getConfigProperty("aliases.lot").toLowerCase() %> - <%= configFunctions.getConfigProperty("aliases.occupancy").toLowerCase() %> - records associated with this work order. + There are no contracts associated with this work order.

    <% } else { %> <% const currentDate = dateTimeFunctions.dateToInteger(new Date()); %>
    Contract Type Burial Site<%= configFunctions.getConfigProperty("aliases.occupancyStartDate") %>Contract Date End Date<%= configFunctions.getConfigProperty("aliases.occupants") %>Interments
    <%= occupancy.contractType %><%= occupancy.burialSiteName %><%= occupancy.occupancyStartDateString %><%= occupancy.occupancyStartEndString %><%= contract.contractType %><%= contract.burialSiteName %><%= contract.contractStartDateString %><%= contract.contractEndDateString %> - <% for (const occupant of occupancy.contractOccupants) { %> - <%= occupant.lotOccupantType %>: - <%= occupant.occupantName %> - <%= occupant.occupantFamilyName %> + <% for (const interment of contract.contractInterments) { %> + <%= interment.deceasedName %>
    <% } %>
    - - - - - - - - + + + + + + + + - <% for (const contract of workOrder.workOrderLotOccupancies) { %> - <% const isActive = !(contract.occupancyEndDate && contract.occupancyEndDate < currentDate); %> + <% for (const contract of workOrder.workOrderContracts) { %> + <% const isActive = !(contract.contractEndDate && contract.contractEndDate < currentDate); %> - +
    Contract TypeBurial Site<%= configFunctions.getConfigProperty("aliases.occupancyStartDate") %>End Date<%= configFunctions.getConfigProperty("aliases.occupants") %>
    Contract TypeBurial SiteContract DateEnd DateInterments
    <% if (isActive) { %> @@ -182,7 +179,7 @@ + href="<%= urlPrefix %>/contracts/<%= contract.contractId %>"> <%= contract.contractType %>
    @@ -196,28 +193,24 @@ (No Burial Site) <% } %>     		<%= contract.occupancyStartDateString %><%= contract.contractStartDateString %> - <% if (contract.occupancyEndDate) { %> - <%= contract.occupancyEndDateString %> + <% if (contract.contractEndDate) { %> + <%= contract.contractEndDateString %> <% } else { %> (No End Date) <% } %> - <% if (contract.contractOccupants.length === 0) { %> - ( - No <%= configFunctions.getConfigProperty("aliases.occupants") %>) + <% if (contract.contractInterments.length === 0) { %> + + (No Interments) <% } else { %>
      - <% for (const occupant of contract.contractOccupants) { %> -
    • - - - - <%= occupant.occupantName %> - <%= occupant.occupantFamilyName %> + <% for (const interment of contract.contractInterments) { %> +
    • + <%= interment.deceasedName %>
      • <% } %>
    @@ -229,71 +222,71 @@
    <% } %>
    -
    " id="relatedTab--lots"> - <% if (workOrder.workOrderLots.length === 0) { %> -
    -

    - There are no - <%= configFunctions.getConfigProperty("aliases.lots").toLowerCase() %> - records associated with this work order. -

    -
    - <% } else { %> - - - - - - - - - - - <% for (const lot of workOrder.workOrderLots) { %> - - - - - - - <% } %> - -
    Burial SiteCemeteryBurial Site TypeStatus
    - <%= lot.burialSiteName %> - <%= lot.cemeteryName %><%= lot.lotType %><%= lot.lotStatus %>
    - <% } %> +
    " id="relatedTab--burialSites"> + <% if (workOrder.workOrderBurialSites.length === 0) { %> +
    +

    + There are no burial sites associated with this work order. +

    +
    + <% } else { %> + + + + + + + + + + + <% for (const burialSite of workOrder.workOrderBurialSites) { %> + + + + + + + <% } %> + +
    Burial SiteCemeteryBurial Site TypeStatus
    + + <%= burialSite.burialSiteName %> + + <%= burialSite.cemeteryName %><%= burialSite.burialSiteType %><%= burialSite.burialSiteStatus %>
    + <% } %>
    <% if (workOrder.workOrderComments.length > 0) { %> -
    -

    Work Order Comments

    -
    - - - - - - - - - - <% for (const workOrderComment of workOrder.workOrderComments) { %> - - - - - - <% } %> - -
    CommentorComment DateComment
    <%= workOrderComment.recordCreate_userName %> - <%= workOrderComment.workOrderCommentDateString %> - <%= (workOrderComment.workOrderCommentTime === 0 ? "" : workOrderComment.workOrderCommentTimePeriodString) %> - <%= workOrderComment.workOrderComment %>
    -
    +
    +

    Work Order Comments

    +
    + + + + + + + + + + <% for (const workOrderComment of workOrder.workOrderComments) { %> + + + + + + <% } %> + +
    CommentorComment DateComment
    <%= workOrderComment.recordCreate_userName %> + <%= workOrderComment.commentDateString %> + <%= (workOrderComment.commentTime === 0 ? "" : workOrderComment.commentTimePeriodString) %> + <%= workOrderComment.comment %>
    +
    <% } %>
    <% if (workOrder.workOrderMilestones.length > 0) { %> @@ -335,19 +328,19 @@
    - <% if (milestone.workOrderMilestoneCompletionDate) { %> - - - - <% } else { %> - - - - <% } %> + <% if (milestone.workOrderMilestoneCompletionDate) { %> + + + + <% } else { %> + + + + <% } %>
    <% if (milestone.workOrderMilestoneTypeId) { %> - <%= milestone.workOrderMilestoneType %>
    + <%= milestone.workOrderMilestoneType %>
    <% } %> <% if (milestone.workOrderMilestoneDate === 0) { %> (No Set Date) @@ -370,6 +363,6 @@ <%- include('_footerA'); -%> - + <%- include('_footerB'); -%> \ No newline at end of file