diff --git a/public/javascripts/workOrder.editRelated.js b/public/javascripts/workOrder.editRelated.js index 670b565a..ba2e84ac 100644 --- a/public/javascripts/workOrder.editRelated.js +++ b/public/javascripts/workOrder.editRelated.js @@ -13,8 +13,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); const contractId = clickEvent.currentTarget.closest('.container--contract').dataset.contractId; function doDelete() { cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderContract`, { - workOrderId, - contractId + contractId, + workOrderId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { @@ -65,8 +65,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); } function addContract(contractId, callbackFunction) { cityssm.postJSON(`${sunrise.urlPrefix}/workOrders/doAddWorkOrderContract`, { - workOrderId, - contractId + contractId, + workOrderId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON; if (responseJSON.success) { @@ -106,7 +106,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); Burial Site Contract Date End Date - Interments + Contacts @@ -138,9 +138,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${hasBurialSiteRecord ? '' : ` `} `); @@ -148,14 +148,32 @@ Object.defineProperty(exports, "__esModule", { value: true }); else { rowElement.insertAdjacentHTML('beforeend', '(No Burial Site)'); } - let intermentsHTML = ''; + let contactsHtml = ''; for (const interment of contract.contractInterments ?? []) { - intermentsHTML += `
  • ${cityssm.escapeHTML(interment.deceasedName ?? '')} +
  • `; + } + if (contract.purchaserName !== '') { + contactsHtml += `
  • + + + + ${cityssm.escapeHTML(contract.purchaserName)} +
  • `; + } + if (contract.funeralHomeName !== null) { + contactsHtml += `
  • + + + + ${cityssm.escapeHTML(contract.funeralHomeName)}
  • `; } // eslint-disable-next-line no-unsanitized/method @@ -166,9 +184,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); ? contract.contractEndDateString : '(No End Date)'} - ${contract.contractInterments.length === 0 - ? '(No Interments)' - : ``} + @@ -492,7 +510,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); burialSite.burialSiteId.toString(); rowElement.innerHTML = ` ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} diff --git a/public/javascripts/workOrder.editRelated.ts b/public/javascripts/workOrder.editRelated.ts index eae5b8a2..dce59a72 100644 --- a/public/javascripts/workOrder.editRelated.ts +++ b/public/javascripts/workOrder.editRelated.ts @@ -40,8 +40,8 @@ declare const exports: Record cityssm.postJSON( `${sunrise.urlPrefix}/workOrders/doDeleteWorkOrderContract`, { - workOrderId, - contractId + contractId, + workOrderId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -118,8 +118,8 @@ declare const exports: Record cityssm.postJSON( `${sunrise.urlPrefix}/workOrders/doAddWorkOrderContract`, { - workOrderId, - contractId + contractId, + workOrderId }, (rawResponseJSON) => { const responseJSON = rawResponseJSON as { @@ -179,7 +179,7 @@ declare const exports: Record Burial Site Contract Date End Date - Interments + Contacts @@ -227,9 +227,9 @@ declare const exports: Record hasBurialSiteRecord ? '' : ` ` } @@ -242,10 +242,10 @@ declare const exports: Record ) } - let intermentsHTML = '' + let contactsHtml = '' for (const interment of contract.contractInterments ?? []) { - intermentsHTML += `
  • @@ -254,6 +254,26 @@ declare const exports: Record
  • ` } + if (contract.purchaserName !== '') { + contactsHtml += `
  • + + + + ${cityssm.escapeHTML(contract.purchaserName)} +
  • ` + } + + if (contract.funeralHomeName !== null) { + contactsHtml += `
  • + + + + ${cityssm.escapeHTML(contract.funeralHomeName)} +
  • ` + } + // eslint-disable-next-line no-unsanitized/method rowElement.insertAdjacentHTML( 'beforeend', @@ -266,11 +286,9 @@ declare const exports: Record : '(No End Date)' } - ${ - contract.contractInterments!.length === 0 - ? '(No Interments)' - : `
      ${intermentsHTML}
    ` - } +
      + ${contactsHtml} +
    @@ -703,7 +722,7 @@ declare const exports: Record searchFormElement.addEventListener('submit', doSearch) }, - + onremoved() { bulmaJS.toggleHtmlClipped() ;( @@ -777,7 +796,7 @@ declare const exports: Record rowElement.innerHTML = ` ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} diff --git a/temp/legacyImportFromCsv/data.cemeteries.js b/temp/legacyImportFromCsv/data.cemeteries.js index 7278904b..33dcf3ed 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.js +++ b/temp/legacyImportFromCsv/data.cemeteries.js @@ -80,12 +80,12 @@ const cemeteryKeyToCemetery = { }, MN: { cemeteryName: 'Mausoleum Niche', - cemeteryDescription: '', + cemeteryDescription: 'At Holy Sepulchre Cemetery', cemeteryKey: 'MN', cemeterySvg: '', cemeteryLatitude: '', cemeteryLongitude: '', - cemeteryAddress1: '', + cemeteryAddress1: 'Fourth Line East', cemeteryAddress2: '', cemeteryCity: 'Sault Ste. Marie', cemeteryPostalCode: '', @@ -110,12 +110,12 @@ const cemeteryKeyToCemetery = { }, NW: { cemeteryName: 'Niche Wall', - cemeteryDescription: '', + cemeteryDescription: 'At New Greenwood Cemetery', cemeteryKey: 'NW', cemeterySvg: '', cemeteryLatitude: '', cemeteryLongitude: '', - cemeteryAddress1: '', + cemeteryAddress1: 'Fourth Line East', cemeteryAddress2: '', cemeteryCity: 'Sault Ste. Marie', cemeteryPostalCode: '', diff --git a/temp/legacyImportFromCsv/data.cemeteries.ts b/temp/legacyImportFromCsv/data.cemeteries.ts index 3556fb1c..10db282b 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.ts +++ b/temp/legacyImportFromCsv/data.cemeteries.ts @@ -107,14 +107,14 @@ const cemeteryKeyToCemetery: Record = { MN: { cemeteryName: 'Mausoleum Niche', - cemeteryDescription: '', + cemeteryDescription: 'At Holy Sepulchre Cemetery', cemeteryKey: 'MN', cemeterySvg: '', cemeteryLatitude: '', cemeteryLongitude: '', - cemeteryAddress1: '', + cemeteryAddress1: 'Fourth Line East', cemeteryAddress2: '', cemeteryCity: 'Sault Ste. Marie', cemeteryPostalCode: '', @@ -146,14 +146,14 @@ const cemeteryKeyToCemetery: Record = { NW: { cemeteryName: 'Niche Wall', - cemeteryDescription: '', + cemeteryDescription: 'At New Greenwood Cemetery', cemeteryKey: 'NW', cemeterySvg: '', cemeteryLatitude: '', cemeteryLongitude: '', - cemeteryAddress1: '', + cemeteryAddress1: 'Fourth Line East', cemeteryAddress2: '', cemeteryCity: 'Sault Ste. Marie', cemeteryPostalCode: '', diff --git a/views/report-search.ejs b/views/report-search.ejs index 8d54f465..67c4aacc 100644 --- a/views/report-search.ejs +++ b/views/report-search.ejs @@ -219,26 +219,60 @@
    -
    - - -
    - CSV +
    + + +
    + CSV +
    +
    +

    Burial Sites By Type

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

    Burial Sites By Type

    +
    + +
    +
    + + +
    + CSV +
    +
    +

    Burial Sites By Status

    -
    - + <% for (const burialSiteStatus of burialSiteStatuses) { %> + <% } %> @@ -250,61 +284,27 @@
    -
    - -
    -
    - - -
    - CSV -
    -
    -

    Burial Sites By Status

    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    +
    @@ -319,133 +319,133 @@
    diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs index 744985bc..c8899ce6 100644 --- a/views/workOrder-view.ejs +++ b/views/workOrder-view.ejs @@ -179,7 +179,7 @@ Burial Site Contract Date End Date - Interments + Contacts @@ -218,20 +218,26 @@ <% } %> - <% if (contract.contractInterments.length === 0) { %> - - (No Interments) - - <% } else { %> -
      - <% for (const interment of contract.contractInterments) { %> -
    • - - <%= interment.deceasedName %> -
    • - <% } %> -
    - <% } %> +
      + <% for (const interment of contract.contractInterments) { %> +
    • + + <%= interment.deceasedName %> +
    • + <% } %> + <% if (contract.purchaserName !== '') { %> +
    • + + <%= contract.purchaserName %> +
    • + <% } %> + <% if (contract.funeralHomeName) { %> +
    • + + <%= contract.funeralHomeName %> +
    • + <% } %> +
    <% } %>