From 4900895f5e9dbf6ca91ef70ecdaee33e51ad9494 Mon Sep 17 00:00:00 2001
From: Dan Gowans <dangowans@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:21:59 -0400
Subject: [PATCH] show funeral home and purchaser

---
 public/javascripts/contract.search.js | 30 +++++++++++++++++-----
 public/javascripts/contract.search.ts | 37 ++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js
index 1376b4f8..36e6276f 100644
--- a/public/javascripts/contract.search.js
+++ b/public/javascripts/contract.search.js
@@ -38,11 +38,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
           <i class="fas fa-stop" aria-label="Past Contract"></i>
           </span>`;
             }
-            let deceasedHTML = '';
+            let contactsHTML = '';
             for (const interment of contract.contractInterments ?? []) {
-                deceasedHTML += `<li class="has-tooltip-left">
+                contactsHTML += `<li class="has-tooltip-left"
+          data-tooltip="${contract.isPreneed ? 'Recipient' : 'Deceased'}">
           <span class="fa-li"><i class="fas fa-user"></i></span>
           ${cityssm.escapeHTML(interment.deceasedName ?? '')}
+          </li>`;
+            }
+            if (contract.purchaserName !== '') {
+                contactsHTML += `<li class="has-tooltip-left has-text-grey"
+          data-tooltip="Purchaser">
+          <span class="fa-li"><i class="fas fa-hand-holding-dollar"></i></span>
+          ${cityssm.escapeHTML(contract.purchaserName)}
+          </li>`;
+            }
+            if (contract.funeralHomeName !== null &&
+                contract.funeralHomeName !== '') {
+                contactsHTML += `<li class="has-tooltip-left has-text-grey"
+          data-tooltip="Funeral Home">
+          <span class="fa-li"><i class="fas fa-church"></i></span>
+          ${cityssm.escapeHTML(contract.funeralHomeName)}
           </li>`;
             }
             const feeTotal = (contract.contractFees?.reduce((soFar, currentFee) => soFar +
@@ -66,7 +82,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
           </td><td>
             <a class="has-text-weight-bold"
               href="${sunrise.getContractURL(contract.contractId)}">
-              ${cityssm.escapeHTML(contract.contractType ?? '')}
+              ${cityssm.escapeHTML(contract.contractType)}
             </a><br />
             <span class="is-size-7">#${contract.contractId}</span>
           </td><td>
@@ -84,9 +100,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 ? contract.contractEndDateString
                 : '<span class="has-text-grey">(No End Date)</span>'}
           </td><td>
-            ${deceasedHTML === ''
+            ${contactsHTML === ''
                 ? ''
-                : `<ul class="fa-ul ml-5">${deceasedHTML}</ul>`}
+                : `<ul class="fa-ul ml-5">${contactsHTML}</ul>`}
           </td><td>
             ${feeIconHTML}
           </td><td>
@@ -104,7 +120,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
       <th>Burial Site</th>
       <th>Contract Date</th>
       <th>End Date</th>
-      <th>Recipient / Deceased</th>
+      <th>Contacts</th>
       <th class="has-width-1"><span class="is-sr-only">Fees and Transactions</span></th>
       <th class="has-width-1"><span class="is-sr-only">Print</span></th>
       </tr></thead>
@@ -123,7 +139,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
     }
     function getContracts() {
         // eslint-disable-next-line no-unsanitized/property
-        searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML("Loading Contracts...");
+        searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Loading Contracts...');
         cityssm.postJSON(`${sunrise.urlPrefix}/contracts/doSearchContracts`, searchFilterFormElement, renderContracts);
     }
     function resetOffsetAndGetContracts() {
diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts
index 5aa359ad..87be8538 100644
--- a/public/javascripts/contract.search.ts
+++ b/public/javascripts/contract.search.ts
@@ -1,7 +1,6 @@
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js'
 
 import type { Contract } from '../../types/recordTypes.js'
-
 import type { Sunrise } from './types.js'
 
 declare const cityssm: cityssmGlobal
@@ -30,9 +29,9 @@ declare const exports: Record<string, unknown>
   // eslint-disable-next-line complexity
   function renderContracts(rawResponseJSON: unknown): void {
     const responseJSON = rawResponseJSON as {
+      contracts: Contract[]
       count: number
       offset: number
-      contracts: Contract[]
     }
 
     if (responseJSON.contracts.length === 0) {
@@ -70,15 +69,35 @@ declare const exports: Record<string, unknown>
           </span>`
       }
 
-      let deceasedHTML = ''
+      let contactsHTML = ''
 
       for (const interment of contract.contractInterments ?? []) {
-        deceasedHTML += `<li class="has-tooltip-left">
+        contactsHTML += `<li class="has-tooltip-left"
+          data-tooltip="${contract.isPreneed ? 'Recipient' : 'Deceased'}">
           <span class="fa-li"><i class="fas fa-user"></i></span>
           ${cityssm.escapeHTML(interment.deceasedName ?? '')}
           </li>`
       }
 
+      if (contract.purchaserName !== '') {
+        contactsHTML += `<li class="has-tooltip-left has-text-grey"
+          data-tooltip="Purchaser">
+          <span class="fa-li"><i class="fas fa-hand-holding-dollar"></i></span>
+          ${cityssm.escapeHTML(contract.purchaserName)}
+          </li>`
+      }
+
+      if (
+        contract.funeralHomeName !== null &&
+        contract.funeralHomeName !== ''
+      ) {
+        contactsHTML += `<li class="has-tooltip-left has-text-grey"
+          data-tooltip="Funeral Home">
+          <span class="fa-li"><i class="fas fa-church"></i></span>
+          ${cityssm.escapeHTML(contract.funeralHomeName)}
+          </li>`
+      }
+
       const feeTotal = (
         contract.contractFees?.reduce(
           (soFar, currentFee): number =>
@@ -120,7 +139,7 @@ declare const exports: Record<string, unknown>
           </td><td>
             <a class="has-text-weight-bold"
               href="${sunrise.getContractURL(contract.contractId)}">
-              ${cityssm.escapeHTML(contract.contractType ?? '')}
+              ${cityssm.escapeHTML(contract.contractType)}
             </a><br />
             <span class="is-size-7">#${contract.contractId}</span>
           </td><td>
@@ -143,9 +162,9 @@ declare const exports: Record<string, unknown>
             }
           </td><td>
             ${
-              deceasedHTML === ''
+              contactsHTML === ''
                 ? ''
-                : `<ul class="fa-ul ml-5">${deceasedHTML}</ul>`
+                : `<ul class="fa-ul ml-5">${contactsHTML}</ul>`
             }
           </td><td>
             ${feeIconHTML}
@@ -168,7 +187,7 @@ declare const exports: Record<string, unknown>
       <th>Burial Site</th>
       <th>Contract Date</th>
       <th>End Date</th>
-      <th>Recipient / Deceased</th>
+      <th>Contacts</th>
       <th class="has-width-1"><span class="is-sr-only">Fees and Transactions</span></th>
       <th class="has-width-1"><span class="is-sr-only">Print</span></th>
       </tr></thead>
@@ -200,7 +219,7 @@ declare const exports: Record<string, unknown>
   function getContracts(): void {
     // eslint-disable-next-line no-unsanitized/property
     searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML(
-      "Loading Contracts..."
+      'Loading Contracts...'
     )
 
     cityssm.postJSON(