diff --git a/public/javascripts/cemetery.edit.js b/public/javascripts/cemetery.edit.js index 184cd053..7000d5bc 100644 --- a/public/javascripts/cemetery.edit.js +++ b/public/javascripts/cemetery.edit.js @@ -48,7 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); if (responseJSON.doRebuildBurialSiteNames ?? false) { bulmaJS.alert({ message: `Cemetery Updated Successfully
- Note that rebuilding burial site names may take a few minutes.`, + Note that rebuilding burial site names may take a few minutes.`, messageIsHtml: true, contextualColorName: 'warning' }); diff --git a/public/javascripts/cemetery.edit.ts b/public/javascripts/cemetery.edit.ts index 7fb08d54..0ab88c3f 100644 --- a/public/javascripts/cemetery.edit.ts +++ b/public/javascripts/cemetery.edit.ts @@ -87,7 +87,7 @@ declare const exports: Record if (responseJSON.doRebuildBurialSiteNames ?? false) { bulmaJS.alert({ message: `Cemetery Updated Successfully
- Note that rebuilding burial site names may take a few minutes.`, + Note that rebuilding burial site names may take a few minutes.`, messageIsHtml: true, contextualColorName: 'warning' }) diff --git a/views/burialSite-edit.ejs b/views/burialSite-edit.ejs index 361f756e..3773f562 100644 --- a/views/burialSite-edit.ejs +++ b/views/burialSite-edit.ejs @@ -88,168 +88,172 @@
-
- <% - const burialSiteNameSegments = configFunctions.getConfigProperty('settings.burialSites.burialSiteNameSegments') - %> - -
- <% for (let segmentIndex = 1; segmentIndex <= 5; segmentIndex += 1) { %> +
+
+
<% - const segmentIndexString = segmentIndex.toString(); - const segment = burialSiteNameSegments.segments[segmentIndexString]; + const burialSiteNameSegments = configFunctions.getConfigProperty('settings.burialSites.burialSiteNameSegments') %> - <% if (segment?.isAvailable ?? false) { %> - <% if (segmentIndex !== 1 && (burialSiteNameSegments.separator ?? '') !== '') { %> -

- - <%= burialSiteNameSegments.separator %> - -

- <% } %> - <% if ((segment.prefix ?? '') !== '') { %> -

- - <%= segment.prefix %> - -

- <% } %> -
+ +
+ <% for (let segmentIndex = 1; segmentIndex <= 5; segmentIndex += 1) { %> + <% + const segmentIndexString = segmentIndex.toString(); + const segment = burialSiteNameSegments.segments[segmentIndexString]; + %> + <% if (segment?.isAvailable ?? false) { %> + <% if (segmentIndex !== 1 && (burialSiteNameSegments.separator ?? '') !== '') { %> +

+ + <%= burialSiteNameSegments.separator %> + +

+ <% } %> + <% if ((segment.prefix ?? '') !== '') { %> +

+ + <%= segment.prefix %> + +

+ <% } %> +
- - <%= segmentIndex === 1 ? ' accesskey="f"' : '' %> - <%= (isCreate && segmentIndex === 1 ? " autofocus" : "") %> /> + + <%= segmentIndex === 1 ? ' accesskey="f"' : '' %> + <%= (isCreate && segmentIndex === 1 ? " autofocus" : "") %> /> +
+ <% if ((segment.suffix ?? '') !== '') { %> +

+ + <%= segment.suffix %> + +

+ <% } %> + <% } %> + <% } %> +
+ + +
+
+
+ +
+
+
+
- <% if ((segment.suffix ?? '') !== '') { %> -

- - <%= segment.suffix %> - -

- <% } %> - <% } %> - <% } %> -
- - -
-
-
-
-
- -
-
-
-
- -
-
-
- +
+ +
+
+
+ +
+
+
+ +
-
-
- -
-
- -
-
-
- + +
+
+
+ +
+
diff --git a/views/report-search.ejs b/views/report-search.ejs index 7f7afe3d..d44f11db 100644 --- a/views/report-search.ejs +++ b/views/report-search.ejs @@ -297,14 +297,14 @@
- +
CSV

Full Cemetery List

- All active cemeteries. + All active cemeteries.

@@ -331,7 +331,7 @@ CSV
-

Full Contracts Table

+

Contracts

@@ -342,7 +342,7 @@ CSV
-

Full ContractComments Table

+

Contract Comments

@@ -353,7 +353,7 @@ CSV
-

Full ContractFees Table

+

Contract Fees

@@ -364,7 +364,7 @@ CSV
-

Full ContractFields Table

+

Contract Fields

@@ -375,7 +375,7 @@ CSV
-

Full ContractInterments Table

+

Contract Interments

@@ -386,7 +386,7 @@ CSV
-

Full ContractTransactions Table

+

Contract Transactions

@@ -397,7 +397,7 @@ CSV
-

Full FuneralHomes Table

+

Funeral Homes

@@ -406,15 +406,15 @@
-

Full WorkOrderBurialSites Table

+

Work Order Burial Sites

@@ -446,56 +446,56 @@ CSV
-

Full WorkOrderMilestones Table

+

Work Order Milestones

@@ -511,64 +511,64 @@
@@ -583,7 +583,7 @@ CSV
-

Full ContractTypes Table

+

Contract Types

@@ -594,7 +594,7 @@ CSV
-

Full ContractTypeFields Table

+

Contract Type Fields

@@ -605,34 +605,34 @@ CSV
-

Full IntermentContainerTypes Table

+

Interment Container Types

-

Work Order Tables

- -
- - -
- CSV -
-
-

Full WorkOrderTypes Table

-
-
- -
- - -
- CSV -
-
-

Full WorkOrderMilestoneTypes Table

-
-
+

Work Order Tables

+ +
+ + +
+ CSV +
+
+

Work Order Types

+
+
+ +
+ + +
+ CSV +
+
+

Work Order Milestone Types

+
+