steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting 

- login page overflow
- make sure funeral home icons use fa-place-of-worship
pull/3/head
Dan Gowans 2025-03-28 15:03:42 -04:00
parent ee0e79b60a
commit 9bf4a2cfee
10 changed files with 203 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/contract.search.js
View File

@ -57,7 +57,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
contract.funeralHomeName !== '') { contract.funeralHomeName !== '') {
contactsHTML += `<li class="has-tooltip-left has-text-grey" contactsHTML += `<li class="has-tooltip-left has-text-grey"
data-tooltip="Funeral Home"> data-tooltip="Funeral Home">
<span class="fa-li"><i class="fas fa-church"></i></span> <span class="fa-li"><i class="fas fa-place-of-worship"></i></span>
${cityssm.escapeHTML(contract.funeralHomeName)} ${cityssm.escapeHTML(contract.funeralHomeName)}
</li>`; </li>`;
} }

2
public/javascripts/contract.search.ts
View File

@ -93,7 +93,7 @@ declare const exports: Record<string, unknown>
) { ) {
contactsHTML += `<li class="has-tooltip-left has-text-grey" contactsHTML += `<li class="has-tooltip-left has-text-grey"
data-tooltip="Funeral Home"> data-tooltip="Funeral Home">
<span class="fa-li"><i class="fas fa-church"></i></span> <span class="fa-li"><i class="fas fa-place-of-worship"></i></span>
${cityssm.escapeHTML(contract.funeralHomeName)} ${cityssm.escapeHTML(contract.funeralHomeName)}
</li>` </li>`
} }

2
public/javascripts/workOrder.search.js
View File

@ -45,7 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
relatedHTML += `<li class="has-tooltip-left" relatedHTML += `<li class="has-tooltip-left"
data-tooltip="Funeral Home"> data-tooltip="Funeral Home">
<span class="fa-li"> <span class="fa-li">
<i class="fas fa-fw fa-church"></i> <i class="fas fa-fw fa-place-of-worship"></i>
</span> </span>
${cityssm.escapeHTML(contract.funeralHomeName)} ${cityssm.escapeHTML(contract.funeralHomeName)}
</li>`; </li>`;

2
public/javascripts/workOrder.search.ts
View File

@ -82,7 +82,7 @@ declare const exports: Record<string, unknown>
relatedHTML += `<li class="has-tooltip-left" relatedHTML += `<li class="has-tooltip-left"
data-tooltip="Funeral Home"> data-tooltip="Funeral Home">
<span class="fa-li"> <span class="fa-li">
<i class="fas fa-fw fa-church"></i> <i class="fas fa-fw fa-place-of-worship"></i>
</span> </span>
${cityssm.escapeHTML(contract.funeralHomeName)} ${cityssm.escapeHTML(contract.funeralHomeName)}
</li>` </li>`

2
public/stylesheets/sunrise.css
View File

@ -30,7 +30,7 @@
#is-login-page { #is-login-page {
overflow: auto; overflow: auto;
background-position: top center; background-position: bottom center;
background-size: cover; background-size: cover;
} }

2
views/cemetery-edit.ejs
View File

@ -252,7 +252,7 @@
</a> </a>
</div> </div>
<div class="level-item"> <div class="level-item">
<a class="button is-small is-link has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download> <a class="button is-small has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
<span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span> <span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span>
<span>Export All</span> <span>Export All</span>
</a> </a>

266
views/cemetery-view.ejs
View File

@ -73,156 +73,158 @@
</div> </div>
<% } %> <% } %>
<div class="column"> <div class="column">
<strong>Address</strong><br /> <strong>Address</strong><br />
<% if (cemetery.cemeteryAddress1 !== "") { %> <% if (cemetery.cemeteryAddress1 !== "") { %>
<%= cemetery.cemeteryAddress1 %><br /> <%= cemetery.cemeteryAddress1 %><br />
<% } %> <% } %>
<% if (cemetery.cemeteryAddress2 !== "") { %> <% if (cemetery.cemeteryAddress2 !== "") { %>
<%= cemetery.cemeteryAddress2 %><br /> <%= cemetery.cemeteryAddress2 %><br />
<% } %> <% } %>
<%= cemetery.cemeteryCity %>, <%= cemetery.cemeteryProvince %><br /> <%= cemetery.cemeteryCity %>, <%= cemetery.cemeteryProvince %><br />
<%= cemetery.cemeteryPostalCode %> <%= cemetery.cemeteryPostalCode %>
</div> </div>
<% if (cemetery.cemeteryPhoneNumber !== "") { %> <% if (cemetery.cemeteryPhoneNumber !== "") { %>
<div class="column"> <div class="column">
<strong>Phone Number</strong><br /> <strong>Phone Number</strong><br />
<%= cemetery.cemeteryPhoneNumber %> <%= cemetery.cemeteryPhoneNumber %>
</div> </div>
<% } %> <% } %>
</div> </div>
</div> </div>
</div> </div>
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<div class="panel"> <div class="panel">
<h2 class="panel-heading">Geographic Location</h2> <h2 class="panel-heading">Geographic Location</h2>
<div class="panel-block is-block"> <div class="panel-block is-block">
<% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %> <% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %>
<div id="cemetery--leaflet" data-cemetery-latitude="<%= cemetery.cemeteryLatitude %>" data-cemetery-longitude="<%= cemetery.cemeteryLongitude %>" style="height:300px"></div> <div id="cemetery--leaflet" data-cemetery-latitude="<%= cemetery.cemeteryLatitude %>" data-cemetery-longitude="<%= cemetery.cemeteryLongitude %>" style="height:300px"></div>
<% } else { %> <% } else { %>
<div class="message is-info"> <div class="message is-info">
<p class="message-body">There are no geographic coordinates associated with this cemetery.</p> <p class="message-body">
</div> There are no geographic coordinates associated with this cemetery.
<% } %> </p>
</div> </div>
<% } %>
</div> </div>
</div> </div>
<div class="column"> </div>
<div class="panel"> <div class="column">
<h2 class="panel-heading">Image</h2> <div class="panel">
<div class="panel-block is-block"> <h2 class="panel-heading">Image</h2>
<% if (cemetery.cemeterySvg) { %> <div class="panel-block is-block">
<% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %> <% if (cemetery.cemeterySvg) { %>
<a class="image" href="<%= urlPrefix %>/internal/images/cemeteries/<%= cemetery.cemeterySvg %>" target="_blank"> <% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %>
<%- include('../public-internal/images/cemeteries/' + cemetery.cemeterySvg); -%> <a class="image" href="<%= urlPrefix %>/internal/images/cemeteries/<%= cemetery.cemeterySvg %>" target="_blank">
</a> <%- include('../public-internal/images/cemeteries/' + cemetery.cemeterySvg); -%>
<% } else { %> </a>
<div class="message is-info"> <% } else { %>
<p class="message-body">There are no image associated with this cemetery.</p> <div class="message is-info">
</div> <p class="message-body">There are no image associated with this cemetery.</p>
<% } %>
</div> </div>
</div> <% } %>
</div>
</div> </div>
</div>
</div> </div>
<% const burialSiteSearchUrl = urlPrefix + "/burialSites?cemeteryId=" + cemetery.cemeteryId; %> <% const burialSiteSearchUrl = urlPrefix + "/burialSites?cemeteryId=" + cemetery.cemeteryId; %>
<div class="panel"> <div class="panel">
<div class="panel-heading"> <div class="panel-heading">
<div class="level is-mobile"> <div class="level is-mobile">
<div class="level-left"> <div class="level-left">
<div class="level-item"> <div class="level-item">
<h2 class="title is-5 has-text-weight-bold has-text-white"> <h2 class="title is-5 has-text-weight-bold has-text-white">
Burial Site Summaries Burial Site Summaries
<a class="tag is-link ml-2" href="<%= burialSiteSearchUrl %>"> <a class="tag is-link ml-2" href="<%= burialSiteSearchUrl %>">
<%= cemetery.burialSiteCount %> <%= cemetery.burialSiteCount %>
</a> </a>
</h2> </h2>
</div>
</div>
<div class="level-right">
<div class="level-item">
<a class="button is-small is-link has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
<span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span>
<span>Export All</span>
</a>
</div>
</div>
</div> </div>
</div>
<div class="level-right">
<div class="level-item">
<a class="button is-small has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
<span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span>
<span>Export All</span>
</a>
</div>
</div>
</div> </div>
<div class="panel-block is-block"> </div>
<% if (cemetery.burialSiteCount === 0) { %> <div class="panel-block is-block">
<div class="message is-info"> <% if (cemetery.burialSiteCount === 0) { %>
<p class="message-body"> <div class="message is-info">
There are no burial sites associated with this cemetery. <p class="message-body">
</p> There are no burial sites associated with this cemetery.
</div> </p>
<% } else { %> </div>
<div class="columns"> <% } else { %>
<div class="column"> <div class="columns">
<table class="table is-fullwidth is-striped is-hoverable"> <div class="column">
<thead> <table class="table is-fullwidth is-striped is-hoverable">
<tr> <thead>
<th>Type</th> <tr>
<th class="has-text-right"> <th>Type</th>
Burial Site Count <th class="has-text-right">
</th> Burial Site Count
<th class="has-text-right">Percentage</th> </th>
</tr> <th class="has-text-right">Percentage</th>
</thead> </tr>
<tbody> </thead>
<% for (const burialSiteType of burialSiteTypeSummary) { %> <tbody>
<tr> <% for (const burialSiteType of burialSiteTypeSummary) { %>
<td> <tr>
<a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteTypeId=<%= burialSiteType.burialSiteTypeId %>"> <td>
<%= burialSiteType.burialSiteType %> <a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteTypeId=<%= burialSiteType.burialSiteTypeId %>">
</a> <%= burialSiteType.burialSiteType %>
</td> </a>
<td class="has-text-right"> </td>
<%= burialSiteType.burialSiteCount %> <td class="has-text-right">
</td> <%= burialSiteType.burialSiteCount %>
<td class="has-text-right"> </td>
<%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% <td class="has-text-right">
</td> <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>%
</tr> </td>
<% } %> </tr>
</tbody> <% } %>
</table> </tbody>
</div> </table>
<div class="column"> </div>
<table class="table is-fullwidth is-striped is-hoverable"> <div class="column">
<thead> <table class="table is-fullwidth is-striped is-hoverable">
<tr> <thead>
<th>Status</th> <tr>
<th class="has-text-right"> <th>Status</th>
Burial Site Count <th class="has-text-right">
</th> Burial Site Count
<th class="has-text-right">Percentage</th> </th>
</tr> <th class="has-text-right">Percentage</th>
</thead> </tr>
<tbody> </thead>
<% for (const burialSiteStatus of burialSiteStatusSummary) { %> <tbody>
<tr> <% for (const burialSiteStatus of burialSiteStatusSummary) { %>
<td> <tr>
<a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteStatusId=<%= burialSiteStatus.burialSiteStatusId %>"> <td>
<%= burialSiteStatus.burialSiteStatus %> <a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteStatusId=<%= burialSiteStatus.burialSiteStatusId %>">
</a> <%= burialSiteStatus.burialSiteStatus %>
</td> </a>
<td class="has-text-right"> </td>
<%= burialSiteStatus.burialSiteCount %> <td class="has-text-right">
</td> <%= burialSiteStatus.burialSiteCount %>
<td class="has-text-right"> </td>
<%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>% <td class="has-text-right">
</td> <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>%
</tr> </td>
<% } %> </tr>
</tbody> <% } %>
</table> </tbody>
</div> </table>
</div> </div>
<% } %> </div>
</div> <% } %>
</div>
</div> </div>
<%- include('_footerA'); -%> <%- include('_footerA'); -%>

30
views/contract-edit.ejs
View File

@ -322,7 +322,20 @@
</div> </div>
<div class="panel"> <div class="panel">
<h2 class="panel-heading">Funeral</h2> <div class="panel-heading">
<div class="level is-mobile">
<div class="level-left">
<div class="level-item">
<h2 class="has-text-weight-bold">Funeral</h2>
</div>
</div>
<div class="level-right">
<div class="level-item">
<i class="fas fa-place-of-worship" aria-hidden="true"></i>
</div>
</div>
</div>
</div>
<div class="panel-block is-block"> <div class="panel-block is-block">
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
@ -425,7 +438,20 @@
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<div class="panel"> <div class="panel">
<h2 class="panel-heading">Purchaser</h2> <div class="panel-heading">
<div class="level is-mobile">
<div class="level-left">
<div class="level-item">
<h2 class="has-text-weight-bold is-size-5">Purchaser</h2>
</div>
</div>
<div class="level-right">
<div class="level-item">
<i class="fas fa-hand-holding-dollar" aria-hidden="true"></i>
</div>
</div>
</div>
</div>
<div class="panel-block is-block"> <div class="panel-block is-block">
<div class="field"> <div class="field">
<label class="label" for="contract--purchaserName"> <label class="label" for="contract--purchaserName">

38
views/contract-view.ejs
View File

@ -144,7 +144,20 @@
</div> </div>
<div class="panel"> <div class="panel">
<h2 class="panel-heading">Funeral</h2> <div class="panel-heading">
<div class="level is-mobile">
<div class="level-left">
<div class="level-item">
<h2 class="has-text-weight-bold">Funeral</h2>
</div>
</div>
<div class="level-right">
<div class="level-item">
<i class="fas fa-place-of-worship" aria-hidden="true"></i>
</div>
</div>
</div>
</div>
<div class="panel-block is-block"> <div class="panel-block is-block">
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
@ -201,7 +214,11 @@
</div> </div>
<p> <p>
<strong>Committal Type</strong><br /> <strong>Committal Type</strong><br />
<%= contract.committalType %> <% if (contract.committalType === null) { %>
<span class="has-text-grey">(No Committal Type)</span>
<% } else { %>
<%= contract.committalType %>
<% } %>
</p> </p>
</div> </div>
</div> </div>
@ -211,7 +228,20 @@
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<div class="panel"> <div class="panel">
<h2 class="panel-heading">Purchaser</h2> <div class="panel-heading">
<div class="level is-mobile">
<div class="level-left">
<div class="level-item">
<h2 class="has-text-weight-bold is-size-5">Purchaser</h2>
</div>
</div>
<div class="level-right">
<div class="level-item">
<i class="fas fa-hand-holding-dollar" aria-hidden="true"></i>
</div>
</div>
</div>
</div>
<div class="panel-block is-block"> <div class="panel-block is-block">
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
@ -270,7 +300,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item"> <div class="level-item">
<a class="button is-link is-small is-hidden-print has-text-weight-normal" <a class="button is-small is-hidden-print has-text-weight-normal"
href="<%= urlPrefix %>/reports/contractInterments-byContractId/?contractId=<%= contract.contractId %>" target="_blank" download> href="<%= urlPrefix %>/reports/contractInterments-byContractId/?contractId=<%= contract.contractId %>" target="_blank" download>
<span class="icon is-small"><i class="fas fa-download" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-download" aria-hidden="true"></i></span>
<span>Export</span> <span>Export</span>

2
views/login.ejs
View File

@ -17,7 +17,7 @@
</head> </head>
<body> <body>
<div class="columns is-vcentered is-centered has-min-page-height is-marginless"> <div class="columns is-vcentered is-centered has-min-page-height mx-0 my-0">
<div class="column is-half-widescreen is-two-thirds-desktop is-three-quarters-tablet"> <div class="column is-half-widescreen is-two-thirds-desktop is-three-quarters-tablet">
<main class="box mx-3 my-3"> <main class="box mx-3 my-3">
<div class="columns is-vcentered"> <div class="columns is-vcentered">