From 9bf4a2cfeec5c6ca80d581a062e7e9ea23902936 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 28 Mar 2025 15:03:42 -0400 Subject: [PATCH] linting - login page overflow - make sure funeral home icons use fa-place-of-worship --- public/javascripts/contract.search.js | 2 +- public/javascripts/contract.search.ts | 2 +- public/javascripts/workOrder.search.js | 2 +- public/javascripts/workOrder.search.ts | 2 +- public/stylesheets/sunrise.css | 2 +- views/cemetery-edit.ejs | 2 +- views/cemetery-view.ejs | 266 +++++++++++++------------ views/contract-edit.ejs | 30 ++- views/contract-view.ejs | 38 +++- views/login.ejs | 2 +- 10 files changed, 203 insertions(+), 145 deletions(-) diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js index 6a51cf9a..2689d226 100644 --- a/public/javascripts/contract.search.js +++ b/public/javascripts/contract.search.js @@ -57,7 +57,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); contract.funeralHomeName !== '') { contactsHTML += `
  • - + ${cityssm.escapeHTML(contract.funeralHomeName)}
    • `; } diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts index 8044abe8..bcaa6b22 100644 --- a/public/javascripts/contract.search.ts +++ b/public/javascripts/contract.search.ts @@ -93,7 +93,7 @@ declare const exports: Record ) { contactsHTML += `
  • - + ${cityssm.escapeHTML(contract.funeralHomeName)}
    • ` } diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js index 213edf90..fc784690 100644 --- a/public/javascripts/workOrder.search.js +++ b/public/javascripts/workOrder.search.js @@ -45,7 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); relatedHTML += `
  • - + ${cityssm.escapeHTML(contract.funeralHomeName)}
    • `; diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts index b3e89e50..e6130e09 100644 --- a/public/javascripts/workOrder.search.ts +++ b/public/javascripts/workOrder.search.ts @@ -82,7 +82,7 @@ declare const exports: Record relatedHTML += `
  • - + ${cityssm.escapeHTML(contract.funeralHomeName)}
    • ` diff --git a/public/stylesheets/sunrise.css b/public/stylesheets/sunrise.css index 2d2ada91..fbc10695 100644 --- a/public/stylesheets/sunrise.css +++ b/public/stylesheets/sunrise.css @@ -30,7 +30,7 @@ #is-login-page { overflow: auto; - background-position: top center; + background-position: bottom center; background-size: cover; } diff --git a/views/cemetery-edit.ejs b/views/cemetery-edit.ejs index 18ceea16..10802c50 100644 --- a/views/cemetery-edit.ejs +++ b/views/cemetery-edit.ejs @@ -252,7 +252,7 @@
    - + Export All diff --git a/views/cemetery-view.ejs b/views/cemetery-view.ejs index e688f5bc..4fb18104 100644 --- a/views/cemetery-view.ejs +++ b/views/cemetery-view.ejs @@ -73,156 +73,158 @@
    <% } %>
    - Address
    - <% if (cemetery.cemeteryAddress1 !== "") { %> - <%= cemetery.cemeteryAddress1 %>
    - <% } %> - <% if (cemetery.cemeteryAddress2 !== "") { %> - <%= cemetery.cemeteryAddress2 %>
    - <% } %> - <%= cemetery.cemeteryCity %>, <%= cemetery.cemeteryProvince %>
    - <%= cemetery.cemeteryPostalCode %> + Address
    + <% if (cemetery.cemeteryAddress1 !== "") { %> + <%= cemetery.cemeteryAddress1 %>
    + <% } %> + <% if (cemetery.cemeteryAddress2 !== "") { %> + <%= cemetery.cemeteryAddress2 %>
    + <% } %> + <%= cemetery.cemeteryCity %>, <%= cemetery.cemeteryProvince %>
    + <%= cemetery.cemeteryPostalCode %>
    <% if (cemetery.cemeteryPhoneNumber !== "") { %> -
    - Phone Number
    - <%= cemetery.cemeteryPhoneNumber %> -
    +
    + Phone Number
    + <%= cemetery.cemeteryPhoneNumber %> +
    <% } %>
    -
    -
    -

    Geographic Location

    -
    - <% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %> -
    - <% } else { %> -
    -

    There are no geographic coordinates associated with this cemetery.

    -
    - <% } %> -
    +
    +
    +

    Geographic Location

    +
    + <% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %> +
    + <% } else { %> +
    +

    + There are no geographic coordinates associated with this cemetery. +

    +
    + <% } %>
    -
    -
    -

    Image

    -
    - <% if (cemetery.cemeterySvg) { %> - <% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %> - - <%- include('../public-internal/images/cemeteries/' + cemetery.cemeterySvg); -%> - - <% } else { %> -
    -

    There are no image associated with this cemetery.

    -
    - <% } %> +
    +
    +
    +

    Image

    +
    + <% if (cemetery.cemeterySvg) { %> + <% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %> + + <%- include('../public-internal/images/cemeteries/' + cemetery.cemeterySvg); -%> + + <% } else { %> +
    +

    There are no image associated with this cemetery.

    -
    + <% } %> +
    +
    <% const burialSiteSearchUrl = urlPrefix + "/burialSites?cemeteryId=" + cemetery.cemeteryId; %>
    -
    -
    -
    -
    -

    - Burial Site Summaries - - <%= cemetery.burialSiteCount %> - -

    -
    -
    -
    -
    - - - Export All - -
    -
    +
    +
    +
    +
    +

    + Burial Site Summaries + + <%= cemetery.burialSiteCount %> + +

    +
    +
    +
    + + + Export All + +
    +
    -
    - <% if (cemetery.burialSiteCount === 0) { %> -
    -

    - There are no burial sites associated with this cemetery. -

    -
    - <% } else { %> -
    -
    - - - - - - - - - - <% for (const burialSiteType of burialSiteTypeSummary) { %> - - - - - - <% } %> - -
    Type - Burial Site Count - Percentage
    - - <%= burialSiteType.burialSiteType %> - - - <%= burialSiteType.burialSiteCount %> - - <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% -
    -
    -
    - - - - - - - - - - <% for (const burialSiteStatus of burialSiteStatusSummary) { %> - - - - - - <% } %> - -
    Status - Burial Site Count - Percentage
    - - <%= burialSiteStatus.burialSiteStatus %> - - - <%= burialSiteStatus.burialSiteCount %> - - <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% -
    -
    -
    - <% } %> -
    +
    +
    + <% if (cemetery.burialSiteCount === 0) { %> +
    +

    + There are no burial sites associated with this cemetery. +

    +
    + <% } else { %> +
    +
    + + + + + + + + + + <% for (const burialSiteType of burialSiteTypeSummary) { %> + + + + + + <% } %> + +
    Type + Burial Site Count + Percentage
    + + <%= burialSiteType.burialSiteType %> + + + <%= burialSiteType.burialSiteCount %> + + <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% +
    +
    +
    + + + + + + + + + + <% for (const burialSiteStatus of burialSiteStatusSummary) { %> + + + + + + <% } %> + +
    Status + Burial Site Count + Percentage
    + + <%= burialSiteStatus.burialSiteStatus %> + + + <%= burialSiteStatus.burialSiteCount %> + + <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% +
    +
    +
    + <% } %> +
    <%- include('_footerA'); -%> diff --git a/views/contract-edit.ejs b/views/contract-edit.ejs index 880bca4c..767c9b36 100644 --- a/views/contract-edit.ejs +++ b/views/contract-edit.ejs @@ -322,7 +322,20 @@
    -

    Funeral

    +
    +
    +
    +
    +

    Funeral

    +
    +
    +
    +
    + +
    +
    +
    +
    @@ -425,7 +438,20 @@
    -

    Purchaser

    +
    +
    +
    +
    +

    Purchaser

    +
    +
    +
    +
    + +
    +
    +
    +
    -

    Funeral

    +
    +
    +
    +
    +

    Funeral

    +
    +
    +
    +
    + +
    +
    +
    +
    @@ -201,7 +214,11 @@

    Committal Type
    - <%= contract.committalType %> + <% if (contract.committalType === null) { %> + (No Committal Type) + <% } else { %> + <%= contract.committalType %> + <% } %>

    @@ -211,7 +228,20 @@
    -

    Purchaser

    +
    +
    +
    +
    +

    Purchaser

    +
    +
    +
    +
    + +
    +
    +
    +
    @@ -270,7 +300,7 @@
    - Export diff --git a/views/login.ejs b/views/login.ejs index d6cc2146..3e372ce7 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -17,7 +17,7 @@ -
    +