From fa3e40253f762def7db706a6fb7f7f3fbc3a93ad Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 21 Mar 2025 10:25:48 -0400 Subject: [PATCH] development - admin menu alignment - fix svg display - fix print buttons --- public/favicon.ico | Bin 15086 -> 15086 bytes public/images/sunrise-cms.svg | 27 ++++------- public/javascripts/burialSite.search.js | 2 +- public/javascripts/burialSite.search.ts | 2 +- public/javascripts/contract.search.js | 2 +- public/javascripts/contract.search.ts | 6 +-- public/javascripts/workOrder.search.js | 2 +- public/javascripts/workOrder.search.ts | 2 +- public/stylesheets/sunrise.css | 26 ++++++++++ types/recordTypes.d.ts | 22 ++++----- types/recordTypes.ts | 22 ++++----- views/_header.ejs | 3 +- views/_menu-admin.ejs | 60 +++++++++++++++++++----- views/dashboard.ejs | 2 +- 14 files changed, 116 insertions(+), 62 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index 667f60cfdbe9a11a3ebb2d4bba53cab34b5f3450..b1050d1d9816addc748d11da4aaa2631ce828baf 100644 GIT binary patch literal 15086 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 literal 15086 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 + 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.