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

include key in results

pull/11/head
Dan Gowans 2025-04-03 10:09:42 -04:00
parent 58d6cc76b5
commit 6125ef0030
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/getCemeteries.js
View File

@ -2,7 +2,7 @@ import { acquireConnection } from './pool.js';
export default async function getCemeteries() { export default async function getCemeteries() {
const database = await acquireConnection(); const database = await acquireConnection();
const cemeteries = database const cemeteries = database
.prepare(`select m.cemeteryId, m.cemeteryName, m.cemeteryDescription, .prepare(`select m.cemeteryId, m.cemeteryName, m.cemeteryKey, m.cemeteryDescription,
m.cemeteryLatitude, m.cemeteryLongitude, m.cemeterySvg, m.cemeteryLatitude, m.cemeteryLongitude, m.cemeterySvg,
m.cemeteryAddress1, m.cemeteryAddress2, m.cemeteryCity, m.cemeteryProvince, m.cemeteryPostalCode, m.cemeteryAddress1, m.cemeteryAddress2, m.cemeteryCity, m.cemeteryProvince, m.cemeteryPostalCode,
m.cemeteryPhoneNumber, m.cemeteryPhoneNumber,

2
database/getCemeteries.ts
View File

@ -7,7 +7,7 @@ export default async function getCemeteries(): Promise<Cemetery[]> {
const cemeteries = database const cemeteries = database
.prepare( .prepare(
`select m.cemeteryId, m.cemeteryName, m.cemeteryDescription, `select m.cemeteryId, m.cemeteryName, m.cemeteryKey, m.cemeteryDescription,
m.cemeteryLatitude, m.cemeteryLongitude, m.cemeterySvg, m.cemeteryLatitude, m.cemeteryLongitude, m.cemeterySvg,
m.cemeteryAddress1, m.cemeteryAddress2, m.cemeteryCity, m.cemeteryProvince, m.cemeteryPostalCode, m.cemeteryAddress1, m.cemeteryAddress2, m.cemeteryCity, m.cemeteryProvince, m.cemeteryPostalCode,
m.cemeteryPhoneNumber, m.cemeteryPhoneNumber,

13
public/javascripts/cemetery.search.js
View File

@ -15,7 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
.toLowerCase() .toLowerCase()
.split(' '); .split(' ');
for (const cemetery of cemeteries) { for (const cemetery of cemeteries) {
const cemeterySearchString = `${cemetery.cemeteryName} ${cemetery.cemeteryDescription} ${cemetery.cemeteryAddress1} ${cemetery.cemeteryAddress2}`.toLowerCase(); const cemeterySearchString = [
cemetery.cemeteryName,
cemetery.cemeteryKey,
cemetery.cemeteryDescription,
cemetery.cemeteryAddress1,
cemetery.cemeteryAddress2
]
.join(' ')
.toLowerCase();
let showCemetery = true; let showCemetery = true;
for (const filterStringPiece of filterStringSplit) { for (const filterStringPiece of filterStringSplit) {
if (!cemeterySearchString.includes(filterStringPiece)) { if (!cemeterySearchString.includes(filterStringPiece)) {
@ -38,6 +46,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
<span class="is-size-7"> <span class="is-size-7">
${cityssm.escapeHTML(cemetery.cemeteryDescription)} ${cityssm.escapeHTML(cemetery.cemeteryDescription)}
</span> </span>
</td><td>
${cityssm.escapeHTML(cemetery.cemeteryKey)}
</td><td> </td><td>
${cemetery.cemeteryAddress1 === '' ${cemetery.cemeteryAddress1 === ''
? '' ? ''
@ -79,6 +89,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
'table is-fullwidth is-striped is-hoverable has-sticky-header'; 'table is-fullwidth is-striped is-hoverable has-sticky-header';
searchResultsTableElement.innerHTML = `<thead><tr> searchResultsTableElement.innerHTML = `<thead><tr>
<th>Cemetery</th> <th>Cemetery</th>
<th>Key</th>
<th>Address</th> <th>Address</th>
<th>Phone Number</th> <th>Phone Number</th>
<th class="has-text-centered">Coordinates</th> <th class="has-text-centered">Coordinates</th>

15
public/javascripts/cemetery.search.ts
View File

@ -35,9 +35,15 @@ declare const exports: Record<string, unknown>
.split(' ') .split(' ')
for (const cemetery of cemeteries) { for (const cemetery of cemeteries) {
const cemeterySearchString = `${cemetery.cemeteryName} ${ const cemeterySearchString = [
cemetery.cemeteryDescription cemetery.cemeteryName,
} ${cemetery.cemeteryAddress1} ${cemetery.cemeteryAddress2}`.toLowerCase() cemetery.cemeteryKey,
cemetery.cemeteryDescription,
cemetery.cemeteryAddress1,
cemetery.cemeteryAddress2
]
.join(' ')
.toLowerCase()
let showCemetery = true let showCemetery = true
@ -69,6 +75,8 @@ declare const exports: Record<string, unknown>
<span class="is-size-7"> <span class="is-size-7">
${cityssm.escapeHTML(cemetery.cemeteryDescription)} ${cityssm.escapeHTML(cemetery.cemeteryDescription)}
</span> </span>
</td><td>
${cityssm.escapeHTML(cemetery.cemeteryKey)}
</td><td> </td><td>
${ ${
cemetery.cemeteryAddress1 === '' cemetery.cemeteryAddress1 === ''
@ -124,6 +132,7 @@ declare const exports: Record<string, unknown>
searchResultsTableElement.innerHTML = `<thead><tr> searchResultsTableElement.innerHTML = `<thead><tr>
<th>Cemetery</th> <th>Cemetery</th>
<th>Key</th>
<th>Address</th> <th>Address</th>
<th>Phone Number</th> <th>Phone Number</th>
<th class="has-text-centered">Coordinates</th> <th class="has-text-centered">Coordinates</th>