steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show "no cemetery" when none selected

pull/11/head
Dan Gowans 2025-04-25 10:12:50 -04:00
parent e7f79cbc4f
commit dc9a9b2bcc
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/javascripts/burialSite.search.js
View File

@ -23,11 +23,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')}
</a> </a>
</td><td> </td><td>
<a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}"> ${burialSite.cemeteryId === null
${burialSite.cemeteryName ? '<span class="has-text-grey">(No Cemetery)</span>'
? cityssm.escapeHTML(burialSite.cemeteryName) : `<a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}">
: '<span class="has-text-grey">(No Name)</span>'} ${burialSite.cemeteryName === ''
</a> ? '<span class="has-text-grey">(No Name)</span>'
: cityssm.escapeHTML(burialSite.cemeteryName)}
</a>`}
</td><td> </td><td>
${cityssm.escapeHTML(burialSite.burialSiteType ?? '')} ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')}
</td><td> </td><td>

14
public/javascripts/burialSite.search.ts
View File

@ -53,13 +53,17 @@ declare const exports: Record<string, unknown>
${cityssm.escapeHTML(burialSite.burialSiteName ?? '')} ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')}
</a> </a>
</td><td> </td><td>
<a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}"> ${
burialSite.cemeteryId === null
? '<span class="has-text-grey">(No Cemetery)</span>'
: `<a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}">
${ ${
burialSite.cemeteryName burialSite.cemeteryName === ''
? cityssm.escapeHTML(burialSite.cemeteryName) ? '<span class="has-text-grey">(No Name)</span>'
: '<span class="has-text-grey">(No Name)</span>' : cityssm.escapeHTML(burialSite.cemeteryName)
} }
</a> </a>`
}
</td><td> </td><td>
${cityssm.escapeHTML(burialSite.burialSiteType ?? '')} ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')}
</td><td> </td><td>

2
types/record.types.d.ts vendored
View File

@ -10,7 +10,7 @@ export interface BurialSite extends Record {
burialSiteType?: string; burialSiteType?: string;
burialSiteTypeId?: number; burialSiteTypeId?: number;
cemetery?: Cemetery; cemetery?: Cemetery;
cemeteryId?: number; cemeteryId?: number | null;
cemeteryName?: string; cemeteryName?: string;
cemeterySvg?: string; cemeterySvg?: string;
cemeterySvgId?: string; cemeterySvgId?: string;

2
types/record.types.ts
View File

@ -14,7 +14,7 @@ export interface BurialSite extends Record {
burialSiteTypeId?: number burialSiteTypeId?: number
cemetery?: Cemetery cemetery?: Cemetery
cemeteryId?: number cemeteryId?: number | null
cemeteryName?: string cemeteryName?: string
cemeterySvg?: string cemeterySvg?: string
cemeterySvgId?: string cemeterySvgId?: string

10
views/burialSite-view.ejs
View File

@ -62,9 +62,13 @@
<div class="column"> <div class="column">
<p class="mb-2"> <p class="mb-2">
<strong>Cemetery</strong><br /> <strong>Cemetery</strong><br />
<a href="<%= urlPrefix %>/cemeteries/<%= burialSite.cemeteryId %>"> <% if (burialSite.cemeteryId === null) { %>
<%= burialSite.cemeteryName || "(No Name)" %> <span class="has-text-grey">(No Cemetery)</span>
</a> <% } else { %>
<a href="<%= urlPrefix %>/cemeteries/<%= burialSite.cemeteryId %>">
<%= burialSite.cemeteryName || "(No Name)" %>
</a>
<% } %>
</p> </p>
<p class="mb-2"> <p class="mb-2">
<strong>Burial Site Type</strong><br /> <strong>Burial Site Type</strong><br />