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

polish

pull/11/head
Dan Gowans 2025-04-02 11:34:17 -04:00
parent ed96a35c94
commit 11a78a9bc5
18 changed files with 115 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/javascripts/cemetery.search.js
View File

@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
const cemeteries = exports.cemeteries; const cemeteries = exports.cemeteries;
const searchFilterElement = document.querySelector('#searchFilter--cemetery'); const searchFilterElement = document.querySelector('#searchFilter--cemetery');
const searchResultsContainerElement = document.querySelector('#container--searchResults'); const searchResultsContainerElement = document.querySelector('#container--searchResults');
// eslint-disable-next-line complexity
function renderResults() { function renderResults() {
// eslint-disable-next-line no-unsanitized/property // eslint-disable-next-line no-unsanitized/property
searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML("Loading Cemeteries..."); searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML('Loading Cemeteries...');
let searchResultCount = 0; let searchResultCount = 0;
const searchResultsTbodyElement = document.createElement('tbody'); const searchResultsTbodyElement = document.createElement('tbody');
const filterStringSplit = searchFilterElement.value const filterStringSplit = searchFilterElement.value
@ -16,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
.toLowerCase() .toLowerCase()
.split(' '); .split(' ');
for (const cemetery of cemeteries) { for (const cemetery of cemeteries) {
const cemeterySearchString = `${cemetery.cemeteryName ?? ''} ${cemetery.cemeteryDescription ?? ''} ${cemetery.cemeteryAddress1 ?? ''} ${cemetery.cemeteryAddress2 ?? ''}`.toLowerCase(); const cemeterySearchString = `${cemetery.cemeteryName} ${cemetery.cemeteryDescription} ${cemetery.cemeteryAddress1} ${cemetery.cemeteryAddress2}`.toLowerCase();
let showCemetery = true; let showCemetery = true;
for (const filterStringPiece of filterStringSplit) { for (const filterStringPiece of filterStringSplit) {
if (!cemeterySearchString.includes(filterStringPiece)) { if (!cemeterySearchString.includes(filterStringPiece)) {
@ -32,26 +31,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
searchResultsTbodyElement.insertAdjacentHTML('beforeend', `<tr> searchResultsTbodyElement.insertAdjacentHTML('beforeend', `<tr>
<td> <td>
<a class="has-text-weight-bold" href="${sunrise.getCemeteryURL(cemetery.cemeteryId)}"> <a class="has-text-weight-bold" href="${sunrise.getCemeteryURL(cemetery.cemeteryId)}">
${cityssm.escapeHTML((cemetery.cemeteryName ?? '') === '' ? '(No Name)' : cemetery.cemeteryName ?? '')} ${cityssm.escapeHTML(cemetery.cemeteryName === ''
? '(No Name)'
: cemetery.cemeteryName)}
</a><br /> </a><br />
<span class="is-size-7"> <span class="is-size-7">
${cityssm.escapeHTML(cemetery.cemeteryDescription ?? '')} ${cityssm.escapeHTML(cemetery.cemeteryDescription)}
</span> </span>
</td><td> </td><td>
${(cemetery.cemeteryAddress1 ?? '') === '' ${cemetery.cemeteryAddress1 === ''
? '' ? ''
: `${cityssm.escapeHTML(cemetery.cemeteryAddress1 ?? '')}<br />`} : `${cityssm.escapeHTML(cemetery.cemeteryAddress1)}<br />`}
${(cemetery.cemeteryAddress2 ?? '') === '' ${cemetery.cemeteryAddress2 === ''
? '' ? ''
: `${cityssm.escapeHTML(cemetery.cemeteryAddress2 ?? '')}<br />`} : `${cityssm.escapeHTML(cemetery.cemeteryAddress2)}<br />`}
${cemetery.cemeteryCity || cemetery.cemeteryProvince ${cemetery.cemeteryCity !== '' || cemetery.cemeteryProvince !== ''
? `${cityssm.escapeHTML(cemetery.cemeteryCity ?? '')}, ${cityssm.escapeHTML(cemetery.cemeteryProvince ?? '')}<br />` ? `<span class="is-size-7">
${cityssm.escapeHTML(cemetery.cemeteryCity)}, ${cityssm.escapeHTML(cemetery.cemeteryProvince)}
</span>`
: ''} : ''}
${(cemetery.cemeteryPostalCode ?? '') === ''
? ''
: cityssm.escapeHTML(cemetery.cemeteryPostalCode ?? '')}
</td><td> </td><td>
${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber ?? '')} ${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber)}
</td><td class="has-text-centered"> </td><td class="has-text-centered">
${cemetery.cemeteryLatitude && cemetery.cemeteryLongitude ${cemetery.cemeteryLatitude && cemetery.cemeteryLongitude
? `<span data-tooltip="Has Geographic Coordinates"> ? `<span data-tooltip="Has Geographic Coordinates">

36
public/javascripts/cemetery.search.ts
View File

@ -20,11 +20,10 @@ declare const exports: Record<string, unknown>
'#container--searchResults' '#container--searchResults'
) as HTMLElement ) as HTMLElement
// eslint-disable-next-line complexity
function renderResults(): void { function renderResults(): void {
// eslint-disable-next-line no-unsanitized/property // eslint-disable-next-line no-unsanitized/property
searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML( searchResultsContainerElement.innerHTML = sunrise.getLoadingParagraphHTML(
"Loading Cemeteries..." 'Loading Cemeteries...'
) )
let searchResultCount = 0 let searchResultCount = 0
@ -36,9 +35,9 @@ declare const exports: Record<string, unknown>
.split(' ') .split(' ')
for (const cemetery of cemeteries) { for (const cemetery of cemeteries) {
const cemeterySearchString = `${cemetery.cemeteryName ?? ''} ${ const cemeterySearchString = `${cemetery.cemeteryName} ${
cemetery.cemeteryDescription ?? '' cemetery.cemeteryDescription
} ${cemetery.cemeteryAddress1 ?? ''} ${cemetery.cemeteryAddress2 ?? ''}`.toLowerCase() } ${cemetery.cemeteryAddress1} ${cemetery.cemeteryAddress2}`.toLowerCase()
let showCemetery = true let showCemetery = true
@ -62,35 +61,34 @@ declare const exports: Record<string, unknown>
<td> <td>
<a class="has-text-weight-bold" href="${sunrise.getCemeteryURL(cemetery.cemeteryId)}"> <a class="has-text-weight-bold" href="${sunrise.getCemeteryURL(cemetery.cemeteryId)}">
${cityssm.escapeHTML( ${cityssm.escapeHTML(
(cemetery.cemeteryName ?? '') === '' ? '(No Name)' : cemetery.cemeteryName ?? '' cemetery.cemeteryName === ''
? '(No Name)'
: cemetery.cemeteryName
)} )}
</a><br /> </a><br />
<span class="is-size-7"> <span class="is-size-7">
${cityssm.escapeHTML(cemetery.cemeteryDescription ?? '')} ${cityssm.escapeHTML(cemetery.cemeteryDescription)}
</span> </span>
</td><td> </td><td>
${ ${
(cemetery.cemeteryAddress1 ?? '') === '' cemetery.cemeteryAddress1 === ''
? '' ? ''
: `${cityssm.escapeHTML(cemetery.cemeteryAddress1 ?? '')}<br />` : `${cityssm.escapeHTML(cemetery.cemeteryAddress1)}<br />`
} }
${ ${
(cemetery.cemeteryAddress2 ?? '') === '' cemetery.cemeteryAddress2 === ''
? '' ? ''
: `${cityssm.escapeHTML(cemetery.cemeteryAddress2 ?? '')}<br />` : `${cityssm.escapeHTML(cemetery.cemeteryAddress2)}<br />`
} }
${ ${
cemetery.cemeteryCity || cemetery.cemeteryProvince cemetery.cemeteryCity !== '' || cemetery.cemeteryProvince !== ''
? `${cityssm.escapeHTML(cemetery.cemeteryCity ?? '')}, ${cityssm.escapeHTML(cemetery.cemeteryProvince ?? '')}<br />` ? `<span class="is-size-7">
${cityssm.escapeHTML(cemetery.cemeteryCity)}, ${cityssm.escapeHTML(cemetery.cemeteryProvince)}
</span>`
: '' : ''
} }
${
(cemetery.cemeteryPostalCode ?? '') === ''
? ''
: cityssm.escapeHTML(cemetery.cemeteryPostalCode ?? '')
}
</td><td> </td><td>
${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber ?? '')} ${cityssm.escapeHTML(cemetery.cemeteryPhoneNumber)}
</td><td class="has-text-centered"> </td><td class="has-text-centered">
${ ${
cemetery.cemeteryLatitude && cemetery.cemeteryLongitude cemetery.cemeteryLatitude && cemetery.cemeteryLongitude

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

@ -132,7 +132,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
<span>Edit</span> <span>Edit</span>
</button> </button>
<button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete"> <button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete">
<i class="fas fa-trash" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
</button> </button>
</div> </div>
</td>`; </td>`;

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

@ -211,7 +211,7 @@ declare const exports: Record<string, unknown>
<span>Edit</span> <span>Edit</span>
</button> </button>
<button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete"> <button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete">
<i class="fas fa-trash" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
</button> </button>
</div> </div>
</td>` </td>`

8
public/javascripts/contract.editFees.js
View File

@ -158,7 +158,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
</button>` </button>`
: ''} : ''}
<button class="button is-danger is-light button--delete" data-tooltip="Delete Fee" type="button"> <button class="button is-danger is-light button--delete" data-tooltip="Delete Fee" type="button">
<i class="fas fa-trash" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
</button> </button>
</div> </div>
</td>`; </td>`;
@ -289,7 +289,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
categoryContainerElement.innerHTML = `<div class="columns is-vcentered"> categoryContainerElement.innerHTML = `<div class="columns is-vcentered">
<div class="column"> <div class="column">
<h4 class="title is-5"> <h4 class="title is-5">
${cityssm.escapeHTML(feeCategory.feeCategory ?? '')} ${cityssm.escapeHTML(feeCategory.feeCategory)}
</h4> </h4>
</div> </div>
</div> </div>
@ -315,7 +315,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
continue; continue;
} }
let includeFee = true; let includeFee = true;
const feeSearchString = `${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase(); const feeSearchString = `${feeCategory.feeCategory} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase();
for (const filterStringPiece of filterStringPieces) { for (const filterStringPiece of filterStringPieces) {
if (!feeSearchString.includes(filterStringPiece)) { if (!feeSearchString.includes(filterStringPiece)) {
includeFee = false; includeFee = false;
@ -535,7 +535,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
<span>Edit</span> <span>Edit</span>
</button> </button>
<button class="button is-danger is-light button--delete" data-tooltip="Delete Transaction" type="button"> <button class="button is-danger is-light button--delete" data-tooltip="Delete Transaction" type="button">
<i class="fas fa-trash" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
</button> </button>
</div> </div>
</td>`; </td>`;

9
public/javascripts/contract.editFees.ts
View File

@ -248,7 +248,7 @@ declare const exports: Record<string, unknown>
: '' : ''
} }
<button class="button is-danger is-light button--delete" data-tooltip="Delete Fee" type="button"> <button class="button is-danger is-light button--delete" data-tooltip="Delete Fee" type="button">
<i class="fas fa-trash" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
</button> </button>
</div> </div>
</td>` </td>`
@ -458,7 +458,7 @@ declare const exports: Record<string, unknown>
categoryContainerElement.innerHTML = `<div class="columns is-vcentered"> categoryContainerElement.innerHTML = `<div class="columns is-vcentered">
<div class="column"> <div class="column">
<h4 class="title is-5"> <h4 class="title is-5">
${cityssm.escapeHTML(feeCategory.feeCategory ?? '')} ${cityssm.escapeHTML(feeCategory.feeCategory)}
</h4> </h4>
</div> </div>
</div> </div>
@ -498,7 +498,7 @@ declare const exports: Record<string, unknown>
let includeFee = true let includeFee = true
const feeSearchString = const feeSearchString =
`${feeCategory.feeCategory ?? ''} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase() `${feeCategory.feeCategory} ${fee.feeName ?? ''} ${fee.feeDescription ?? ''}`.toLowerCase()
for (const filterStringPiece of filterStringPieces) { for (const filterStringPiece of filterStringPieces) {
if (!feeSearchString.includes(filterStringPiece)) { if (!feeSearchString.includes(filterStringPiece)) {
@ -687,7 +687,6 @@ declare const exports: Record<string, unknown>
}, },
onshown(modalElement, closeModalFunction) { onshown(modalElement, closeModalFunction) {
bulmaJS.toggleHtmlClipped() bulmaJS.toggleHtmlClipped()
;( ;(
modalElement.querySelector( modalElement.querySelector(
'#contractTransactionEdit--transactionAmount' '#contractTransactionEdit--transactionAmount'
@ -837,7 +836,7 @@ declare const exports: Record<string, unknown>
<span>Edit</span> <span>Edit</span>
</button> </button>
<button class="button is-danger is-light button--delete" data-tooltip="Delete Transaction" type="button"> <button class="button is-danger is-light button--delete" data-tooltip="Delete Transaction" type="button">
<i class="fas fa-trash" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
</button> </button>
</div> </div>
</td>` </td>`

8
public/javascripts/fees.admin.js
View File

@ -31,7 +31,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
feeCategoryContainerElement.innerHTML = `<div class="panel-heading"> feeCategoryContainerElement.innerHTML = `<div class="panel-heading">
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<h2 class="title is-5 has-text-white mb-2">${cityssm.escapeHTML(feeCategory.feeCategory)}</h2> <h2 class="title is-5 has-text-white mb-2">
${cityssm.escapeHTML(feeCategory.feeCategory)}
</h2>
${feeCategory.isGroupedFee ${feeCategory.isGroupedFee
? '<span class="tag">Grouped Fee</span>' ? '<span class="tag">Grouped Fee</span>'
: ''} : ''}
@ -93,7 +95,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
panelBlockElement.innerHTML = `<div class="columns"> panelBlockElement.innerHTML = `<div class="columns">
<div class="column is-half"> <div class="column is-half">
<p> <p>
<a class="has-text-weight-bold a--editFee" href="#">${cityssm.escapeHTML(fee.feeName ?? '')}</a><br /> <a class="has-text-weight-bold a--editFee" href="#">
${cityssm.escapeHTML(fee.feeName ?? '')}
</a><br />
<small> <small>
${cityssm ${cityssm
.escapeHTML(fee.feeDescription ?? '') .escapeHTML(fee.feeDescription ?? '')

12
public/javascripts/fees.admin.ts
View File

@ -75,7 +75,9 @@ declare const exports: Record<string, unknown>
feeCategoryContainerElement.innerHTML = `<div class="panel-heading"> feeCategoryContainerElement.innerHTML = `<div class="panel-heading">
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<h2 class="title is-5 has-text-white mb-2">${cityssm.escapeHTML(feeCategory.feeCategory)}</h2> <h2 class="title is-5 has-text-white mb-2">
${cityssm.escapeHTML(feeCategory.feeCategory)}
</h2>
${ ${
feeCategory.isGroupedFee feeCategory.isGroupedFee
? '<span class="tag">Grouped Fee</span>' ? '<span class="tag">Grouped Fee</span>'
@ -156,7 +158,9 @@ declare const exports: Record<string, unknown>
panelBlockElement.innerHTML = `<div class="columns"> panelBlockElement.innerHTML = `<div class="columns">
<div class="column is-half"> <div class="column is-half">
<p> <p>
<a class="has-text-weight-bold a--editFee" href="#">${cityssm.escapeHTML(fee.feeName ?? '')}</a><br /> <a class="has-text-weight-bold a--editFee" href="#">
${cityssm.escapeHTML(fee.feeName ?? '')}
</a><br />
<small> <small>
${cityssm ${cityssm
.escapeHTML(fee.feeDescription ?? '') .escapeHTML(fee.feeDescription ?? '')
@ -323,6 +327,7 @@ declare const exports: Record<string, unknown>
.querySelector('form') .querySelector('form')
?.addEventListener('submit', doAddFeeCategory) ?.addEventListener('submit', doAddFeeCategory)
}, },
onremoved() { onremoved() {
bulmaJS.toggleHtmlClipped() bulmaJS.toggleHtmlClipped()
;( ;(
@ -407,6 +412,7 @@ declare const exports: Record<string, unknown>
) as HTMLInputElement ) as HTMLInputElement
).focus() ).focus()
}, },
onremoved() { onremoved() {
bulmaJS.toggleHtmlClipped() bulmaJS.toggleHtmlClipped()
} }
@ -653,6 +659,7 @@ declare const exports: Record<string, unknown>
).value === '' ).value === ''
}) })
}, },
onremoved() { onremoved() {
bulmaJS.toggleHtmlClipped() bulmaJS.toggleHtmlClipped()
} }
@ -1011,6 +1018,7 @@ declare const exports: Record<string, unknown>
.querySelector('.button--deleteFee') .querySelector('.button--deleteFee')
?.addEventListener('click', confirmDeleteFee) ?.addEventListener('click', confirmDeleteFee)
}, },
onremoved() { onremoved() {
bulmaJS.toggleHtmlClipped() bulmaJS.toggleHtmlClipped()
} }

4
public/javascripts/workOrder.editRelated.js
View File

@ -127,7 +127,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
: '<i class="fas fa-stop" title="Previous Contract"></i>'} : '<i class="fas fa-stop" title="Previous Contract"></i>'}
</td><td> </td><td>
<a class="has-text-weight-bold" href="${sunrise.getContractURL(contract.contractId)}"> <a class="has-text-weight-bold" href="${sunrise.getContractURL(contract.contractId)}">
${cityssm.escapeHTML(contract.contractType ?? '')} ${cityssm.escapeHTML(contract.contractType)}
</a><br /> </a><br />
<span class="is-size-7">#${contract.contractId}</span> <span class="is-size-7">#${contract.contractId}</span>
</td>`; </td>`;
@ -410,7 +410,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
? 'Recipients' ? 'Recipients'
: 'Deceased')}) : 'Deceased')})
</span>` </span>`
: cityssm.escapeHTML(contract.contractInterments[0].deceasedName) + : cityssm.escapeHTML(contract.contractInterments[0].deceasedName ?? '') +
(contract.contractInterments.length > 1 (contract.contractInterments.length > 1
? ` plus ? ` plus
${(contract.contractInterments.length - 1).toString()}` ${(contract.contractInterments.length - 1).toString()}`

4
public/javascripts/workOrder.editRelated.ts
View File

@ -212,7 +212,7 @@ declare const exports: Record<string, unknown>
} }
</td><td> </td><td>
<a class="has-text-weight-bold" href="${sunrise.getContractURL(contract.contractId)}"> <a class="has-text-weight-bold" href="${sunrise.getContractURL(contract.contractId)}">
${cityssm.escapeHTML(contract.contractType ?? '')} ${cityssm.escapeHTML(contract.contractType)}
</a><br /> </a><br />
<span class="is-size-7">#${contract.contractId}</span> <span class="is-size-7">#${contract.contractId}</span>
</td>` </td>`
@ -635,7 +635,7 @@ declare const exports: Record<string, unknown>
)}) )})
</span>` </span>`
: cityssm.escapeHTML( : cityssm.escapeHTML(
contract.contractInterments![0].deceasedName contract.contractInterments![0].deceasedName ?? ''
) + ) +
(contract.contractInterments!.length > 1 (contract.contractInterments!.length > 1
? ` plus ? ` plus

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

@ -34,7 +34,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
for (const contract of workOrder.workOrderContracts ?? []) { for (const contract of workOrder.workOrderContracts ?? []) {
for (const interment of contract.contractInterments ?? []) { for (const interment of contract.contractInterments ?? []) {
relatedHTML += `<li class="has-tooltip-left" relatedHTML += `<li class="has-tooltip-left"
data-tooltip="${cityssm.escapeHTML(contract.isPreneed ?? false ? 'Recipient' : 'Deceased')}"> data-tooltip="${cityssm.escapeHTML(contract.isPreneed ? 'Recipient' : 'Deceased')}">
<span class="fa-li"> <span class="fa-li">
<i class="fas fa-fw fa-user"></i> <i class="fas fa-fw fa-user"></i>
</span> </span>

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

@ -69,7 +69,7 @@ declare const exports: Record<string, unknown>
for (const interment of contract.contractInterments ?? []) { for (const interment of contract.contractInterments ?? []) {
relatedHTML += `<li class="has-tooltip-left" relatedHTML += `<li class="has-tooltip-left"
data-tooltip="${cityssm.escapeHTML( data-tooltip="${cityssm.escapeHTML(
contract.isPreneed ?? false ? 'Recipient' : 'Deceased' contract.isPreneed ? 'Recipient' : 'Deceased'
)}"> )}">
<span class="fa-li"> <span class="fa-li">
<i class="fas fa-fw fa-user"></i> <i class="fas fa-fw fa-user"></i>

18
types/recordTypes.d.ts vendored
View File

@ -64,18 +64,18 @@ export interface BurialSiteTypeField extends Record {
} }
export interface Cemetery extends Record { export interface Cemetery extends Record {
cemeteryId?: number; cemeteryId?: number;
cemeteryDescription?: string; cemeteryDescription: string;
cemeteryKey?: string; cemeteryKey: string;
cemeteryName?: string; cemeteryName: string;
cemeteryLatitude?: number; cemeteryLatitude?: number;
cemeteryLongitude?: number; cemeteryLongitude?: number;
cemeterySvg?: string; cemeterySvg?: string;
cemeteryAddress1?: string; cemeteryAddress1: string;
cemeteryAddress2?: string; cemeteryAddress2: string;
cemeteryCity?: string; cemeteryCity: string;
cemeteryPostalCode?: string; cemeteryPostalCode: string;
cemeteryProvince?: string; cemeteryProvince: string;
cemeteryPhoneNumber?: string; cemeteryPhoneNumber: string;
burialSiteCount?: number; burialSiteCount?: number;
} }
export interface CommittalType extends Record { export interface CommittalType extends Record {

18
types/recordTypes.ts
View File

@ -90,21 +90,21 @@ export interface BurialSiteTypeField extends Record {
export interface Cemetery extends Record { export interface Cemetery extends Record {
cemeteryId?: number cemeteryId?: number
cemeteryDescription?: string cemeteryDescription: string
cemeteryKey?: string cemeteryKey: string
cemeteryName?: string cemeteryName: string
cemeteryLatitude?: number cemeteryLatitude?: number
cemeteryLongitude?: number cemeteryLongitude?: number
cemeterySvg?: string cemeterySvg?: string
cemeteryAddress1?: string cemeteryAddress1: string
cemeteryAddress2?: string cemeteryAddress2: string
cemeteryCity?: string cemeteryCity: string
cemeteryPostalCode?: string cemeteryPostalCode: string
cemeteryProvince?: string cemeteryProvince: string
cemeteryPhoneNumber?: string cemeteryPhoneNumber: string
burialSiteCount?: number burialSiteCount?: number
} }

50
views/contract-edit.ejs
View File

@ -43,13 +43,11 @@
</h1> </h1>
<% } %> <% } %>
<div class="columns is-vecentered is-fixed-bottom has-background-white has-shadow is-hidden-print"> <div class="columns is-vcentered is-fixed-bottom has-background-white has-shadow is-hidden-print">
<div class="column"> <div class="column has-text-weight-bold">
<% if (!isCreate) { %> <% if (!isCreate) { %>
<span class="has-text-weight-bold"> Contract #<%= contract.contractId %>:
Contract #<%= contract.contractId %>: <%= contract.burialSiteName || ("(No Burial Site)") %>
<%= contract.burialSiteName || ("(No Burial Site)") %>
</span>
<% } %> <% } %>
</div> </div>
<div class="column is-narrow has-text-right"> <div class="column is-narrow has-text-right">
@ -70,7 +68,7 @@
</a> </a>
</div> </div>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div class="dropdown-content"> <div class="dropdown-content has-text-left">
<% for (const printName of contractTypePrints) { %> <% for (const printName of contractTypePrints) { %>
<% const printConfig = printFunctions.getPrintConfig(printName); %> <% const printConfig = printFunctions.getPrintConfig(printName); %>
<% if (printConfig) { %> <% if (printConfig) { %>
@ -103,7 +101,7 @@
</button> </button>
</div> </div>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div class="dropdown-content"> <div class="dropdown-content has-text-left">
<a class="dropdown-item" id="button--copyContract" href="#"> <a class="dropdown-item" id="button--copyContract" href="#">
<span class="icon"><i class="far fa-copy" aria-hidden="true"></i></span> <span class="icon"><i class="far fa-copy" aria-hidden="true"></i></span>
<span>Copy Contract as New</span> <span>Copy Contract as New</span>
@ -464,17 +462,15 @@
<input class="input" id="contract--purchaserAddress2" name="purchaserAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" value="<%= contract.purchaserAddress2 %>" /> <input class="input" id="contract--purchaserAddress2" name="purchaserAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" value="<%= contract.purchaserAddress2 %>" />
</div> </div>
</div> </div>
<div class="columns"> <div class="field">
<div class="column"> <label class="label" for="contract--purchaserCity">City</label>
<div class="field"> <div class="control">
<label class="label" for="contract--purchaserCity">City</label> <input class="input" id="contract--purchaserCity" name="purchaserCity" type="text" maxlength="20"
<div class="control"> value="<%= contract.purchaserCity %>"
<input class="input" id="contract--purchaserCity" name="purchaserCity" type="text" maxlength="20" list="datalist--cityDefault" />
value="<%= contract.purchaserCity %>"
list="datalist--cityDefault" />
</div>
</div>
</div> </div>
</div>
<div class="columns">
<div class="column"> <div class="column">
<div class="field"> <div class="field">
<label class="label" for="contract--purchaserProvince">Province</label> <label class="label" for="contract--purchaserProvince">Province</label>
@ -575,17 +571,15 @@
<input class="input" id="contract--deceasedAddress2" name="deceasedAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" value="<%= contract.deceasedAddress2 %>" /> <input class="input" id="contract--deceasedAddress2" name="deceasedAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" value="<%= contract.deceasedAddress2 %>" />
</div> </div>
</div> </div>
<div class="columns"> <div class="field">
<div class="column"> <label class="label" for="contract--deceasedCity">City</label>
<div class="field"> <div class="control">
<label class="label" for="contract--deceasedCity">City</label> <input class="input" id="contract--deceasedCity" name="deceasedCity" type="text" maxlength="20"
<div class="control"> value="<%= contract.deceasedCity %>"
<input class="input" id="contract--deceasedCity" name="deceasedCity" type="text" maxlength="20" list="datalist--cityDefault" />
value="<%= contract.deceasedCity %>"
list="datalist--cityDefault" />
</div>
</div>
</div> </div>
</div>
<div class="columns">
<div class="column"> <div class="column">
<div class="field"> <div class="field">
<label class="label" for="contract--deceasedProvince">Province</label> <label class="label" for="contract--deceasedProvince">Province</label>

8
views/contract-view.ejs
View File

@ -53,7 +53,7 @@
</a> </a>
</div> </div>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div class="dropdown-content"> <div class="dropdown-content has-text-left">
<% for (const printName of contractTypePrints) { %> <% for (const printName of contractTypePrints) { %>
<% const printConfig = printFunctions.getPrintConfig(printName); %> <% const printConfig = printFunctions.getPrintConfig(printName); %>
<% if (printConfig) { %> <% if (printConfig) { %>
@ -160,7 +160,11 @@
<div class="column"> <div class="column">
<p> <p>
<strong>Funeral Home</strong><br /> <strong>Funeral Home</strong><br />
<%= contract.funeralHomeName %><br /> <% if (contract.funeralHomeName === null) { %>
<span class="has-text-grey">(No Funeral Home)</span>
<% } else { %>
<%= contract.funeralHomeName %>
<% } %><br />
<span class="is-size-7"> <span class="is-size-7">
<% if (contract.funeralHomeAddress1) { %> <% if (contract.funeralHomeAddress1) { %>
<%= contract.funeralHomeAddress1 %><br /> <%= contract.funeralHomeAddress1 %><br />

8
views/workOrder-edit.ejs
View File

@ -67,7 +67,7 @@
</button> </button>
</div> </div>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div class="dropdown-content"> <div class="dropdown-content has-text-left">
<% for (const printName of configFunctions.getConfigProperty("settings.workOrders.prints")) { %> <% for (const printName of configFunctions.getConfigProperty("settings.workOrders.prints")) { %>
<% const printConfig = printFunctions.getPrintConfig(printName); %> <% const printConfig = printFunctions.getPrintConfig(printName); %>
<% if (printConfig) { %> <% if (printConfig) { %>
@ -98,7 +98,7 @@
</button> </button>
</div> </div>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div class="dropdown-content"> <div class="dropdown-content has-text-left">
<a class="dropdown-item" id="button--deleteWorkOrder" href="#"> <a class="dropdown-item" id="button--deleteWorkOrder" href="#">
<span class="icon is-small"> <span class="icon is-small">
<i class="fas fa-trash has-text-danger" aria-hidden="true"></i> <i class="fas fa-trash has-text-danger" aria-hidden="true"></i>
@ -120,7 +120,7 @@
</div> </div>
</div> </div>
<div class="columns"> <div class="columns is-multiline">
<div class="column"> <div class="column">
<form id="form--workOrderEdit"> <form id="form--workOrderEdit">
<input id="workOrderEdit--workOrderId" name="workOrderId" type="hidden" value="<%= workOrder.workOrderId %>" /> <input id="workOrderEdit--workOrderId" name="workOrderId" type="hidden" value="<%= workOrder.workOrderId %>" />
@ -278,7 +278,7 @@
</div> </div>
<% if (!isCreate) { %> <% if (!isCreate) { %>
<div class="column is-full-desktop is-4-widescreen"> <div class="column is-full-tablet is-full-desktop is-4-widescreen">
<div class="panel" id="panel--milestones"> <div class="panel" id="panel--milestones">
<div class="panel-heading"> <div class="panel-heading">
<div class="level is-mobile"> <div class="level is-mobile">

2
views/workOrder-view.ejs
View File

@ -47,7 +47,7 @@
</button> </button>
</div> </div>
<div class="dropdown-menu"> <div class="dropdown-menu">
<div class="dropdown-content"> <div class="dropdown-content has-text-left">
<% for (const printName of configFunctions.getConfigProperty("settings.workOrders.prints")) { %> <% for (const printName of configFunctions.getConfigProperty("settings.workOrders.prints")) { %>
<% const printConfig = printFunctions.getPrintConfig(printName); %> <% const printConfig = printFunctions.getPrintConfig(printName); %>
<% if (printConfig) { %> <% if (printConfig) { %>