diff --git a/public/favicon.ico b/public/favicon.ico index 667f60cf..b1050d1d 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/images/sunrise-cms.svg b/public/images/sunrise-cms.svg index eda568d3..d5d89f82 100644 --- a/public/images/sunrise-cms.svg +++ b/public/images/sunrise-cms.svg @@ -1,15 +1,10 @@ + inkscape:current-layer="svg3" /> + d="m 2411.7318,2964 -17,-19 v -420 l 18,-16 19,-17 h 19 c 10,0 29,3 42,6 l 23,7 14,28 15,28 v 338 l -11,32 -11,31 -18,10 c -10,6 -32,10 -48,10 h -29 z m 454,-189 -21,-18 -80,-163 -80,-163 v -51 l 29,-29 29,-29 h 68 l 21,15 22,16 81,165 80,166 v 50 l -29,29 -29,29 h -70 z m 526,-398 c -24,-12 -103,-69 -282,-203 l -44,-32 -6,-34 -7,-34 12,-23 c 7,-13 22,-32 34,-41 l 21,-18 h 63 l 63,47 c 190,139 249,185 263,205 l 16,22 v 52 l -16,23 -17,23 -33,14 c -40,17 -33,17 -67,-1 z m -1082,-192 c -3,-21 -12,-73 -20,-115 l -14,-78 -32,-76 -32,-77 -50,-76 -51,-76 -75,-74 -76,-75 -80,-52 -80,-52 -70,-30 c -85,-36 -160,-62 -183,-62 -9,0 -23,-4 -29,-8 l -13,-8 21,-75 20,-74 42,-78 41,-77 64,-70 64,-71 60,-41 c 76,-51 164,-91 249,-112 l 65,-16 h 223 l 64,15 c 36,8 96,27 133,43 l 69,28 61,41 61,41 72,78 72,77 44,91 45,92 21,84 22,84 -6,126 -5,125 -27,78 -27,78 -15,39 -14,17 -30,48 c -17,26 -56,75 -87,107 l -56,59 -73,45 c -40,25 -96,55 -125,66 -52,19 -181,48 -218,48 h -19 z m 1015,-339 c -14,-3 -35,-10 -47,-16 l -22,-11 -11,-33 -11,-32 8,-34 9,-33 34,-17 35,-18 h 293 l 32,6 32,7 19,31 19,31 v 46 l -15,28 c -8,16 -20,31 -28,34 -19,7 -316,17 -347,11 z m -2478,-469 -33,-14 -14,-35 -15,-35 16,-41 16,-40 41,-11 42,-11 155,4 155,4 22,12 23,13 16,30 15,31 -4,13 -5,12 -74,7 c -99,10 -212,34 -266,57 -51,22 -48,22 -90,4 z m 2453,1 -30,-13 -13,-27 c -16,-36 -15,-61 3,-96 l 15,-30 28,-7 27,-8 h 310 l 28,8 28,8 16,33 16,34 -7,36 -7,37 -32,19 -32,20 h -160 l -160,-1 z m -1965,-439 c -30,-16 -275,-191 -307,-220 l -23,-20 v -78 l 11,-20 11,-21 31,-13 32,-13 31,13 c 17,7 95,59 173,115 l 142,103 16,30 15,30 -11,38 -11,37 -34,16 c -41,19 -44,19 -76,3 z m 1781,0 -25,-12 -19,-33 -20,-33 10,-32 9,-32 129,-98 c 72,-54 149,-110 172,-124 l 43,-25 33,11 33,11 17,29 17,29 v 25 c 0,14 -3,33 -6,42 l -6,16 -77,56 c -42,31 -101,75 -131,98 -71,55 -121,85 -140,85 -8,0 -26,-6 -39,-13 z m -1433,-329 -27,-9 -34,-57 c -19,-31 -62,-107 -95,-168 l -62,-111 v -16 c 0,-9 5,-27 11,-41 l 11,-24 33,-18 32,-17 26,7 26,6 20,21 c 10,11 56,87 100,167 l 82,147 -5,34 -5,33 -17,19 c -9,10 -28,22 -42,27 l -27,9 z m 1007,-32 -24,-24 -7,-26 -6,-26 82,-153 c 45,-83 91,-162 103,-174 l 20,-23 h 78 l 24,24 24,24 7,28 7,27 -10,16 c -6,9 -41,74 -79,145 l -69,129 -26,28 -27,29 h -73 z m -531,-110 -21,-15 -12,-30 -13,-29 4,-172 3,-172 29,-25 30,-25 40,5 40,6 18,23 18,23 v 373 l -18,22 -17,21 -40,5 -40,5 z" + id="path3" /> diff --git a/public/javascripts/burialSite.search.js b/public/javascripts/burialSite.search.js index 4f8aec49..eca84aed 100644 --- a/public/javascripts/burialSite.search.js +++ b/public/javascripts/burialSite.search.js @@ -35,7 +35,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '') : '(No Status)'}
${(burialSite.contractCount ?? 0) > 0 - ? 'Currently Occupied' + ? 'Has Current Contracts' : ''} `); diff --git a/public/javascripts/burialSite.search.ts b/public/javascripts/burialSite.search.ts index 47640c01..be963cb2 100644 --- a/public/javascripts/burialSite.search.ts +++ b/public/javascripts/burialSite.search.ts @@ -70,7 +70,7 @@ declare const exports: Record }
${ (burialSite.contractCount ?? 0) > 0 - ? 'Currently Occupied' + ? 'Has Current Contracts' : '' } diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js index de88ae98..1376b4f8 100644 --- a/public/javascripts/contract.search.js +++ b/public/javascripts/contract.search.js @@ -93,7 +93,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${contract.printEJS ? ` - + ` : ''}`); } diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts index 4e6ae076..5aa359ad 100644 --- a/public/javascripts/contract.search.ts +++ b/public/javascripts/contract.search.ts @@ -53,14 +53,14 @@ declare const exports: Record let contractTimeHTML = '' if ( - contract.contractStartDateString! <= nowDateString && + contract.contractStartDateString <= nowDateString && (contract.contractEndDateString === '' || contract.contractEndDateString! >= nowDateString) ) { contractTimeHTML = ` ` - } else if (contract.contractStartDateString! > nowDateString) { + } else if (contract.contractStartDateString > nowDateString) { contractTimeHTML = ` ` @@ -154,7 +154,7 @@ declare const exports: Record contract.printEJS ? ` - + ` : '' }` diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js index 18bc9bd1..9ccbcb62 100644 --- a/public/javascripts/workOrder.search.js +++ b/public/javascripts/workOrder.search.js @@ -89,7 +89,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); - + ` : ''}`); diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts index 21844e38..0959190b 100644 --- a/public/javascripts/workOrder.search.ts +++ b/public/javascripts/workOrder.search.ts @@ -139,7 +139,7 @@ declare const exports: Record - + ` : '' diff --git a/public/stylesheets/sunrise.css b/public/stylesheets/sunrise.css index 043c4124..32fc7bc8 100644 --- a/public/stylesheets/sunrise.css +++ b/public/stylesheets/sunrise.css @@ -160,3 +160,29 @@ span.button.is-static { .select option:disabled { display: none; } + +/* + * SVG + */ + +.image svg { + display: block; + height: auto; + width: 100%; +} + +.image svg .highlight.is-danger, +.image svg .highlight path.is-danger { + stroke: var(--bulma-danger-dark) !important; + fill: rgba(var(--bulma-danger-light), 0.6); +} + +.image svg .highlight.is-success, +.image svg .highlight path.is-success { + stroke: var(--bulma-success-dark) !important; + fill: rgba(var(--bulma-success-light), 0.6); +} + +.image svg text { + user-select: none; +} diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts index ae4317bb..2c98c3eb 100644 --- a/types/recordTypes.d.ts +++ b/types/recordTypes.d.ts @@ -234,19 +234,19 @@ export interface Contract extends Record { burialSiteName?: string; cemeteryId?: number; cemeteryName?: string; - contractStartDate?: number; - contractStartDateString?: string; + contractStartDate: number; + contractStartDateString: string; contractEndDate?: number; contractEndDateString?: string; - purchaserName?: string; - purchaserAddress1?: string; - purchaserAddress2?: string; - purchaserCity?: string; - purchaserProvince?: string; - purchaserPostalCode?: string; - purchaserPhoneNumber?: string; - purchaserEmail?: string; - purchaserRelationship?: string; + purchaserName: string; + purchaserAddress1: string; + purchaserAddress2: string; + purchaserCity: string; + purchaserProvince: string; + purchaserPostalCode: string; + purchaserPhoneNumber: string; + purchaserEmail: string; + purchaserRelationship: string; funeralHomeId?: number; funeralHomeKey?: string; funeralHomeName?: string; diff --git a/types/recordTypes.ts b/types/recordTypes.ts index a30f340c..6539d464 100644 --- a/types/recordTypes.ts +++ b/types/recordTypes.ts @@ -303,21 +303,21 @@ export interface Contract extends Record { cemeteryId?: number cemeteryName?: string - contractStartDate?: number - contractStartDateString?: string + contractStartDate: number + contractStartDateString: string contractEndDate?: number contractEndDateString?: string - purchaserName?: string - purchaserAddress1?: string - purchaserAddress2?: string - purchaserCity?: string - purchaserProvince?: string - purchaserPostalCode?: string - purchaserPhoneNumber?: string - purchaserEmail?: string - purchaserRelationship?: string + purchaserName: string + purchaserAddress1: string + purchaserAddress2: string + purchaserCity: string + purchaserProvince: string + purchaserPostalCode: string + purchaserPhoneNumber: string + purchaserEmail: string + purchaserRelationship: string funeralHomeId?: number funeralHomeKey?: string diff --git a/views/_header.ejs b/views/_header.ejs index 71de41f1..f7867801 100644 --- a/views/_header.ejs +++ b/views/_header.ejs @@ -29,7 +29,8 @@ " alt="" - height="28" /> + height="28" + width="28" /> <%= configFunctions.getConfigProperty("application.applicationName") %> " href="<%= urlPrefix %>/admin/fees" aria-label="Fee Management"> - - Fee Management +
+
+ +
+
+ Fee Management +
+
  • " href="<%= urlPrefix %>/admin/contractTypes" aria-label="Contract Type Management"> - - Contract Type Management +
    +
    + +
    +
    + Contract Type Management +
    +
  • " href="<%= urlPrefix %>/admin/burialSiteTypes" aria-label="Burial Site Type Management"> - - Burial Site Type Management +
    +
    + +
    +
    + Burial Site Type Management +
    +
  • " href="<%= urlPrefix %>/admin/tables" aria-label="Config Table Management"> - - Config Table Management +
    +
    + +
    +
    + Config Table Management +
    +
  • "\ href="<%= urlPrefix %>/admin/database" aria-label="Database Maintenance"> - - Database Maintenance +
    +
    + +
    +
    + Database Maintenance +
    +
    • <% if (configFunctions.getConfigProperty("application.ntfyStartup")) { %> @@ -48,8 +78,14 @@ " href="<%= urlPrefix %>/admin/ntfyStartup" aria-label="Ntfy Startup Notification"> - - Ntfy Startup Notification +
    +
    + +
    +
    + Ntfy Startup Notification +
    +
    <% } %> diff --git a/views/dashboard.ejs b/views/dashboard.ejs index 4ffc8ec3..eeb18e7f 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -349,7 +349,7 @@ Config Table Management

    - Manage simple configuration tables fees for + Manage simple configuration tables for work order types and burial site statuses.