diff --git a/public/javascripts/cemetery.search.js b/public/javascripts/cemetery.search.js index 5c585b1f..db08e5c9 100644 --- a/public/javascripts/cemetery.search.js +++ b/public/javascripts/cemetery.search.js @@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); const cemeteries = exports.cemeteries; const searchFilterElement = document.querySelector('#searchFilter--cemetery'); const searchResultsContainerElement = document.querySelector('#container--searchResults'); - // eslint-disable-next-line complexity function renderResults() { // eslint-disable-next-line no-unsanitized/property - searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML("Loading Cemeteries..."); + searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Loading Cemeteries...'); let searchResultCount = 0; const searchResultsTbodyElement = document.createElement('tbody'); const filterStringSplit = searchFilterElement.value @@ -16,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); .toLowerCase() .split(' '); for (const cemetery of cemeteries) { - const cemeterySearchString = `${cemetery.cemeteryName ?? ''} ${cemetery.cemeteryDescription ?? ''} ${cemetery.cemeteryAddress1 ?? ''} ${cemetery.cemeteryAddress2 ?? ''}`.toLowerCase(); + const cemeterySearchString = `${cemetery.cemeteryName} ${cemetery.cemeteryDescription} ${cemetery.cemeteryAddress1} ${cemetery.cemeteryAddress2}`.toLowerCase(); let showCemetery = true; for (const filterStringPiece of filterStringSplit) { if (!cemeterySearchString.includes(filterStringPiece)) { @@ -32,26 +31,27 @@ Object.defineProperty(exports, "__esModule", { value: true }); searchResultsTbodyElement.insertAdjacentHTML('beforeend', ` - ${cityssm.escapeHTML((cemetery.cemeteryName ?? '') === '' ? '(No Name)' : cemetery.cemeteryName ?? '')} + ${cityssm.escapeHTML(cemetery.cemeteryName === '' + ? '(No Name)' + : cemetery.cemeteryName)}
- ${cityssm.escapeHTML(cemetery.cemeteryDescription ?? '')} + ${cityssm.escapeHTML(cemetery.cemeteryDescription)} - ${(cemetery.cemeteryAddress1 ?? '') === '' + ${cemetery.cemeteryAddress1 === '' ? '' - : `${cityssm.escapeHTML(cemetery.cemeteryAddress1 ?? '')}
`} - ${(cemetery.cemeteryAddress2 ?? '') === '' + : `${cityssm.escapeHTML(cemetery.cemeteryAddress1)}
`} + ${cemetery.cemeteryAddress2 === '' ? '' - : `${cityssm.escapeHTML(cemetery.cemeteryAddress2 ?? '')}
`} - ${cemetery.cemeteryCity || cemetery.cemeteryProvince - ? `${cityssm.escapeHTML(cemetery.cemeteryCity ?? '')}, ${cityssm.escapeHTML(cemetery.cemeteryProvince ?? '')}
` + : `${cityssm.escapeHTML(cemetery.cemeteryAddress2)}
`} + ${cemetery.cemeteryCity !== '' || cemetery.cemeteryProvince !== '' + ? ` + ${cityssm.escapeHTML(cemetery.cemeteryCity)}, ${cityssm.escapeHTML(cemetery.cemeteryProvince)} + ` : ''} - ${(cemetery.cemeteryPostalCode ?? '') === '' - ? '' - : cityssm.escapeHTML(cemetery.cemeteryPostalCode ?? '')} - ${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber ?? '')} + ${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber)} ${cemetery.cemeteryLatitude && cemetery.cemeteryLongitude ? ` diff --git a/public/javascripts/cemetery.search.ts b/public/javascripts/cemetery.search.ts index ecb3195b..a593ecf5 100644 --- a/public/javascripts/cemetery.search.ts +++ b/public/javascripts/cemetery.search.ts @@ -20,11 +20,10 @@ declare const exports: Record '#container--searchResults' ) as HTMLElement - // eslint-disable-next-line complexity function renderResults(): void { // eslint-disable-next-line no-unsanitized/property searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( - "Loading Cemeteries..." + 'Loading Cemeteries...' ) let searchResultCount = 0 @@ -36,9 +35,9 @@ declare const exports: Record .split(' ') for (const cemetery of cemeteries) { - const cemeterySearchString = `${cemetery.cemeteryName ?? ''} ${ - cemetery.cemeteryDescription ?? '' - } ${cemetery.cemeteryAddress1 ?? ''} ${cemetery.cemeteryAddress2 ?? ''}`.toLowerCase() + const cemeterySearchString = `${cemetery.cemeteryName} ${ + cemetery.cemeteryDescription + } ${cemetery.cemeteryAddress1} ${cemetery.cemeteryAddress2}`.toLowerCase() let showCemetery = true @@ -62,35 +61,34 @@ declare const exports: Record ${cityssm.escapeHTML( - (cemetery.cemeteryName ?? '') === '' ? '(No Name)' : cemetery.cemeteryName ?? '' + cemetery.cemeteryName === '' + ? '(No Name)' + : cemetery.cemeteryName )}
- ${cityssm.escapeHTML(cemetery.cemeteryDescription ?? '')} + ${cityssm.escapeHTML(cemetery.cemeteryDescription)} ${ - (cemetery.cemeteryAddress1 ?? '') === '' + cemetery.cemeteryAddress1 === '' ? '' - : `${cityssm.escapeHTML(cemetery.cemeteryAddress1 ?? '')}
` + : `${cityssm.escapeHTML(cemetery.cemeteryAddress1)}
` } ${ - (cemetery.cemeteryAddress2 ?? '') === '' + cemetery.cemeteryAddress2 === '' ? '' - : `${cityssm.escapeHTML(cemetery.cemeteryAddress2 ?? '')}
` + : `${cityssm.escapeHTML(cemetery.cemeteryAddress2)}
` } ${ - cemetery.cemeteryCity || cemetery.cemeteryProvince - ? `${cityssm.escapeHTML(cemetery.cemeteryCity ?? '')}, ${cityssm.escapeHTML(cemetery.cemeteryProvince ?? '')}
` + cemetery.cemeteryCity !== '' || cemetery.cemeteryProvince !== '' + ? ` + ${cityssm.escapeHTML(cemetery.cemeteryCity)}, ${cityssm.escapeHTML(cemetery.cemeteryProvince)} + ` : '' } - ${ - (cemetery.cemeteryPostalCode ?? '') === '' - ? '' - : cityssm.escapeHTML(cemetery.cemeteryPostalCode ?? '') - } - ${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber ?? '')} + ${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber)} ${ cemetery.cemeteryLatitude && cemetery.cemeteryLongitude diff --git a/public/javascripts/contract.editComments.js b/public/javascripts/contract.editComments.js index 1ffd486f..25b84c22 100644 --- a/public/javascripts/contract.editComments.js +++ b/public/javascripts/contract.editComments.js @@ -132,7 +132,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); Edit `; diff --git a/public/javascripts/contract.editComments.ts b/public/javascripts/contract.editComments.ts index 0799e175..c91c1eea 100644 --- a/public/javascripts/contract.editComments.ts +++ b/public/javascripts/contract.editComments.ts @@ -211,7 +211,7 @@ declare const exports: Record Edit ` diff --git a/public/javascripts/contract.editFees.js b/public/javascripts/contract.editFees.js index 0e435ab3..3dbfc349 100644 --- a/public/javascripts/contract.editFees.js +++ b/public/javascripts/contract.editFees.js @@ -158,7 +158,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ` : ''} `; @@ -289,7 +289,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); categoryContainerElement.innerHTML = `

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

@@ -315,7 +315,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); continue; } let includeFee = true; - const feeSearchString = `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase(); + const feeSearchString = `${feeCategory.feeCategory} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase(); for (const filterStringPiece of filterStringPieces) { if (!feeSearchString.includes(filterStringPiece)) { includeFee = false; @@ -535,7 +535,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); Edit `; diff --git a/public/javascripts/contract.editFees.ts b/public/javascripts/contract.editFees.ts index f7c5ed19..a66dde3e 100644 --- a/public/javascripts/contract.editFees.ts +++ b/public/javascripts/contract.editFees.ts @@ -248,7 +248,7 @@ declare const exports: Record : '' } ` @@ -458,7 +458,7 @@ declare const exports: Record categoryContainerElement.innerHTML = `

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

@@ -498,7 +498,7 @@ declare const exports: Record let includeFee = true const feeSearchString = - `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase() + `${feeCategory.feeCategory} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase() for (const filterStringPiece of filterStringPieces) { if (!feeSearchString.includes(filterStringPiece)) { @@ -687,7 +687,6 @@ declare const exports: Record }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() - ;( modalElement.querySelector( '#contractTransactionEdit--transactionAmount' @@ -837,7 +836,7 @@ declare const exports: Record Edit ` diff --git a/public/javascripts/fees.admin.js b/public/javascripts/fees.admin.js index 6dff21ee..767eb3a0 100644 --- a/public/javascripts/fees.admin.js +++ b/public/javascripts/fees.admin.js @@ -31,7 +31,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); feeCategoryContainerElement.innerHTML = `
-

${cityssm.escapeHTML(feeCategory.feeCategory)}

+

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

${feeCategory.isGroupedFee ? 'Grouped Fee' : ''} @@ -93,7 +95,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); panelBlockElement.innerHTML = `

- ${cityssm.escapeHTML(fee.feeName ?? '')}
+ + ${cityssm.escapeHTML(fee.feeName ?? '')} +
${cityssm .escapeHTML(fee.feeDescription ?? '') diff --git a/public/javascripts/fees.admin.ts b/public/javascripts/fees.admin.ts index 878c090a..d1a5ce0c 100644 --- a/public/javascripts/fees.admin.ts +++ b/public/javascripts/fees.admin.ts @@ -75,7 +75,9 @@ declare const exports: Record feeCategoryContainerElement.innerHTML = `

-

${cityssm.escapeHTML(feeCategory.feeCategory)}

+

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

${ feeCategory.isGroupedFee ? 'Grouped Fee' @@ -156,7 +158,9 @@ declare const exports: Record panelBlockElement.innerHTML = `

- ${cityssm.escapeHTML(fee.feeName ?? '')}
+ + ${cityssm.escapeHTML(fee.feeName ?? '')} +
${cityssm .escapeHTML(fee.feeDescription ?? '') @@ -323,6 +327,7 @@ declare const exports: Record .querySelector('form') ?.addEventListener('submit', doAddFeeCategory) }, + onremoved() { bulmaJS.toggleHtmlClipped() ;( @@ -407,6 +412,7 @@ declare const exports: Record ) as HTMLInputElement ).focus() }, + onremoved() { bulmaJS.toggleHtmlClipped() } @@ -653,6 +659,7 @@ declare const exports: Record ).value === '' }) }, + onremoved() { bulmaJS.toggleHtmlClipped() } @@ -1011,6 +1018,7 @@ declare const exports: Record .querySelector('.button--deleteFee') ?.addEventListener('click', confirmDeleteFee) }, + onremoved() { bulmaJS.toggleHtmlClipped() } diff --git a/public/javascripts/workOrder.editRelated.js b/public/javascripts/workOrder.editRelated.js index d0b88714..670b565a 100644 --- a/public/javascripts/workOrder.editRelated.js +++ b/public/javascripts/workOrder.editRelated.js @@ -127,7 +127,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); : ''} - ${cityssm.escapeHTML(contract.contractType ?? '')} + ${cityssm.escapeHTML(contract.contractType)}
#${contract.contractId} `; @@ -410,7 +410,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ? 'Recipients' : 'Deceased')}) ` - : cityssm.escapeHTML(contract.contractInterments[0].deceasedName) + + : cityssm.escapeHTML(contract.contractInterments[0].deceasedName ?? '') + (contract.contractInterments.length > 1 ? ` plus ${(contract.contractInterments.length - 1).toString()}` diff --git a/public/javascripts/workOrder.editRelated.ts b/public/javascripts/workOrder.editRelated.ts index e16a7bf1..eae5b8a2 100644 --- a/public/javascripts/workOrder.editRelated.ts +++ b/public/javascripts/workOrder.editRelated.ts @@ -212,7 +212,7 @@ declare const exports: Record } - ${cityssm.escapeHTML(contract.contractType ?? '')} + ${cityssm.escapeHTML(contract.contractType)}
#${contract.contractId} ` @@ -635,7 +635,7 @@ declare const exports: Record )}) ` : cityssm.escapeHTML( - contract.contractInterments![0].deceasedName + contract.contractInterments![0].deceasedName ?? '' ) + (contract.contractInterments!.length > 1 ? ` plus diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js index fc784690..310fe566 100644 --- a/public/javascripts/workOrder.search.js +++ b/public/javascripts/workOrder.search.js @@ -34,7 +34,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); for (const contract of workOrder.workOrderContracts ?? []) { for (const interment of contract.contractInterments ?? []) { relatedHTML += `

  • + data-tooltip="${cityssm.escapeHTML(contract.isPreneed ? 'Recipient' : 'Deceased')}"> diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts index e6130e09..ebe2dae1 100644 --- a/public/javascripts/workOrder.search.ts +++ b/public/javascripts/workOrder.search.ts @@ -69,7 +69,7 @@ declare const exports: Record for (const interment of contract.contractInterments ?? []) { relatedHTML += `
  • diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts index 45f0a571..6ea7cdeb 100644 --- a/types/recordTypes.d.ts +++ b/types/recordTypes.d.ts @@ -64,18 +64,18 @@ export interface BurialSiteTypeField extends Record { } export interface Cemetery extends Record { cemeteryId?: number; - cemeteryDescription?: string; - cemeteryKey?: string; - cemeteryName?: string; + cemeteryDescription: string; + cemeteryKey: string; + cemeteryName: string; cemeteryLatitude?: number; cemeteryLongitude?: number; cemeterySvg?: string; - cemeteryAddress1?: string; - cemeteryAddress2?: string; - cemeteryCity?: string; - cemeteryPostalCode?: string; - cemeteryProvince?: string; - cemeteryPhoneNumber?: string; + cemeteryAddress1: string; + cemeteryAddress2: string; + cemeteryCity: string; + cemeteryPostalCode: string; + cemeteryProvince: string; + cemeteryPhoneNumber: string; burialSiteCount?: number; } export interface CommittalType extends Record { diff --git a/types/recordTypes.ts b/types/recordTypes.ts index a72e4cf1..c280a303 100644 --- a/types/recordTypes.ts +++ b/types/recordTypes.ts @@ -90,21 +90,21 @@ export interface BurialSiteTypeField extends Record { export interface Cemetery extends Record { cemeteryId?: number - cemeteryDescription?: string - cemeteryKey?: string - cemeteryName?: string + cemeteryDescription: string + cemeteryKey: string + cemeteryName: string cemeteryLatitude?: number cemeteryLongitude?: number cemeterySvg?: string - cemeteryAddress1?: string - cemeteryAddress2?: string - cemeteryCity?: string - cemeteryPostalCode?: string - cemeteryProvince?: string + cemeteryAddress1: string + cemeteryAddress2: string + cemeteryCity: string + cemeteryPostalCode: string + cemeteryProvince: string - cemeteryPhoneNumber?: string + cemeteryPhoneNumber: string burialSiteCount?: number } diff --git a/views/contract-edit.ejs b/views/contract-edit.ejs index e6bdf233..186bfd0f 100644 --- a/views/contract-edit.ejs +++ b/views/contract-edit.ejs @@ -43,13 +43,11 @@ <% } %> -
    -
    +
    +
    <% if (!isCreate) { %> - - Contract #<%= contract.contractId %>: - <%= contract.burialSiteName || ("(No Burial Site)") %> - + Contract #<%= contract.contractId %>: + <%= contract.burialSiteName || ("(No Burial Site)") %> <% } %>
    @@ -70,7 +68,7 @@
    -
    +
    <% for (const printName of contractTypePrints) { %> <% const printConfig = printFunctions.getPrintConfig(printName); %> <% if (printConfig) { %> @@ -103,7 +101,7 @@
    -
    +
    Copy Contract as New @@ -464,17 +462,15 @@
    -
    -
    -
    - -
    - -
    -
    +
    + +
    +
    +
    +
    @@ -575,17 +571,15 @@
    -
    -
    -
    - -
    - -
    -
    +
    + +
    +
    +
    +
    diff --git a/views/contract-view.ejs b/views/contract-view.ejs index 7f4b0a84..f72ed1df 100644 --- a/views/contract-view.ejs +++ b/views/contract-view.ejs @@ -53,7 +53,7 @@
    -
    +
    <% for (const printName of contractTypePrints) { %> <% const printConfig = printFunctions.getPrintConfig(printName); %> <% if (printConfig) { %> @@ -160,7 +160,11 @@

    Funeral Home
    - <%= contract.funeralHomeName %>
    + <% if (contract.funeralHomeName === null) { %> + (No Funeral Home) + <% } else { %> + <%= contract.funeralHomeName %> + <% } %>
    <% if (contract.funeralHomeAddress1) { %> <%= contract.funeralHomeAddress1 %>
    diff --git a/views/workOrder-edit.ejs b/views/workOrder-edit.ejs index 6e43b0ef..51d4df57 100644 --- a/views/workOrder-edit.ejs +++ b/views/workOrder-edit.ejs @@ -67,7 +67,7 @@

    -
    +
    <% for (const printName of configFunctions.getConfigProperty("settings.workOrders.prints")) { %> <% const printConfig = printFunctions.getPrintConfig(printName); %> <% if (printConfig) { %> @@ -98,7 +98,7 @@
    -
    +
    @@ -120,7 +120,7 @@
    -
    +
    @@ -278,7 +278,7 @@
    <% if (!isCreate) { %> -
    +
    diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs index c4d0ae7a..9ca816e1 100644 --- a/views/workOrder-view.ejs +++ b/views/workOrder-view.ejs @@ -47,7 +47,7 @@
    -
    +
    <% for (const printName of configFunctions.getConfigProperty("settings.workOrders.prints")) { %> <% const printConfig = printFunctions.getPrintConfig(printName); %> <% if (printConfig) { %>