diff --git a/bin/www.js b/bin/www.js index 1b2e24ad..98a7880c 100644 --- a/bin/www.js +++ b/bin/www.js @@ -9,6 +9,7 @@ import exitHook from 'exit-hook'; import { initializeDatabase } from '../database/initializeDatabase.js'; import { DEBUG_NAMESPACE } from '../debug.config.js'; import { getConfigProperty } from '../helpers/config.helpers.js'; +import version from '../version.js'; const debug = Debug(`${DEBUG_NAMESPACE}:www:${process.pid}`); // INITIALIZE THE DATABASE await initializeDatabase(); @@ -18,6 +19,7 @@ const applicationName = getConfigProperty('application.applicationName'); process.title = `${applicationName} (Primary)`; debug(`Primary pid: ${process.pid}`); debug(`Primary title: ${process.title}`); +debug(`Version: ${version}`); debug(`Launching ${processCount} processes`); const clusterSettings = { exec: `${directoryName}/wwwProcess.js` diff --git a/bin/www.ts b/bin/www.ts index 571ec646..a1baf412 100644 --- a/bin/www.ts +++ b/bin/www.ts @@ -12,6 +12,7 @@ import { initializeDatabase } from '../database/initializeDatabase.js' import { DEBUG_NAMESPACE } from '../debug.config.js' import { getConfigProperty } from '../helpers/config.helpers.js' import type { WorkerMessage } from '../types/applicationTypes.js' +import version from '../version.js' const debug = Debug(`${DEBUG_NAMESPACE}:www:${process.pid}`) @@ -31,6 +32,7 @@ process.title = `${applicationName} (Primary)` debug(`Primary pid: ${process.pid}`) debug(`Primary title: ${process.title}`) +debug(`Version: ${version}`) debug(`Launching ${processCount} processes`) const clusterSettings = { diff --git a/public/javascripts/cemetery.search.js b/public/javascripts/cemetery.search.js index 41bc8ddb..3c661d67 100644 --- a/public/javascripts/cemetery.search.js +++ b/public/javascripts/cemetery.search.js @@ -47,12 +47,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); ` : ''} -
+ ${cemetery.cemeteryKey === '' + ? '' + : `${cityssm.escapeHTML(cemetery.cemeteryKey)}`} + +
${cityssm.escapeHTML(cemetery.cemeteryDescription)} - - ${cityssm.escapeHTML(cemetery.cemeteryKey)} ${cemetery.cemeteryAddress1 === '' ? '' @@ -70,19 +72,19 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${cemetery.parentCemeteryId === null ? '' - : ` + : ` `} - ${cemetery.cemeteryLatitude && cemetery.cemeteryLongitude - ? ` - + ? ` + ` : ''} - ${(cemetery.cemeterySvg ?? '') === '' ? '' - : ''} + : ` + + `} ${cemetery.burialSiteCount} @@ -100,13 +102,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); 'table is-fullwidth is-striped is-hoverable has-sticky-header'; searchResultsTableElement.innerHTML = ` Cemetery - Key Address Phone Number - Parent - Coordinates - Image - Burial Site Count + Features + Burial Sites `; searchResultsTableElement.append(searchResultsTbodyElement); searchResultsContainerElement.append(searchResultsTableElement); diff --git a/public/javascripts/cemetery.search.ts b/public/javascripts/cemetery.search.ts index 64c0fdc9..ed64b465 100644 --- a/public/javascripts/cemetery.search.ts +++ b/public/javascripts/cemetery.search.ts @@ -78,12 +78,16 @@ declare const exports: Record ` : '' } -
+ ${ + cemetery.cemeteryKey === '' + ? '' + : `${cityssm.escapeHTML(cemetery.cemeteryKey)}` + } + +
${cityssm.escapeHTML(cemetery.cemeteryDescription)} - - ${cityssm.escapeHTML(cemetery.cemeteryKey)} ${ cemetery.cemeteryAddress1 === '' @@ -108,23 +112,23 @@ declare const exports: Record ${ cemetery.parentCemeteryId === null ? '' - : ` + : ` ` } - ${ cemetery.cemeteryLatitude && cemetery.cemeteryLongitude - ? ` - + ? ` + ` : '' } - ${ (cemetery.cemeterySvg ?? '') === '' ? '' - : '' + : ` + + ` } ${cemetery.burialSiteCount} @@ -147,13 +151,10 @@ declare const exports: Record searchResultsTableElement.innerHTML = ` Cemetery - Key Address Phone Number - Parent - Coordinates - Image - Burial Site Count + Features + Burial Sites ` searchResultsTableElement.append(searchResultsTbodyElement) diff --git a/public/stylesheets/sunrise.css b/public/stylesheets/sunrise.css index e4493325..1d3ebf86 100644 --- a/public/stylesheets/sunrise.css +++ b/public/stylesheets/sunrise.css @@ -2,6 +2,10 @@ min-height: 100vh; } +.has-width-1 { + width: 1px; +} + /* to fix page titles inside level components, set on .level-left */ .has-flex-shrink-1 { diff --git a/temp/legacyImportFromCsv/data.deathAgePeriods.js b/temp/legacyImportFromCsv/data.deathAgePeriods.js index dc827efe..a928196d 100644 --- a/temp/legacyImportFromCsv/data.deathAgePeriods.js +++ b/temp/legacyImportFromCsv/data.deathAgePeriods.js @@ -1,13 +1,13 @@ export function getDeathAgePeriod(legacyDeathAgePeriod) { switch (legacyDeathAgePeriod.toLowerCase()) { - case 'yrs': { - return 'Years'; + case 'dys': { + return 'Days'; } case 'mts': { return 'Months'; } - case 'dys': { - return 'Days'; + case 'yrs': { + return 'Years'; } default: { return legacyDeathAgePeriod; diff --git a/temp/legacyImportFromCsv/data.deathAgePeriods.ts b/temp/legacyImportFromCsv/data.deathAgePeriods.ts index f203a4d9..f196da5f 100644 --- a/temp/legacyImportFromCsv/data.deathAgePeriods.ts +++ b/temp/legacyImportFromCsv/data.deathAgePeriods.ts @@ -1,13 +1,13 @@ export function getDeathAgePeriod(legacyDeathAgePeriod: string): string { switch (legacyDeathAgePeriod.toLowerCase()) { - case 'yrs': { - return 'Years' + case 'dys': { + return 'Days' } case 'mts': { return 'Months' } - case 'dys': { - return 'Days' + case 'yrs': { + return 'Years' } default: { diff --git a/views/cemetery-edit.ejs b/views/cemetery-edit.ejs index 20762356..39f5b5ec 100644 --- a/views/cemetery-edit.ejs +++ b/views/cemetery-edit.ejs @@ -264,7 +264,7 @@
-
+

Image

@@ -345,10 +345,12 @@ Type - - Burial Site Count + + Burial Sites + + + Percentage - Percentage @@ -375,10 +377,12 @@ Status - - Burial Site Count + + Burial Sites + + + Percentage - Percentage diff --git a/views/cemetery-view.ejs b/views/cemetery-view.ejs index 1e4cada9..cc46befe 100644 --- a/views/cemetery-view.ejs +++ b/views/cemetery-view.ejs @@ -209,10 +209,12 @@ Type - - Burial Site Count + + Burial Sites + + + Percentage - Percentage @@ -224,10 +226,10 @@ - <%= burialSiteType.burialSiteCount %> + <%= burialSiteType.burialSiteCount %> - <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% + <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% <% } %> @@ -239,10 +241,10 @@ Status - - Burial Site Count + + Burial Sites - Percentage + Percentage @@ -250,14 +252,14 @@ - <%= burialSiteStatus.burialSiteStatus %> + <%= burialSiteStatus.burialSiteStatus %> - <%= burialSiteStatus.burialSiteCount %> + <%= burialSiteStatus.burialSiteCount %> - <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% + <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% <% } %>