From b2da12dac1d82025e9ee7081e9e4b58a79b913f5 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 31 Mar 2025 14:59:31 -0400 Subject: [PATCH] linting --- .ncurc.json | 3 + README.md | 9 + .../admin-post/doAddBurialSiteStatus.d.ts | 2 +- handlers/admin-post/doAddBurialSiteStatus.js | 4 +- handlers/admin-post/doAddBurialSiteStatus.ts | 7 +- handlers/admin-post/doAddBurialSiteType.d.ts | 2 +- handlers/admin-post/doAddBurialSiteType.ts | 3 +- .../admin-post/doAddBurialSiteTypeField.ts | 1 + handlers/admin-post/doAddContractType.js | 4 +- handlers/admin-post/doAddContractType.ts | 5 +- public/javascripts/contract.editInterments.js | 10 +- public/javascripts/contract.editInterments.ts | 12 +- public/javascripts/main.js | 16 +- public/javascripts/main.ts | 43 +- public/javascripts/types.d.ts | 14 +- public/javascripts/types.ts | 28 +- public/javascripts/workOrder.edit.js | 2 +- public/javascripts/workOrder.edit.ts | 3 +- public/javascripts/workOrder.editComments.js | 2 +- public/javascripts/workOrder.editComments.ts | 2 +- public/javascripts/workOrder.editRelated.js | 25 +- public/javascripts/workOrder.editRelated.ts | 33 +- temp/legacyImportFromCsv/index.js | 3 +- temp/legacyImportFromCsv/index.ts | 6 +- views/_header.ejs | 132 +-- views/admin-burialSiteTypes.ejs | 68 +- views/admin-contractTypes.ejs | 132 +-- views/admin-tables.ejs | 168 ++-- views/burialSite-edit.ejs | 30 +- views/burialSite-search.ejs | 52 +- views/burialSite-view.ejs | 15 +- views/cemetery-edit.ejs | 331 ++++--- views/cemetery-view.ejs | 30 +- views/dashboard.ejs | 8 +- views/funeralHome-edit.ejs | 95 +- views/print/pdf/ssm.cemetery.burialPermit.ejs | 122 +-- views/print/pdf/ssm.cemetery.contract.ejs | 858 +++++++++--------- views/print/pdf/workOrder-commentLog.ejs | 85 +- views/print/pdf/workOrder.ejs | 82 +- views/workOrder-edit.ejs | 401 ++++---- views/workOrder-search.ejs | 132 +-- 41 files changed, 1574 insertions(+), 1406 deletions(-) create mode 100644 .ncurc.json diff --git a/.ncurc.json b/.ncurc.json new file mode 100644 index 00000000..94ae07e1 --- /dev/null +++ b/.ncurc.json @@ -0,0 +1,3 @@ +{ + "reject": ["puppeteer"] +} diff --git a/README.md b/README.md index b3429d0f..724c089e 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,15 @@ Sunrise CMS does not need an expensive server to run. No separate database server is required either. The whole application could run on a current, modest workstation. +### ✔️ Track Unlimited Cemeteries and Burial Sites + +There are no limits to the number of records that can be tracked in Sunrise CMS. + +### ✔️ Includes a Built-In Work Order System + +In addition to tracking data related to cemetery plots, +Sunrise CMS can also track work order activities, like grave maintenance. + ### ✔️ Sunrise CMS is Free and Open Source There's no cost to use it. diff --git a/handlers/admin-post/doAddBurialSiteStatus.d.ts b/handlers/admin-post/doAddBurialSiteStatus.d.ts index c7c5d6a5..b0911c26 100644 --- a/handlers/admin-post/doAddBurialSiteStatus.d.ts +++ b/handlers/admin-post/doAddBurialSiteStatus.d.ts @@ -1,5 +1,5 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddBurialSiteStatus.js b/handlers/admin-post/doAddBurialSiteStatus.js index dc6a0b45..f3519bcf 100644 --- a/handlers/admin-post/doAddBurialSiteStatus.js +++ b/handlers/admin-post/doAddBurialSiteStatus.js @@ -5,7 +5,7 @@ export default async function handler(request, response) { const burialSiteStatuses = await getBurialSiteStatuses(); response.json({ success: true, - burialSiteStatusId, - burialSiteStatuses + burialSiteStatuses, + burialSiteStatusId }); } diff --git a/handlers/admin-post/doAddBurialSiteStatus.ts b/handlers/admin-post/doAddBurialSiteStatus.ts index ab0fb337..be478bfb 100644 --- a/handlers/admin-post/doAddBurialSiteStatus.ts +++ b/handlers/admin-post/doAddBurialSiteStatus.ts @@ -7,7 +7,7 @@ export default async function handler( request: Request< unknown, unknown, - { burialSiteStatus: string; orderNumber?: string | number } + { burialSiteStatus: string; orderNumber?: number | string } >, response: Response ): Promise { @@ -22,7 +22,8 @@ export default async function handler( response.json({ success: true, - burialSiteStatusId, - burialSiteStatuses + + burialSiteStatuses, + burialSiteStatusId }) } diff --git a/handlers/admin-post/doAddBurialSiteType.d.ts b/handlers/admin-post/doAddBurialSiteType.d.ts index 26f38122..b56ace0d 100644 --- a/handlers/admin-post/doAddBurialSiteType.d.ts +++ b/handlers/admin-post/doAddBurialSiteType.d.ts @@ -1,5 +1,5 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/admin-post/doAddBurialSiteType.ts b/handlers/admin-post/doAddBurialSiteType.ts index d27e60bf..a5573132 100644 --- a/handlers/admin-post/doAddBurialSiteType.ts +++ b/handlers/admin-post/doAddBurialSiteType.ts @@ -7,7 +7,7 @@ export default async function handler( request: Request< unknown, unknown, - { burialSiteType: string; orderNumber?: string | number } + { burialSiteType: string; orderNumber?: number | string } >, response: Response ): Promise { @@ -22,6 +22,7 @@ export default async function handler( response.json({ success: true, + burialSiteTypeId, burialSiteTypes }) diff --git a/handlers/admin-post/doAddBurialSiteTypeField.ts b/handlers/admin-post/doAddBurialSiteTypeField.ts index 62a0dc5b..11f0f9e9 100644 --- a/handlers/admin-post/doAddBurialSiteTypeField.ts +++ b/handlers/admin-post/doAddBurialSiteTypeField.ts @@ -18,6 +18,7 @@ export default async function handler( response.json({ success: true, + burialSiteTypeFieldId, burialSiteTypes }) diff --git a/handlers/admin-post/doAddContractType.js b/handlers/admin-post/doAddContractType.js index 20e32e03..758e448d 100644 --- a/handlers/admin-post/doAddContractType.js +++ b/handlers/admin-post/doAddContractType.js @@ -6,8 +6,8 @@ export default async function handler(request, response) { const allContractTypeFields = await getAllContractTypeFields(); response.json({ success: true, + allContractTypeFields, contractTypeId, - contractTypes, - allContractTypeFields + contractTypes }); } diff --git a/handlers/admin-post/doAddContractType.ts b/handlers/admin-post/doAddContractType.ts index f18aa4b7..4d167f17 100644 --- a/handlers/admin-post/doAddContractType.ts +++ b/handlers/admin-post/doAddContractType.ts @@ -22,8 +22,9 @@ export default async function handler( response.json({ success: true, + + allContractTypeFields, contractTypeId, - contractTypes, - allContractTypeFields + contractTypes }) } diff --git a/public/javascripts/contract.editInterments.js b/public/javascripts/contract.editInterments.js index c6626623..9dc5246c 100644 --- a/public/javascripts/contract.editInterments.js +++ b/public/javascripts/contract.editInterments.js @@ -192,11 +192,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); Birth:
- ${cityssm.escapeHTML(interment.birthDateString ?? '(No Birth Date)')}
+ ${cityssm.escapeHTML((interment.birthDateString ?? '') === '' + ? '(No Birth Date)' + : interment.birthDateString ?? '')}
${cityssm.escapeHTML(interment.birthPlace ?? '(No Birth Place)')}
-
+
Death:
@@ -205,12 +207,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${cityssm.escapeHTML(interment.deathPlace ?? '(No Death Place)')}
-
+
Age:
- ${cityssm.escapeHTML((interment.deathAge ?? '') === '' ? '(No Age)' : interment.deathAge?.toString() ?? '')}
+ ${cityssm.escapeHTML((interment.deathAge ?? '') === '' ? '(No Age)' : interment.deathAge?.toString() ?? '')} ${cityssm.escapeHTML(interment.deathAgePeriod ?? '')}
diff --git a/public/javascripts/contract.editInterments.ts b/public/javascripts/contract.editInterments.ts index c92ea4b1..8cb36d5e 100644 --- a/public/javascripts/contract.editInterments.ts +++ b/public/javascripts/contract.editInterments.ts @@ -291,11 +291,15 @@ declare const exports: Record Birth:
- ${cityssm.escapeHTML(interment.birthDateString ?? '(No Birth Date)')}
+ ${cityssm.escapeHTML( + (interment.birthDateString ?? '') === '' + ? '(No Birth Date)' + : interment.birthDateString ?? '' + )}
${cityssm.escapeHTML(interment.birthPlace ?? '(No Birth Place)')}
-
+
Death:
@@ -304,12 +308,12 @@ declare const exports: Record ${cityssm.escapeHTML(interment.deathPlace ?? '(No Death Place)')}
-
+
Age:
- ${cityssm.escapeHTML((interment.deathAge ?? '') === '' ? '(No Age)' : interment.deathAge?.toString() ?? '')}
+ ${cityssm.escapeHTML((interment.deathAge ?? '') === '' ? '(No Age)' : interment.deathAge?.toString() ?? '')} ${cityssm.escapeHTML(interment.deathAgePeriod ?? '')}
diff --git a/public/javascripts/main.js b/public/javascripts/main.js index 73fb9577..892a5516 100644 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -103,10 +103,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); actualSeedString += 'a1'; } return exports.randomColor({ - seed: actualSeedString + actualSeedString, hue: hues[actualSeedString.codePointAt(actualSeedString.length - 1) % hues.length], - luminosity: luminosity[actualSeedString.codePointAt(actualSeedString.length - 2) % luminosity.length] + luminosity: luminosity[actualSeedString.codePointAt(actualSeedString.length - 2) % luminosity.length], + seed: actualSeedString + actualSeedString }); } /* @@ -202,24 +202,24 @@ Object.defineProperty(exports, "__esModule", { value: true }); * Declare sunrise */ const sunrise = { - urlPrefix, apiKey: document.querySelector('main')?.dataset.apiKey ?? '', dynamicsGPIntegrationIsEnabled, + urlPrefix, highlightMap, initializeUnlockFieldButtons, - populateAliases, escapedAliases, + populateAliases, getRandomColor, - setUnsavedChanges, clearUnsavedChanges, hasUnsavedChanges, - getMoveUpDownButtonFieldHTML, + setUnsavedChanges, getLoadingParagraphHTML, + getMoveUpDownButtonFieldHTML, getSearchResultsPagerHTML, - getCemeteryURL, getBurialSiteURL, - getFuneralHomeURL, + getCemeteryURL, getContractURL, + getFuneralHomeURL, getWorkOrderURL }; exports.sunrise = sunrise; diff --git a/public/javascripts/main.ts b/public/javascripts/main.ts index 2df83153..7901fb02 100644 --- a/public/javascripts/main.ts +++ b/public/javascripts/main.ts @@ -3,26 +3,26 @@ import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { Sunrise } from './types.js' type RandomColorHue = - | 'red' - | 'orange' - | 'yellow' - | 'green' | 'blue' - | 'purple' - | 'pink' + | 'green' | 'monochrome' -type RandomColorLuminosity = 'bright' | 'light' | 'dark' + | 'orange' + | 'pink' + | 'purple' + | 'red' + | 'yellow' +type RandomColorLuminosity = 'bright' | 'dark' | 'light' declare const cityssm: cityssmGlobal declare const exports: Record & { aliases: Record randomColor: (options?: { + alpha?: number + count?: number + format?: 'hex' | 'hsl' | 'hsla' | 'hslArray' | 'rgb' | 'rgba' | 'rgbArray' hue?: RandomColorHue luminosity?: RandomColorLuminosity - count?: number seed?: number | string - format?: 'rgb' | 'rgba' | 'rgbArray' | 'hsl' | 'hsla' | 'hslArray' | 'hex' - alpha?: number }) => string } ;(() => { @@ -55,7 +55,7 @@ declare const exports: Record & { function highlightMap( mapContainerElement: HTMLElement, mapKey: string, - contextualClass: 'success' | 'danger' + contextualClass: 'danger' | 'success' ): void { // Search for ID let svgId = mapKey @@ -175,7 +175,6 @@ declare const exports: Record & { } return exports.randomColor({ - seed: actualSeedString + actualSeedString, hue: hues[ (actualSeedString.codePointAt(actualSeedString.length - 1) as number) % hues.length @@ -185,7 +184,8 @@ declare const exports: Record & { (actualSeedString.codePointAt( actualSeedString.length - 2 ) as number) % luminosity.length - ] + ], + seed: actualSeedString + actualSeedString }) } @@ -271,10 +271,10 @@ declare const exports: Record & { function getRecordURL( recordTypePlural: - | 'cemeteries' | 'burialSites' - | 'funeralHomes' + | 'cemeteries' | 'contracts' + | 'funeralHomes' | 'workOrders', recordId: number | string, edit: boolean, @@ -342,29 +342,30 @@ declare const exports: Record & { */ const sunrise: Sunrise = { - urlPrefix, apiKey: document.querySelector('main')?.dataset.apiKey ?? '', dynamicsGPIntegrationIsEnabled, + urlPrefix, + highlightMap, initializeUnlockFieldButtons, - populateAliases, escapedAliases, + populateAliases, getRandomColor, - setUnsavedChanges, clearUnsavedChanges, hasUnsavedChanges, + setUnsavedChanges, - getMoveUpDownButtonFieldHTML, getLoadingParagraphHTML, + getMoveUpDownButtonFieldHTML, getSearchResultsPagerHTML, - getCemeteryURL, getBurialSiteURL, - getFuneralHomeURL, + getCemeteryURL, getContractURL, + getFuneralHomeURL, getWorkOrderURL } diff --git a/public/javascripts/types.d.ts b/public/javascripts/types.d.ts index ca74cbbc..71d535d6 100644 --- a/public/javascripts/types.d.ts +++ b/public/javascripts/types.d.ts @@ -1,28 +1,28 @@ export interface Sunrise { urlPrefix: string; apiKey: string; - highlightMap: (mapContainerElement: HTMLElement, mapKey: string, contextualClass: 'success' | 'danger') => void; + highlightMap: (mapContainerElement: HTMLElement, mapKey: string, contextualClass: 'danger' | 'success') => void; initializeUnlockFieldButtons: (containerElement: HTMLElement) => void; populateAliases: (containerElement: HTMLElement) => void; escapedAliases: { ExternalReceiptNumber: string; externalReceiptNumber: string; - WorkOrderOpenDate: string; - workOrderOpenDate: string; WorkOrderCloseDate: string; workOrderCloseDate: string; + WorkOrderOpenDate: string; + workOrderOpenDate: string; }; dynamicsGPIntegrationIsEnabled: boolean; getRandomColor: (seedString: string) => string; - setUnsavedChanges: () => void; clearUnsavedChanges: () => void; hasUnsavedChanges: () => boolean; - getMoveUpDownButtonFieldHTML: (upButtonClassNames: string, downButtonClassNames: string, isSmall?: boolean) => string; + setUnsavedChanges: () => void; getLoadingParagraphHTML: (captionText?: string) => string; + getMoveUpDownButtonFieldHTML: (upButtonClassNames: string, downButtonClassNames: string, isSmall?: boolean) => string; getSearchResultsPagerHTML: (limit: number, offset: number, count: number) => string; - getFuneralHomeURL: (funeralHomeId?: number | string, edit?: boolean, time?: boolean) => string; - getCemeteryURL: (cemeteryId?: number | string, edit?: boolean, time?: boolean) => string; getBurialSiteURL: (burialSiteId?: number | string, edit?: boolean, time?: boolean) => string; + getCemeteryURL: (cemeteryId?: number | string, edit?: boolean, time?: boolean) => string; getContractURL: (contractId?: number | string, edit?: boolean, time?: boolean) => string; + getFuneralHomeURL: (funeralHomeId?: number | string, edit?: boolean, time?: boolean) => string; getWorkOrderURL: (workOrderId?: number | string, edit?: boolean, time?: boolean) => string; } diff --git a/public/javascripts/types.ts b/public/javascripts/types.ts index b34048bc..c3b83e0c 100644 --- a/public/javascripts/types.ts +++ b/public/javascripts/types.ts @@ -5,7 +5,7 @@ export interface Sunrise { highlightMap: ( mapContainerElement: HTMLElement, mapKey: string, - contextualClass: 'success' | 'danger' + contextualClass: 'danger' | 'success' ) => void initializeUnlockFieldButtons: (containerElement: HTMLElement) => void @@ -15,40 +15,52 @@ export interface Sunrise { escapedAliases: { ExternalReceiptNumber: string externalReceiptNumber: string - WorkOrderOpenDate: string - workOrderOpenDate: string WorkOrderCloseDate: string workOrderCloseDate: string + WorkOrderOpenDate: string + workOrderOpenDate: string } dynamicsGPIntegrationIsEnabled: boolean getRandomColor: (seedString: string) => string - setUnsavedChanges: () => void clearUnsavedChanges: () => void hasUnsavedChanges: () => boolean + setUnsavedChanges: () => void + getLoadingParagraphHTML: (captionText?: string) => string getMoveUpDownButtonFieldHTML: ( upButtonClassNames: string, downButtonClassNames: string, isSmall?: boolean ) => string - getLoadingParagraphHTML: (captionText?: string) => string getSearchResultsPagerHTML: ( limit: number, offset: number, count: number ) => string - getFuneralHomeURL: (funeralHomeId?: number | string, edit?: boolean, time?: boolean) => string - getCemeteryURL: (cemeteryId?: number | string, edit?: boolean, time?: boolean) => string - getBurialSiteURL: (burialSiteId?: number | string, edit?: boolean, time?: boolean) => string + getBurialSiteURL: ( + burialSiteId?: number | string, + edit?: boolean, + time?: boolean + ) => string + getCemeteryURL: ( + cemeteryId?: number | string, + edit?: boolean, + time?: boolean + ) => string getContractURL: ( contractId?: number | string, edit?: boolean, time?: boolean ) => string + getFuneralHomeURL: ( + funeralHomeId?: number | string, + edit?: boolean, + time?: boolean + ) => string getWorkOrderURL: ( workOrderId?: number | string, edit?: boolean, diff --git a/public/javascripts/workOrder.edit.js b/public/javascripts/workOrder.edit.js index c50a711d..6aaa32c3 100644 --- a/public/javascripts/workOrder.edit.js +++ b/public/javascripts/workOrder.edit.js @@ -382,7 +382,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/public/javascripts/workOrder.edit.ts b/public/javascripts/workOrder.edit.ts index 2f282742..141a539a 100644 --- a/public/javascripts/workOrder.edit.ts +++ b/public/javascripts/workOrder.edit.ts @@ -559,6 +559,7 @@ declare const exports: Record conflictingMilestonePanelElement ) }, + onremoved() { bulmaJS.toggleHtmlClipped() } @@ -622,7 +623,7 @@ declare const exports: Record
diff --git a/public/javascripts/workOrder.editComments.js b/public/javascripts/workOrder.editComments.js index 29b4db15..e6081682 100644 --- a/public/javascripts/workOrder.editComments.js +++ b/public/javascripts/workOrder.editComments.js @@ -127,7 +127,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); Edit
`; diff --git a/public/javascripts/workOrder.editComments.ts b/public/javascripts/workOrder.editComments.ts index fa5d88a3..bf3f5c39 100644 --- a/public/javascripts/workOrder.editComments.ts +++ b/public/javascripts/workOrder.editComments.ts @@ -211,7 +211,7 @@ declare const exports: Record Edit
` diff --git a/public/javascripts/workOrder.editRelated.js b/public/javascripts/workOrder.editRelated.js index d3c393e1..d0b88714 100644 --- a/public/javascripts/workOrder.editRelated.js +++ b/public/javascripts/workOrder.editRelated.js @@ -171,7 +171,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); : `
    ${intermentsHTML}
`} `); rowElement @@ -317,12 +317,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${burialSite.burialSiteStatusId ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '') : '(No Status)'} - + `; rowElement @@ -350,13 +350,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); } document .querySelector('#button--addContract') - ?.addEventListener('click', () => { + ?.addEventListener('click', (addClickEvent) => { + addClickEvent.preventDefault(); let searchFormElement; let searchResultsContainerElement; function doSearch(event) { - if (event) { - event.preventDefault(); - } + event?.preventDefault(); // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Searching...'); @@ -459,13 +458,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); } document .querySelector('#button--addBurialSite') - ?.addEventListener('click', () => { + ?.addEventListener('click', (addClickEvent) => { + addClickEvent.preventDefault(); let searchFormElement; let searchResultsContainerElement; function doSearch(event) { - if (event) { - event.preventDefault(); - } + event?.preventDefault(); // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Searching...'); @@ -490,7 +488,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); for (const burialSite of responseJSON.burialSites) { const rowElement = document.createElement('tr'); rowElement.className = 'container--burialSite'; - rowElement.dataset.burialSiteId = burialSite.burialSiteId.toString(); + rowElement.dataset.burialSiteId = + burialSite.burialSiteId.toString(); rowElement.innerHTML = ` ` ) @@ -502,12 +502,12 @@ declare const exports: Record ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '') : '(No Status)' } - + ` @@ -546,14 +546,14 @@ declare const exports: Record document .querySelector('#button--addContract') - ?.addEventListener('click', () => { + ?.addEventListener('click', (addClickEvent) => { + addClickEvent.preventDefault() + let searchFormElement: HTMLFormElement let searchResultsContainerElement: HTMLElement function doSearch(event?: Event): void { - if (event) { - event.preventDefault() - } + event?.preventDefault() // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = @@ -703,6 +703,7 @@ declare const exports: Record searchFormElement.addEventListener('submit', doSearch) }, + onremoved() { bulmaJS.toggleHtmlClipped() ;( @@ -728,14 +729,14 @@ declare const exports: Record document .querySelector('#button--addBurialSite') - ?.addEventListener('click', () => { + ?.addEventListener('click', (addClickEvent) => { + addClickEvent.preventDefault() + let searchFormElement: HTMLFormElement let searchResultsContainerElement: HTMLElement function doSearch(event?: Event): void { - if (event) { - event.preventDefault() - } + event?.preventDefault() // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = @@ -745,7 +746,9 @@ declare const exports: Record `${sunrise.urlPrefix}/burialSites/doSearchBurialSites`, searchFormElement, (rawResponseJSON) => { - const responseJSON = rawResponseJSON as { burialSites: BurialSite[] } + const responseJSON = rawResponseJSON as { + burialSites: BurialSite[] + } if (responseJSON.burialSites.length === 0) { searchResultsContainerElement.innerHTML = `
@@ -769,7 +772,8 @@ declare const exports: Record for (const burialSite of responseJSON.burialSites) { const rowElement = document.createElement('tr') rowElement.className = 'container--burialSite' - rowElement.dataset.burialSiteId = burialSite.burialSiteId.toString() + rowElement.dataset.burialSiteId = + burialSite.burialSiteId.toString() rowElement.innerHTML = `
-
-
- - - - - Work Orders - +
+
+ + + + + Work Orders + - - - + + + + + Contracts + + +
+ + More + + - Contracts - -
- - More +
+ - + + Funeral Homes + + + + + + Burial Sites + + + + + + Cemeteries + +
+ + + + + Reports + +
+ + + + + Help -
- - - - - Funeral Homes - - - - - - Burial Sites - - - - - - Cemeteries - -
- - - - - Reports - -
- - - - - Help - -
- -
- - - - - Log Out <%=user.userName %> - -
+ +
+ + + + + Log Out <%=user.userName %> + +
+
diff --git a/views/admin-burialSiteTypes.ejs b/views/admin-burialSiteTypes.ejs index c2d71bd3..f17eee9b 100644 --- a/views/admin-burialSiteTypes.ejs +++ b/views/admin-burialSiteTypes.ejs @@ -1,43 +1,43 @@ <%- include('_header'); -%>
-
- <%- include('_menu-admin'); -%> -
-
- - -
-
-

+
+ <%- include('_menu-admin'); -%> +
+
+

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

+ Burial Site Type Management +

+
+
+
- -
+ +
+
<%- include('_footerA'); -%> diff --git a/views/admin-contractTypes.ejs b/views/admin-contractTypes.ejs index 66d64e05..b324cdf2 100644 --- a/views/admin-contractTypes.ejs +++ b/views/admin-contractTypes.ejs @@ -5,79 +5,79 @@ <%- include('_menu-admin'); -%>
- - -
-
-

+

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

+ Contract Type Management +

- -
- +
+
-
-
-
-
- diff --git a/views/admin-tables.ejs b/views/admin-tables.ejs index f0be9f5b..14b8960f 100644 --- a/views/admin-tables.ejs +++ b/views/admin-tables.ejs @@ -50,94 +50,94 @@
-

Work Order Types

- - - - - - - - - - - - - -
Work Order TypeOptions
-
-
-
- -
-
- -
-
-
-
+

Work Order Types

+ + + + + + + + + + + + + +
Work Order TypeOptions
+
+
+
+ +
+
+ +
+
+
+
diff --git a/views/burialSite-edit.ejs b/views/burialSite-edit.ejs index 1646575c..0660a2ad 100644 --- a/views/burialSite-edit.ejs +++ b/views/burialSite-edit.ejs @@ -338,7 +338,20 @@
-

Geographic Location

+
+
+
+
+

Geographic Location

+
+
+
+
+ +
+
+
+
@@ -363,7 +376,20 @@
-

Image

+
+
+
+
+

Image

+
+
+
+
+ +
+
+
+
-
+
- -
+ +
- <% for (const cemetery of cemeteries) { %> <% } %> - +
- + +
-
-
-
+
+
- -
-
- -
- - - + +
+
+
+ + + +
-
+
diff --git a/views/burialSite-view.ejs b/views/burialSite-view.ejs index 84cd2dbd..21e6ee44 100644 --- a/views/burialSite-view.ejs +++ b/views/burialSite-view.ejs @@ -101,7 +101,20 @@
-

Image

+
+
+
+
+

Image

+
+
+
+
+ +
+
+
+
<% if (burialSite.burialSiteImage) { %>
diff --git a/views/cemetery-edit.ejs b/views/cemetery-edit.ejs index 10802c50..a55adbc2 100644 --- a/views/cemetery-edit.ejs +++ b/views/cemetery-edit.ejs @@ -125,63 +125,89 @@
-

Address

-
-
- -
- -
+
+
+
+
+

Address

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

Geographic Location

+
+
+
+
+

Geographic Location

+
+
+
+
+ +
+
+
+
@@ -206,7 +232,20 @@
-

Image

+
+
+
+
+

Image

+
+
+
+
+ +
+
+
+
@@ -232,107 +271,107 @@ <% if (!isCreate) { %> <% const burialSiteSearchUrl = urlPrefix + "/burialSites?cemeteryId=" + cemetery.cemeteryId; %>
-
-
-
-
-

- Burial Site Summaries - - <%= cemetery.burialSiteCount %> - -

-
-
-
-
- - - Create a Burial Site - -
-
- - - Export All +
+
+
+
+

+ Burial Site Summaries + + <%= cemetery.burialSiteCount %> -

+ +
+
+
+
+ + + Create a Burial Site + +
+
+ + + Export All +
-
- <% if (cemetery.burialSiteCount === 0) { %> -
-

- There are no burial sites - associated with this cemetery. -

-
- <% } else { %> -
-
- - - - - - - - - - <% for (const burialSiteType of burialSiteTypeSummary) { %> - - - - - - <% } %> - -
Type - Burial Site Count - Percentage
- - <%= burialSiteType.burialSiteType %> - - - <%= burialSiteType.burialSiteCount %> - - <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% -
-
-
- - - - - - - - - - <% for (const burialSiteStatus of burialSiteStatusSummary) { %> - - - - - - <% } %> - -
Status - Burial Site Count - Percentage
- - <%= burialSiteStatus.burialSiteStatus %> - - - <%= burialSiteStatus.burialSiteCount %> - - <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% -
-
-
- <% } %> -
+
+
+ <% if (cemetery.burialSiteCount === 0) { %> +
+

+ There are no burial sites + associated with this cemetery. +

+
+ <% } else { %> +
+
+ + + + + + + + + + <% for (const burialSiteType of burialSiteTypeSummary) { %> + + + + + + <% } %> + +
Type + Burial Site Count + Percentage
+ + <%= burialSiteType.burialSiteType %> + + + <%= burialSiteType.burialSiteCount %> + + <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% +
+
+
+ + + + + + + + + + <% for (const burialSiteStatus of burialSiteStatusSummary) { %> + + + + + + <% } %> + +
Status + Burial Site Count + Percentage
+ + <%= burialSiteStatus.burialSiteStatus %> + + + <%= burialSiteStatus.burialSiteCount %> + + <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% +
+
+
+ <% } %> +
<% } %> diff --git a/views/cemetery-view.ejs b/views/cemetery-view.ejs index 4fb18104..5028fdbe 100644 --- a/views/cemetery-view.ejs +++ b/views/cemetery-view.ejs @@ -96,7 +96,20 @@
-

Geographic Location

+
+
+
+
+

Geographic Location

+
+
+
+
+ +
+
+
+
<% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %>
@@ -112,7 +125,20 @@
-

Image

+
+
+
+
+

Image

+
+
+
+
+ +
+
+
+
<% if (cemetery.cemeterySvg) { %> <% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %> diff --git a/views/dashboard.ejs b/views/dashboard.ejs index 2bdfb8ae..e9cf08aa 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -43,7 +43,7 @@ <% if (workOrderPrints.length > 0) { %> - + <% } %> @@ -228,8 +228,8 @@
-
-
+
+
@@ -246,7 +246,7 @@
-
+
diff --git a/views/funeralHome-edit.ejs b/views/funeralHome-edit.ejs index b38b77af..b8467107 100644 --- a/views/funeralHome-edit.ejs +++ b/views/funeralHome-edit.ejs @@ -83,76 +83,75 @@
-
- + -
-
-
-
+
+
+
+
+
+ +
+ /> +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
- +
- /> +
+
+
- +
- +
+
+
+
+
+
- +
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
+
+
+
+ +
+
+
+
<%- include('_footerA'); -%> diff --git a/views/print/pdf/ssm.cemetery.burialPermit.ejs b/views/print/pdf/ssm.cemetery.burialPermit.ejs index 24b01bc6..5932b416 100644 --- a/views/print/pdf/ssm.cemetery.burialPermit.ejs +++ b/views/print/pdf/ssm.cemetery.burialPermit.ejs @@ -1,74 +1,74 @@ <% const deceased = contract.contractInterments[0]; %> - - <%= headTitle %> - - - -

Province of Ontario

-

Vital Statistics Act

-

Burial Permit

+ + <%= headTitle %> + + + +

Province of Ontario

+

Vital Statistics Act

+

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:
+

-

- <%= contract.funeralHomeName %>
- <%= contract.funeralHomeAddress1 %>
- <% if (contract.funeralHomeAddress2) { %><%= contract.funeralHomeAddress2 %>
<% } %> - <%= contract.funeralHomeCity %>, <%= contract.funeralHomeProvince %>
- <%= contract.funeralHomePostalCode %> -

+

+ <%= contract.funeralHomeName %>
+ <%= contract.funeralHomeAddress1 %>
+ <% if (contract.funeralHomeAddress2) { %><%= contract.funeralHomeAddress2 %>
<% } %> + <%= contract.funeralHomeCity %>, <%= contract.funeralHomeProvince %>
+ <%= contract.funeralHomePostalCode %> +

-

- for the purpose of the burial or other disposition of the body of: -

+

+ for the purpose of the burial or other disposition of the body of: +

-

- <% if (!contract.isPreneed && deceased !== undefined) { %> - <%= deceased.deceasedName %> - <% } %> -

+

+ <% if (!contract.isPreneed && deceased !== undefined) { %> + <%= deceased.deceasedName %> + <% } %> +

-

- who died at - -   - <%= deceased?.deathPlace ?? '' %> -   - - in Ontario on - -   - <%= deceased?.deathDateString %> -   - - . -

- -

-  
- (Signature of Division Registrar) -

- -

- Sault Ste. Marie +

+ who died at +   + <%= deceased?.deathPlace ?? '' %>   + + in Ontario on +   - 5724 -

+ <%= deceased?.deathDateString %> +   + + . +

-

-  
- (Year Month Day) -

- +

+  
+ (Signature of Division Registrar) +

+ +

+ Sault Ste. Marie +   +   +   + 5724 +

+ +

+  
+ (Year Month Day) +

+ \ No newline at end of file diff --git a/views/print/pdf/ssm.cemetery.contract.ejs b/views/print/pdf/ssm.cemetery.contract.ejs index 551c2635..f07710a9 100644 --- a/views/print/pdf/ssm.cemetery.contract.ejs +++ b/views/print/pdf/ssm.cemetery.contract.ejs @@ -2,463 +2,463 @@ <%= headTitle %> -

- Contract for the Purchase of Interment Rights or
- Cemetery Services -

-

- in - - <%= contract.cemeteryName %> - - cemetery
- operated by
- The Corporation of the City of Sault Ste. Marie, 99 Foster Drive
- Sault Ste. Marie Ontario   P6A 5X6 -

-

- Contract No. - - <%= contract.contractId %> - -

-

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

- - +

+ Contract for the Purchase of Interment Rights or
+ Cemetery Services +

+

+ in + + <%= contract.cemeteryName %> + + cemetery
+ operated by
+ The Corporation of the City of Sault Ste. Marie, 99 Foster Drive
+ Sault Ste. Marie Ontario   P6A 5X6 +

+

+ Contract No. + + <%= contract.contractId %> + +

+

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

+
+ + + + + + +
+

Purchaser

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name: + <%= contract.purchaserName %> +
Address:<%= contract.purchaserAddress1 %> 
<%= contract.purchaserAddress2 %> 
City:<%= contract.purchaserCity %> 
Province:<%= contract.purchaserProvince %> 
Postal Code:<%= contract.purchaserPostalCode %> 
Telephone:<%= contract.purchaserPhoneNumber %> 
E-mail:<%= contract.purchaserEmail %> 
+ 		+

Recipient

+ <% + const recipient = contract.contractInterments[0] + %> + + + + + + + + + + + + + + + + + + + + + +
Name: + <%= recipient ? recipient.deceasedName : "" %> +
Address:<%= recipient ? recipient.deceasedAddress1 : "" %> 
<%= recipient ? recipient.deceasedAddress2 : "" %> 
City:<%= recipient ? recipient.deceasedCity : "" %> 
Province:<%= recipient ? recipient.deceasedProvince : "" %> 
Postal Code:<%= recipient ? recipient.deceasedPostalCode : "" %> 
+
+

+ Purchaser's relationship to Recipient: + + <%= contract.purchaserRelationship %> +   + +

+

+ This Contract for Purchase of Interment Rights or Cemetery Services + is between the Purchaser and The Corporation of the City of Sault Ste. Marie (Corporation) + concerning interment rights or cemetery services for the Recipient(s) + as identified in this Contract. +

+

+ The Purchaser (if different than the Recipient) + represents being legally authorized or charged with the responsibility for + the Recipient's interment rights and prepaid cemetery services + specified in this Contract. This Contract will be enforceable to + the benefit of and be binding upon the parties hereto + and their respective heirs, executors, administrators, successors, and assigns. +

+ + + + + + <% currentFeeCategory = fee.feeCategory; %> + <% } %> + + + <% if (fee.quantity !== 1) { %> + + <% } %> + + + <% + feeAmountTotal += fee.feeAmount * fee.quantity; + taxAmountTotal += fee.taxAmount * fee.quantity; + %> + <% } %> + + + + + + + + + + + + + + +
+

Details

+ - - + + - -
-

Purchaser

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name: - <%= contract.purchaserName %> -
Address:<%= contract.purchaserAddress1 %> 
<%= contract.purchaserAddress2 %> 
City:<%= contract.purchaserCity %> 
Province:<%= contract.purchaserProvince %> 
Postal Code:<%= contract.purchaserPostalCode %> 
Telephone:<%= contract.purchaserPhoneNumber %> 
E-mail:<%= contract.purchaserEmail %> 
- 		-

Recipient

- <% - const recipient = contract.contractInterments[0] - %> - - - - - - - - - - - - - - - - - - - - - -
Name: - <%= recipient ? recipient.deceasedName : "" %> -
Address:<%= recipient ? recipient.deceasedAddress1 : "" %> 
<%= recipient ? recipient.deceasedAddress2 : "" %> 
City:<%= recipient ? recipient.deceasedCity : "" %> 
Province:<%= recipient ? recipient.deceasedProvince : "" %> 
Postal Code:<%= recipient ? recipient.deceasedPostalCode : "" %> 
- 		Cemetery<%= contract.cemeteryName ?? '(No ' + configFunctions.getConfigProperty("aliases.map") + ')' %>
-

- Purchaser's relationship to Recipient: - - <%= contract.purchaserRelationship %> -   - -

-

- This Contract for Purchase of Interment Rights or Cemetery Services - is between the Purchaser and The Corporation of the City of Sault Ste. Marie (Corporation) - concerning interment rights or cemetery services for the Recipient(s) - as identified in this Contract. -

-

- The Purchaser (if different than the Recipient) - represents being legally authorized or charged with the responsibility for - the Recipient's interment rights and prepaid cemetery services - specified in this Contract. This Contract will be enforceable to - the benefit of and be binding upon the parties hereto - and their respective heirs, executors, administrators, successors, and assigns. -

- - - + - - -
-

Details

- - - - - - - - - - <% - for (const field of contract.contractFields) { - if (!recipientFields.includes(field.contractTypeField) && field.contractFieldValue) { - %> - - - - - <% - } + + + + + <% + for (const field of contract.contractFields) { + if (!recipientFields.includes(field.contractTypeField) && field.contractFieldValue) { + %> + + + + + <% } + } + %> +
Cemetery<%= contract.cemeteryName ?? '(No ' + configFunctions.getConfigProperty("aliases.map") + ')' %>
Burial Site<%= contract.burialSiteName ?? '(No ' + configFunctions.getConfigProperty("aliases.lot") + ')' %>
<%= field.contractTypeField %><%= field.contractFieldValue %>
Burial Site<%= contract.burialSiteName ?? '(No ' + configFunctions.getConfigProperty("aliases.lot") + ')' %>
<%= field.contractTypeField %><%= field.contractFieldValue %>
+ 		+

Interment Rights and Services

+ + + <% + let currentFeeCategory = ""; + let feeAmountTotal = 0; + let taxAmountTotal = 0; %> -
- 		-

Interment Rights and Services

- - - <% - let currentFeeCategory = ""; - let feeAmountTotal = 0; - let taxAmountTotal = 0; - %> - <% for (const fee of contract.contractFees) { %> - <% if (currentFeeCategory !== fee.feeCategory) { %> - - - - <% currentFeeCategory = fee.feeCategory; %> - <% } %> - - - <% if (fee.quantity !== 1) { %> - - <% } %> - - - <% - feeAmountTotal += fee.feeAmount * fee.quantity; - taxAmountTotal += fee.taxAmount * fee.quantity; - %> - <% } %> - - - - - - - - - - - - - - -
- <%= fee.feeCategory %> -
colspan="2"<% } %>> - <%= fee.feeName %> - - $<%= fee.feeAmount.toFixed(2) %> - × - <%= fee.quantity %> - - $<%= fee.feeAmount.toFixed(2) %> -
Sub Total - $<%= feeAmountTotal.toFixed(2) %> -
HST - $<%= taxAmountTotal.toFixed(2) %> -
Total Sale - $<%= (feeAmountTotal + taxAmountTotal).toFixed(2) %> -
Balance Owing - $<%= (feeAmountTotal + taxAmountTotal - contractFunctions.getTransactionTotal(contract)).toFixed(2) %> -
-
+ <% for (const fee of contract.contractFees) { %> + <% if (currentFeeCategory !== fee.feeCategory) { %> +
+ <%= fee.feeCategory %> +
colspan="2"<% } %>> + <%= fee.feeName %> + + $<%= fee.feeAmount.toFixed(2) %> + × + <%= fee.quantity %> + + $<%= fee.feeAmount.toFixed(2) %> +
Sub Total + $<%= feeAmountTotal.toFixed(2) %> +
HST + $<%= taxAmountTotal.toFixed(2) %> +
Total Sale + $<%= (feeAmountTotal + taxAmountTotal).toFixed(2) %> +
Balance Owing + $<%= (feeAmountTotal + taxAmountTotal - contractFunctions.getTransactionTotal(contract)).toFixed(2) %> +
+ + + - + -

- Contribution Levels to the Care and Maintenance Fund
- (based on the price of Interment Rights and as prescribed by the Funeral, Burial and Cremation Services Act) -

+

+ Contribution Levels to the Care and Maintenance Fund
+ (based on the price of Interment Rights and as prescribed by the Funeral, Burial and Cremation Services Act) +

- - - - - - - - - - - - - - - - - -
Nichesthe greater of 15% and $100
Cryptsthe greater of 20% and $500
- In-ground grave (2.23 sq.m. or 24 sq.ft. or larger) - - the greater of 40% and $250 -
In-ground grave (smaller than 2.23 sq.m. or 24 sq ft)the greater of 40% and $150
- -

- Contribution Levels to the Care and Maintenance Fund - Markers
- (as prescribed by the Funeral, Burial and Cremation Services Act) -

+ + + + + + + + + + + + + + + + + +
Nichesthe greater of 15% and $100
Cryptsthe greater of 20% and $500
+ In-ground grave (2.23 sq.m. or 24 sq.ft. or larger) + + the greater of 40% and $250 +
In-ground grave (smaller than 2.23 sq.m. or 24 sq ft)the greater of 40% and $150
+ +

+ Contribution Levels to the Care and Maintenance Fund - Markers
+ (as prescribed by the Funeral, Burial and Cremation Services Act) +

- - - - - - - - - - - - - - - - - -
Flat marker measuring less than 1,116.3 sq.m. (173 sq.in.)$0.00
Flat marker measuring over 1,116.3 sq.m. (173 sq.in.)$50.00
- Upright monument measuring more than 1.22 m. (4 ft.) or less in height or length, - including the base - $100.00
- Upright monument measuring more than 1.22m. (4 ft.) either in height or length, - including the base - $200.00
- -

Contract Terms and Conditions

+ + + + + + + + + + + + + + + + + +
Flat marker measuring less than 1,116.3 sq.m. (173 sq.in.)$0.00
Flat marker measuring over 1,116.3 sq.m. (173 sq.in.)$50.00
+ Upright monument measuring more than 1.22 m. (4 ft.) or less in height or length, + including the base + $100.00
+ Upright monument measuring more than 1.22m. (4 ft.) either in height or length, + including the base + $200.00
+ +

Contract Terms and Conditions

-
    -
  1. - The Purchaser may only cancel a contract for interment rights or cemetery services upon written notice of cancellation - to the City Clerk in accordance with the Funeral, Burial and Cremation Services Act and the terms and conditions set - out herein. -
    2. -
  2. - Where interment rights have not been exercised and none of the contracted cemetery services have been provided - and where the contract is cancelled within thirty (30) days of its execution, the Corporation shall refund the Purchaser - all moneys paid less an administrative fee as set out in the Price List. -
    3. -
  3. - Where interment rights have not been exercised and part of the contracted cemetery services have been provided, - and where the contract is cancelled within thirty (30) days of its execution, the Corporation shall refund the Purchaser - the amount described in (b) above which shall be reduced by the cost of cemetery services provided as set out in the - current Price List. -
    4. -
  4. - A contract for interment rights cannot be cancelled more than thirty (30) days after the date of execution of the - contract. -
    5. -
  5. - Where a contract for cemetery services is cancelled more than thirty (30) days after the date of execution of the - contract, the Purchaser shall be refunded the amount described in (b) and (c) above plus the amount of income - earned on that money. -
    6. -
  6. - Written consent of all surviving interment rights holder(s), if any, and any other required documentation as set out in - Cemetery By-law 2012-129 is required for: cremation, interments, disinterments, and the placement of markers, - inscriptions or photos. -
    7. -
  7. - Transfer or resale of the above listed interment rights to a third party is permitted, subject to the provisions of - Cemetery By-law 2012-129 and the Funeral, Burial and Cremation Services Act. A Certificate of Interment Rights - holder shall not resell interment rights for an amount that is greater than the price of those rights as indicated on the - current Price List, inclusive of the care and maintenance component. -
    8. -
  8. - No Certificate of Interment Rights holder(s) may subdivide and sell or transfer a portion of interment rights. -
    9. -
  9. - An Interment Rights Certificate will not be issued until this Contract has been paid in full. -
    10. -
  10. - A marker, purchased and/or installed by anyone other than the Certificate of Interment Rights holder(s) may be - removed by cemetery staff upon the written request of the Certificate of Interment Rights holder(s). -
    11. -
  11. - Dead human bodies cannot be cremated if there is a pacemaker or radioactive implant in the body or if the body is in - a container made of or containing non-flammable or hazardous material or chlorinated or fibre-reinforced plastic. -
    12. -
  12. - Dead human bodies will not be cremated unless a coroner's certificate has been provided to the operator. -
    13. -
  13. - The Corporation shall not be responsible in the event that it is unable to or prevented from carrying out this Contract - due to causes beyond its control. -
    14. -
+
    +
  1. + The Purchaser may only cancel a contract for interment rights or cemetery services upon written notice of cancellation + to the City Clerk in accordance with the Funeral, Burial and Cremation Services Act and the terms and conditions set + out herein. +
    2. +
  2. + Where interment rights have not been exercised and none of the contracted cemetery services have been provided + and where the contract is cancelled within thirty (30) days of its execution, the Corporation shall refund the Purchaser + all moneys paid less an administrative fee as set out in the Price List. +
    3. +
  3. + Where interment rights have not been exercised and part of the contracted cemetery services have been provided, + and where the contract is cancelled within thirty (30) days of its execution, the Corporation shall refund the Purchaser + the amount described in (b) above which shall be reduced by the cost of cemetery services provided as set out in the + current Price List. +
    4. +
  4. + A contract for interment rights cannot be cancelled more than thirty (30) days after the date of execution of the + contract. +
    5. +
  5. + Where a contract for cemetery services is cancelled more than thirty (30) days after the date of execution of the + contract, the Purchaser shall be refunded the amount described in (b) and (c) above plus the amount of income + earned on that money. +
    6. +
  6. + Written consent of all surviving interment rights holder(s), if any, and any other required documentation as set out in + Cemetery By-law 2012-129 is required for: cremation, interments, disinterments, and the placement of markers, + inscriptions or photos. +
    7. +
  7. + Transfer or resale of the above listed interment rights to a third party is permitted, subject to the provisions of + Cemetery By-law 2012-129 and the Funeral, Burial and Cremation Services Act. A Certificate of Interment Rights + holder shall not resell interment rights for an amount that is greater than the price of those rights as indicated on the + current Price List, inclusive of the care and maintenance component. +
    8. +
  8. + No Certificate of Interment Rights holder(s) may subdivide and sell or transfer a portion of interment rights. +
    9. +
  9. + An Interment Rights Certificate will not be issued until this Contract has been paid in full. +
    10. +
  10. + A marker, purchased and/or installed by anyone other than the Certificate of Interment Rights holder(s) may be + removed by cemetery staff upon the written request of the Certificate of Interment Rights holder(s). +
    11. +
  11. + Dead human bodies cannot be cremated if there is a pacemaker or radioactive implant in the body or if the body is in + a container made of or containing non-flammable or hazardous material or chlorinated or fibre-reinforced plastic. +
    12. +
  12. + Dead human bodies will not be cremated unless a coroner's certificate has been provided to the operator. +
    13. +
  13. + The Corporation shall not be responsible in the event that it is unable to or prevented from carrying out this Contract + due to causes beyond its control. +
    14. +
- + -

Payment Terms

-

- All pre-need interment rights and cemetery services must be paid in full at the time of ordering. -

-

- In the case of at-need interment rights and cemetery services, the interment rights and services directly related to the - deceased will be invoiced by the Corporation and interest shall be charged at the rate determined by the Treasurer on the - unpaid balance after thirty (30) days from the date of invoice. Such services do not include interment rights in a - mausoleum. -

-

- Any rights of cancellation of this Contract, whether within thirty (30) days or after thirty (30) days can only be exercised by - the Purchaser or his or her Estate Trustee. -

+

Payment Terms

+

+ All pre-need interment rights and cemetery services must be paid in full at the time of ordering. +

+

+ In the case of at-need interment rights and cemetery services, the interment rights and services directly related to the + deceased will be invoiced by the Corporation and interest shall be charged at the rate determined by the Treasurer on the + unpaid balance after thirty (30) days from the date of invoice. Such services do not include interment rights in a + mausoleum. +

+

+ Any rights of cancellation of this Contract, whether within thirty (30) days or after thirty (30) days can only be exercised by + the Purchaser or his or her Estate Trustee. +

-

Personal Information

+

Personal Information

-

- The Purchaser acknowledges and provides consent to permit the Corporation to collect, use and disclose personal - information in accordance with the requirements under the Funeral, Burial and Cremation Services Act and the - regulations made thereunder for information within the cemetery/crematorium public register. The Purchaser also - understands that the Corporation does not rent or sell personal information to third party organizations. -

-

- All information provided by the Purchaser to the Corporation shall be held, retained, disclosed, and destroyed, as the case - may be, in accordance with the provisions of the Municipal Freedom of Information and Protection of Privacy Act. -

+

+ The Purchaser acknowledges and provides consent to permit the Corporation to collect, use and disclose personal + information in accordance with the requirements under the Funeral, Burial and Cremation Services Act and the + regulations made thereunder for information within the cemetery/crematorium public register. The Purchaser also + understands that the Corporation does not rent or sell personal information to third party organizations. +

+

+ All information provided by the Purchaser to the Corporation shall be held, retained, disclosed, and destroyed, as the case + may be, in accordance with the provisions of the Municipal Freedom of Information and Protection of Privacy Act. +

-

Consumer Information Guide and Cemetery Price List

+

Consumer Information Guide and Cemetery Price List

-

- By initialling below, the Purchaser acknowledges receiving a copy of the Ontario Government's Consumer Information - Guide (where made available by the Registrar) and the Cemetery Price List at the time of entering into this Contract. -

+

+ By initialling below, the Purchaser acknowledges receiving a copy of the Ontario Government's Consumer Information + Guide (where made available by the Registrar) and the Cemetery Price List at the time of entering into this Contract. +

-
    -
  • - I hereby acknowledge that I have been offered and/or received a copy of the Ontario Government's Consumer - Information Guide and the Cemetery Price List. -
    • -
  • - I have reviewed the terms and conditions of the Contract and hereby confirm that the interment rights and cemetery - services as specified in this Contract are complete and correct. I direct the Corporation to proceed with the sale of the - interment right(s) as identified in this Contract in accordance with the Cemetery By-law 2012-129 which is now or at any - time hereinafter in force. -
    • -
  • - I hereby acknowledge that I have received and reviewed a copy of Cemetery By-law 2012-129. -
    • -
  • - I acknowledge having received a copy of this Contract, and will assume full responsibility for payment of the total - Contract price to the Corporation in accordance with the terms and conditions of the Contract. -
    • -
+
    +
  • + I hereby acknowledge that I have been offered and/or received a copy of the Ontario Government's Consumer + Information Guide and the Cemetery Price List. +
    • +
  • + I have reviewed the terms and conditions of the Contract and hereby confirm that the interment rights and cemetery + services as specified in this Contract are complete and correct. I direct the Corporation to proceed with the sale of the + interment right(s) as identified in this Contract in accordance with the Cemetery By-law 2012-129 which is now or at any + time hereinafter in force. +
    • +
  • + I hereby acknowledge that I have received and reviewed a copy of Cemetery By-law 2012-129. +
    • +
  • + I acknowledge having received a copy of this Contract, and will assume full responsibility for payment of the total + Contract price to the Corporation in accordance with the terms and conditions of the Contract. +
    • +
-

- The Contract date set out below is the date on which this Contract is accepted by the Corporation. -

+

+ The Contract date set out below is the date on which this Contract is accepted by the Corporation. +

-

- Purchaser: -   - Date: -   -

-

- Purchaser: -   - Date: -   -

+

+ Purchaser: +   + Date: +   +

+

+ Purchaser: +   + Date: +   +

-

- Accepted on behalf of The Corporation
- of the City of Sault Ste. Marie by: -

-

- Name: -   -

+

+ Accepted on behalf of The Corporation
+ of the City of Sault Ste. Marie by: +

+

+ Name: +   +

\ No newline at end of file diff --git a/views/print/pdf/workOrder-commentLog.ejs b/views/print/pdf/workOrder-commentLog.ejs index 8ab7c39b..05a22729 100644 --- a/views/print/pdf/workOrder-commentLog.ejs +++ b/views/print/pdf/workOrder-commentLog.ejs @@ -1,47 +1,46 @@ - - <%= headTitle %> - - - - <%- include('_workOrder-header.ejs'); %> + + <%= headTitle %> + + + + <%- include('_workOrder-header.ejs'); %> -

Comments

+

Comments

- <% if (workOrder.workOrderComments.length === 0) { %> -

There are no comments associated with this work order.

- <% } else { %> - - - - - - - - - - <% for (const comment of workOrder.workOrderComments) { %> - - - - - - <% } %> - -
CommentorComment TimeComment
<%= comment.recordUpdate_userName %><%= comment.workOrderCommentDateString %> <%= comment.workOrderCommentTimePeriodString %><%= comment.workOrderComment %>
- <% } %> - - -

- <% - const recordCreateDate = new Date(workOrder.recordCreate_timeMillis); - const currentDate = new Date(); - %> - Work order created <%= dateTimeFunctions.dateToString(recordCreateDate) %> at <%= dateTimeFunctions.dateToTimeString(recordCreateDate) %>. - Printed <%= dateTimeFunctions.dateToString(currentDate) %> at <%= dateTimeFunctions.dateToTimeString(currentDate) %>.
- workOrderId = <%= workOrder.workOrderId %> -

- + <% if (workOrder.workOrderComments.length === 0) { %> +

There are no comments associated with this work order.

+ <% } else { %> + + + + + + + + + + <% for (const comment of workOrder.workOrderComments) { %> + + + + + + <% } %> + +
CommentorComment TimeComment
<%= comment.recordUpdate_userName %><%= comment.workOrderCommentDateString %> <%= comment.workOrderCommentTimePeriodString %><%= comment.workOrderComment %>
+ <% } %> + +

+ <% + const recordCreateDate = new Date(workOrder.recordCreate_timeMillis); + const currentDate = new Date(); + %> + Work order created <%= dateTimeFunctions.dateToString(recordCreateDate) %> at <%= dateTimeFunctions.dateToTimeString(recordCreateDate) %>. + Printed <%= dateTimeFunctions.dateToString(currentDate) %> at <%= dateTimeFunctions.dateToTimeString(currentDate) %>.
+ workOrderId = <%= workOrder.workOrderId %> +

+ \ No newline at end of file diff --git a/views/print/pdf/workOrder.ejs b/views/print/pdf/workOrder.ejs index bd1f6cbb..344ba107 100644 --- a/views/print/pdf/workOrder.ejs +++ b/views/print/pdf/workOrder.ejs @@ -69,55 +69,55 @@

Milestones

- + + + + + + + + + <% for (const milestone of workOrder.workOrderMilestones) { %> - - - + + + - - - <% for (const milestone of workOrder.workOrderMilestones) { %> - - - - - - <% } %> - + <% } %> +
Milestone DescriptionDue Date
Milestone DescriptionDue Date + <% if (milestone.workOrderMilestoneCompletionDate) { %> + + <% } else { %> + + <% } %> + + <% if (milestone.workOrderMilestoneTypeId) { %> + <%= milestone.workOrderMilestoneType %>
+ <% } %> + <%= milestone.workOrderMilestoneDescription %> + 		+ <% if (milestone.workOrderMilestoneDate === 0) { %> + (No Set Date) + <% } else { %> + <%= milestone.workOrderMilestoneDateString %> + <% } %> + <% if (milestone.workOrderMilestoneTime) { %> + <%= milestone.workOrderMilestoneTimePeriodString %> + <% } %> +
- <% if (milestone.workOrderMilestoneCompletionDate) { %> - - <% } else { %> - - <% } %> - - <% if (milestone.workOrderMilestoneTypeId) { %> - <%= milestone.workOrderMilestoneType %>
- <% } %> - <%= milestone.workOrderMilestoneDescription %> - 		- <% if (milestone.workOrderMilestoneDate === 0) { %> - (No Set Date) - <% } else { %> - <%= milestone.workOrderMilestoneDateString %> - <% } %> - <% if (milestone.workOrderMilestoneTime) { %> - <%= milestone.workOrderMilestoneTimePeriodString %> - <% } %> -
<% } %>

Notes

- <% - const recordCreateDate = new Date(workOrder.recordCreate_timeMillis); - const currentDate = new Date(); - %> - Work order created <%= dateTimeFunctions.dateToString(recordCreateDate) %> at <%= dateTimeFunctions.dateToTimePeriodString(recordCreateDate) %>. - Printed <%= dateTimeFunctions.dateToString(currentDate) %> at <%= dateTimeFunctions.dateToTimePeriodString(currentDate) %>.
- workOrderId = <%= workOrder.workOrderId %> + <% + const recordCreateDate = new Date(workOrder.recordCreate_timeMillis); + const currentDate = new Date(); + %> + Work order created <%= dateTimeFunctions.dateToString(recordCreateDate) %> at <%= dateTimeFunctions.dateToTimePeriodString(recordCreateDate) %>. + Printed <%= dateTimeFunctions.dateToString(currentDate) %> at <%= dateTimeFunctions.dateToTimePeriodString(currentDate) %>.
+ workOrderId = <%= workOrder.workOrderId %>

\ No newline at end of file diff --git a/views/workOrder-edit.ejs b/views/workOrder-edit.ejs index 90b1ee4a..80d044a1 100644 --- a/views/workOrder-edit.ejs +++ b/views/workOrder-edit.ejs @@ -104,14 +104,14 @@
-
- - - - - Delete Work Order - -
+
+ + + + + Delete Work Order + +
@@ -128,201 +128,197 @@
-
-
-
- -
-
-
-
- -
-
- /> -
-
- -
+
+
+ + +
+
+
+
+ +
+
+ /> +
+
+
- <% if (isCreate) { %> -

Leave work order number blank to autopopulate.

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

Leave work order number blank to autopopulate.

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

Related Burial Sites

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

Related Burial Sites

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

- Comments -

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

Milestones

-
-
-
-
- -
-
-
-
- +
+
+ + + Add a Related Contract + + + + Add a Related Burial Site +
-
-
- - - Download iCalendar - - - - Export as CSV - -
+
+
+
+
+
+
+
+ <% + const tabToSelect = (workOrder.workOrderContracts.length > 0 || workOrder.workOrderBurialSites.length === 0 ? "contracts" : "burialSites"); + %> +
+ +
+
+
+
+
+
+
+
+
+
+
+ <% } %> +
+ + <% if (!isCreate) { %> +
+
+
+
+
+
+

Milestones

+
+
+
+
+ +
+
+
+
+ +
+
+
+ + + Download iCalendar + + + + Export as CSV +
@@ -331,9 +327,34 @@
- <% } %> +
+ <% } %>
+<% if (!isCreate) { %> +
+
+
+
+
+

+ Comments +

+
+
+
+
+ +
+
+
+
+
+
+<% } %> <%- include('_footerA'); -%> diff --git a/views/workOrder-search.ejs b/views/workOrder-search.ejs index 5fb5552f..fc76690c 100644 --- a/views/workOrder-search.ejs +++ b/views/workOrder-search.ejs @@ -35,81 +35,81 @@
- - + + -
-
-
- -
-
- -
- - - -
-
-
-
-
- -
-
- -
- - - -
-
-
-
-
- -
- - - - +
+
+
+ +
+
+
+ + +
-
-
-
- -
- - - - -
+
+
+ +
+
+
+ + +
-
-
- -
- - - - -
-
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+ +
+ + + + +
+
+
+
+
+ +
+ + + + +
+
+
+