diff --git a/database/getCemeteries.js b/database/getCemeteries.js index f0dcc960..3a2dd982 100644 --- a/database/getCemeteries.js +++ b/database/getCemeteries.js @@ -2,7 +2,7 @@ import { acquireConnection } from './pool.js'; export default async function getCemeteries() { const database = await acquireConnection(); 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.cemeteryAddress1, m.cemeteryAddress2, m.cemeteryCity, m.cemeteryProvince, m.cemeteryPostalCode, m.cemeteryPhoneNumber, diff --git a/database/getCemeteries.ts b/database/getCemeteries.ts index 352cb718..9716edd6 100644 --- a/database/getCemeteries.ts +++ b/database/getCemeteries.ts @@ -7,7 +7,7 @@ export default async function getCemeteries(): Promise { const cemeteries = database .prepare( - `select m.cemeteryId, m.cemeteryName, m.cemeteryDescription, + `select m.cemeteryId, m.cemeteryName, m.cemeteryKey, m.cemeteryDescription, m.cemeteryLatitude, m.cemeteryLongitude, m.cemeterySvg, m.cemeteryAddress1, m.cemeteryAddress2, m.cemeteryCity, m.cemeteryProvince, m.cemeteryPostalCode, m.cemeteryPhoneNumber, diff --git a/public/javascripts/cemetery.search.js b/public/javascripts/cemetery.search.js index db08e5c9..a266a259 100644 --- a/public/javascripts/cemetery.search.js +++ b/public/javascripts/cemetery.search.js @@ -15,7 +15,15 @@ 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.cemeteryKey, + cemetery.cemeteryDescription, + cemetery.cemeteryAddress1, + cemetery.cemeteryAddress2 + ] + .join(' ') + .toLowerCase(); let showCemetery = true; for (const filterStringPiece of filterStringSplit) { if (!cemeterySearchString.includes(filterStringPiece)) { @@ -38,6 +46,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${cityssm.escapeHTML(cemetery.cemeteryDescription)} + + ${cityssm.escapeHTML(cemetery.cemeteryKey)} ${cemetery.cemeteryAddress1 === '' ? '' @@ -79,6 +89,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); 'table is-fullwidth is-striped is-hoverable has-sticky-header'; searchResultsTableElement.innerHTML = ` Cemetery + Key Address Phone Number Coordinates diff --git a/public/javascripts/cemetery.search.ts b/public/javascripts/cemetery.search.ts index a593ecf5..80811d8f 100644 --- a/public/javascripts/cemetery.search.ts +++ b/public/javascripts/cemetery.search.ts @@ -35,9 +35,15 @@ 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.cemeteryKey, + cemetery.cemeteryDescription, + cemetery.cemeteryAddress1, + cemetery.cemeteryAddress2 + ] + .join(' ') + .toLowerCase() let showCemetery = true @@ -69,6 +75,8 @@ declare const exports: Record ${cityssm.escapeHTML(cemetery.cemeteryDescription)} + + ${cityssm.escapeHTML(cemetery.cemeteryKey)} ${ cemetery.cemeteryAddress1 === '' @@ -124,6 +132,7 @@ declare const exports: Record searchResultsTableElement.innerHTML = ` Cemetery + Key Address Phone Number Coordinates