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

occupancy start date alias

deepsource-autofix-76c6eb20
Dan Gowans 2022-10-04 13:05:20 -04:00
parent 05307d11b3
commit 2e8eb11c6f
21 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/config.cemetery.ssm.js
View File

@ -1,5 +1,6 @@
import { config as cemeteryConfig } from "./config.cemetery.ontario.js"; import { config as cemeteryConfig } from "./config.cemetery.ontario.js";
export const config = Object.assign({}, cemeteryConfig); export const config = Object.assign({}, cemeteryConfig);
config.aliases.occupancyStartDate = "Interment Date";
config.aliases.externalReceiptNumber = "GP Receipt Number"; config.aliases.externalReceiptNumber = "GP Receipt Number";
config.settings.lot.lotNamePattern = /^[A-Z]{2}(-\d*[A-Z]?){3,5}$/; config.settings.lot.lotNamePattern = /^[A-Z]{2}(-\d*[A-Z]?){3,5}$/;
config.settings.lot.lotNameSortNameFunction = (lotName) => { config.settings.lot.lotNameSortNameFunction = (lotName) => {
@ -22,7 +23,7 @@ config.settings.lot.lotNameSortNameFunction = (lotName) => {
return cleanLotNamePieces.join("-"); return cleanLotNamePieces.join("-");
}; };
config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie"; config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie";
config.settings.lotOccupancy.prints = ["pdf/ssm.cemetery.burialPermit"]; config.settings.lotOccupancy.prints = ["screen/lotOccupancy", "pdf/ssm.cemetery.burialPermit"];
config.settings.map.mapCityDefault = "Sault Ste. Marie"; config.settings.map.mapCityDefault = "Sault Ste. Marie";
config.settings.workOrders.workOrderNumberLength = 6; config.settings.workOrders.workOrderNumberLength = 6;
config.settings.workOrders.workOrderMilestoneDateRecentBeforeDays = 7; config.settings.workOrders.workOrderMilestoneDateRecentBeforeDays = 7;

3
data/config.cemetery.ssm.ts
View File

@ -4,6 +4,7 @@ import {
export const config = Object.assign({}, cemeteryConfig); export const config = Object.assign({}, cemeteryConfig);
config.aliases.occupancyStartDate = "Interment Date";
config.aliases.externalReceiptNumber = "GP Receipt Number"; config.aliases.externalReceiptNumber = "GP Receipt Number";
config.settings.lot.lotNamePattern = /^[A-Z]{2}(-\d*[A-Z]?){3,5}$/; config.settings.lot.lotNamePattern = /^[A-Z]{2}(-\d*[A-Z]?){3,5}$/;
@ -37,7 +38,7 @@ config.settings.lot.lotNameSortNameFunction = (lotName) => {
}; };
config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie"; config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie";
config.settings.lotOccupancy.prints = ["pdf/ssm.cemetery.burialPermit"]; config.settings.lotOccupancy.prints = ["screen/lotOccupancy", "pdf/ssm.cemetery.burialPermit"];
config.settings.map.mapCityDefault = "Sault Ste. Marie"; config.settings.map.mapCityDefault = "Sault Ste. Marie";

1
helpers/functions.config.d.ts vendored
View File

@ -22,6 +22,7 @@ export declare function getProperty(propertyName: "aliases.map"): string;
export declare function getProperty(propertyName: "aliases.maps"): string; export declare function getProperty(propertyName: "aliases.maps"): string;
export declare function getProperty(propertyName: "aliases.occupancy"): string; export declare function getProperty(propertyName: "aliases.occupancy"): string;
export declare function getProperty(propertyName: "aliases.occupancies"): string; export declare function getProperty(propertyName: "aliases.occupancies"): string;
export declare function getProperty(propertyName: "aliases.occupancyStartDate"): string;
export declare function getProperty(propertyName: "aliases.occupant"): string; export declare function getProperty(propertyName: "aliases.occupant"): string;
export declare function getProperty(propertyName: "aliases.occupants"): string; export declare function getProperty(propertyName: "aliases.occupants"): string;
export declare function getProperty(propertyName: "aliases.externalReceiptNumber"): string; export declare function getProperty(propertyName: "aliases.externalReceiptNumber"): string;

1
helpers/functions.config.js
View File

@ -22,6 +22,7 @@ configFallbackValues.set("aliases.map", "Map");
configFallbackValues.set("aliases.maps", "Maps"); configFallbackValues.set("aliases.maps", "Maps");
configFallbackValues.set("aliases.occupancy", "Occupancy"); configFallbackValues.set("aliases.occupancy", "Occupancy");
configFallbackValues.set("aliases.occupancies", "Occupancies"); configFallbackValues.set("aliases.occupancies", "Occupancies");
configFallbackValues.set("aliases.occupancyStartDate", "Start Date");
configFallbackValues.set("aliases.occupant", "Occupant"); configFallbackValues.set("aliases.occupant", "Occupant");
configFallbackValues.set("aliases.occupants", "Occupants"); configFallbackValues.set("aliases.occupants", "Occupants");
configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number"); configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number");

2
helpers/functions.config.ts
View File

@ -36,6 +36,7 @@ configFallbackValues.set("aliases.map", "Map");
configFallbackValues.set("aliases.maps", "Maps"); configFallbackValues.set("aliases.maps", "Maps");
configFallbackValues.set("aliases.occupancy", "Occupancy"); configFallbackValues.set("aliases.occupancy", "Occupancy");
configFallbackValues.set("aliases.occupancies", "Occupancies"); configFallbackValues.set("aliases.occupancies", "Occupancies");
configFallbackValues.set("aliases.occupancyStartDate", "Start Date");
configFallbackValues.set("aliases.occupant", "Occupant"); configFallbackValues.set("aliases.occupant", "Occupant");
configFallbackValues.set("aliases.occupants", "Occupants"); configFallbackValues.set("aliases.occupants", "Occupants");
configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number"); configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number");
@ -94,6 +95,7 @@ export function getProperty(propertyName: "aliases.map"): string;
export function getProperty(propertyName: "aliases.maps"): string; export function getProperty(propertyName: "aliases.maps"): string;
export function getProperty(propertyName: "aliases.occupancy"): string; export function getProperty(propertyName: "aliases.occupancy"): string;
export function getProperty(propertyName: "aliases.occupancies"): string; export function getProperty(propertyName: "aliases.occupancies"): string;
export function getProperty(propertyName: "aliases.occupancyStartDate"): string;
export function getProperty(propertyName: "aliases.occupant"): string; export function getProperty(propertyName: "aliases.occupant"): string;
export function getProperty(propertyName: "aliases.occupants"): string; export function getProperty(propertyName: "aliases.occupants"): string;

2
public-typescript/lotOccupancySearch.js
View File

@ -111,7 +111,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
'<th class="has-width-1"></th>' + '<th class="has-width-1"></th>' +
("<th>" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type</th>") + ("<th>" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type</th>") +
("<th>" + cityssm.escapeHTML(exports.aliases.lot) + "</th>") + ("<th>" + cityssm.escapeHTML(exports.aliases.lot) + "</th>") +
"<th>Start Date</th>" + "<th>" + cityssm.escapeHTML(exports.aliases.occupancyStartDate) + "</th>" +
"<th>End Date</th>" + "<th>End Date</th>" +
("<th>" + cityssm.escapeHTML(exports.aliases.occupants) + "</th>") + ("<th>" + cityssm.escapeHTML(exports.aliases.occupants) + "</th>") +
(lotOccupancyPrints.length > 0 ? '<th class="has-width-1"></th>' : "") + (lotOccupancyPrints.length > 0 ? '<th class="has-width-1"></th>' : "") +

2
public-typescript/lotOccupancySearch.ts
View File

@ -146,7 +146,7 @@ declare const cityssm: cityssmGlobal;
'<th class="has-width-1"></th>' + '<th class="has-width-1"></th>' +
("<th>" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type</th>") + ("<th>" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type</th>") +
("<th>" + cityssm.escapeHTML(exports.aliases.lot) + "</th>") + ("<th>" + cityssm.escapeHTML(exports.aliases.lot) + "</th>") +
"<th>Start Date</th>" + "<th>" + cityssm.escapeHTML(exports.aliases.occupancyStartDate) + "</th>" +
"<th>End Date</th>" + "<th>End Date</th>" +
("<th>" + cityssm.escapeHTML(exports.aliases.occupants) + "</th>") + ("<th>" + cityssm.escapeHTML(exports.aliases.occupants) + "</th>") +
(lotOccupancyPrints.length > 0 ? '<th class="has-width-1"></th>' : "") + (lotOccupancyPrints.length > 0 ? '<th class="has-width-1"></th>' : "") +

2
public-typescript/workOrderEdit.js
View File

@ -220,7 +220,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
'<th class="has-width-1"></th>' + '<th class="has-width-1"></th>' +
("<th>" + exports.aliases.occupancy + " Type</th>") + ("<th>" + exports.aliases.occupancy + " Type</th>") +
("<th>" + exports.aliases.lot + "</th>") + ("<th>" + exports.aliases.lot + "</th>") +
"<th>Start Date</th>" + ("<th>" + exports.aliases.occupancyStartDate + "</th>") +
"<th>End Date</th>" + "<th>End Date</th>" +
("<th>" + exports.aliases.occupants + "</th>") + ("<th>" + exports.aliases.occupants + "</th>") +
'<th class="has-width-1"></th>' + '<th class="has-width-1"></th>' +

2
public-typescript/workOrderEdit.ts
View File

@ -308,7 +308,7 @@ declare const bulmaJS: BulmaJS;
'<th class="has-width-1"></th>' + '<th class="has-width-1"></th>' +
("<th>" + exports.aliases.occupancy + " Type</th>") + ("<th>" + exports.aliases.occupancy + " Type</th>") +
("<th>" + exports.aliases.lot + "</th>") + ("<th>" + exports.aliases.lot + "</th>") +
"<th>Start Date</th>" + ("<th>" + exports.aliases.occupancyStartDate + "</th>") +
"<th>End Date</th>" + "<th>End Date</th>" +
("<th>" + exports.aliases.occupants + "</th>") + ("<th>" + exports.aliases.occupants + "</th>") +
'<th class="has-width-1"></th>' + '<th class="has-width-1"></th>' +

2
public/javascripts/lotOccupancySearch.min.js vendored
View File

@ -1 +1 @@
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const t=document.querySelector("main").dataset.urlPrefix,e=exports.lotOccupancyPrints,a=document.querySelector("#form--searchFilters"),s=document.querySelector("#container--searchResults"),c=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),i=document.querySelector("#searchFilter--offset"),n=()=>{const n=Number.parseInt(i.value,10);s.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Loading '+exports.aliases.occupancies+"...</div>",cityssm.postJSON(t+"/lotOccupancies/doSearchLotOccupancies",a,a=>{if(0===a.lotOccupancies.length)return void(s.innerHTML='<div class="message is-info"><p class="message-body">There are no '+cityssm.escapeHTML(exports.aliases.occupancy.toLowerCase())+" records that meet the search criteria.</p></div>");const i=document.createElement("tbody"),r=cityssm.dateToString(new Date);for(const s of a.lotOccupancies){let a="";a=s.occupancyStartDateString<=r&&(""===s.occupancyEndDateString||s.occupancyEndDateString>=r)?'<i class="fas fa-play" title="Current '+exports.aliases.occupancy+'"></i>':s.occupancyStartDateString>r?'<i class="fas fa-fast-forward" title="Future '+exports.aliases.occupancy+'"></i>':'<i class="fas fa-stop" title="Previous '+exports.aliases.occupancy+'"></i>';let c="";for(const t of s.lotOccupancyOccupants)c+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(t.lotOccupantType)+'">'+cityssm.escapeHTML(t.occupantName)+"</span><br />";i.insertAdjacentHTML("beforeend",'<tr><td class="has-width-1">'+a+'</td><td><a class="has-text-weight-bold" href="'+t+"/lotOccupancies/"+s.lotOccupancyId+'">'+cityssm.escapeHTML(s.occupancyType)+"</a></td><td>"+(s.lotName?cityssm.escapeHTML(s.lotName):'<span class="has-text-grey">(No '+cityssm.escapeHTML(exports.aliases.lot)+")</span>")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(s.mapName||"")+"</span></td><td>"+s.occupancyStartDateString+"</td><td>"+(s.occupancyEndDate?s.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+c+"</td>"+(e.length>0?'<td><a class="button is-small" data-tooltip="Print" href="'+t+"/print/"+e[0]+"/?lotOccupancyId="+s.lotOccupancyId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a></td>':"")+"</tr>")}s.innerHTML='<table class="table is-fullwidth is-striped is-hoverable has-sticky-header"><thead><tr><th class="has-width-1"></th><th>'+cityssm.escapeHTML(exports.aliases.occupancy)+" Type</th><th>"+cityssm.escapeHTML(exports.aliases.lot)+"</th><th>Start Date</th><th>End Date</th><th>"+cityssm.escapeHTML(exports.aliases.occupants)+"</th>"+(e.length>0?'<th class="has-width-1"></th>':"")+'</tr></thead><table><div class="level"><div class="level-left"><div class="level-item has-text-weight-bold">Displaying '+(n+1).toString()+" to "+Math.min(a.count,c+n)+" of "+a.count+'</div></div><div class="level-right">'+(n>0?'<div class="level-item"><button class="button is-rounded is-link is-outlined" data-page="previous" type="button" title="Previous"><i class="fas fa-arrow-left" aria-hidden="true"></i></button></div>':"")+(c+n<a.count?'<div class="level-item"><button class="button is-rounded is-link" data-page="next" type="button" title="Next"><span>Next</span><span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span></button></div>':"")+"</div></div>",s.querySelector("table").append(i),n>0&&s.querySelector("button[data-page='previous']").addEventListener("click",l),c+n<a.count&&s.querySelector("button[data-page='next']").addEventListener("click",o)})},r=()=>{i.value="0",n()},l=()=>{i.value=Math.max(Number.parseInt(i.value,10)-c,0).toString(),n()},o=()=>{i.value=(Number.parseInt(i.value,10)+c).toString(),n()},d=a.querySelectorAll("input, select");for(const t of d)t.addEventListener("change",r);a.addEventListener("submit",t=>{t.preventDefault(),r()}),n()})(); "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const t=document.querySelector("main").dataset.urlPrefix,e=exports.lotOccupancyPrints,a=document.querySelector("#form--searchFilters"),s=document.querySelector("#container--searchResults"),c=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),i=document.querySelector("#searchFilter--offset"),n=()=>{const n=Number.parseInt(i.value,10);s.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Loading '+exports.aliases.occupancies+"...</div>",cityssm.postJSON(t+"/lotOccupancies/doSearchLotOccupancies",a,a=>{if(0===a.lotOccupancies.length)return void(s.innerHTML='<div class="message is-info"><p class="message-body">There are no '+cityssm.escapeHTML(exports.aliases.occupancy.toLowerCase())+" records that meet the search criteria.</p></div>");const i=document.createElement("tbody"),r=cityssm.dateToString(new Date);for(const s of a.lotOccupancies){let a="";a=s.occupancyStartDateString<=r&&(""===s.occupancyEndDateString||s.occupancyEndDateString>=r)?'<i class="fas fa-play" title="Current '+exports.aliases.occupancy+'"></i>':s.occupancyStartDateString>r?'<i class="fas fa-fast-forward" title="Future '+exports.aliases.occupancy+'"></i>':'<i class="fas fa-stop" title="Previous '+exports.aliases.occupancy+'"></i>';let c="";for(const t of s.lotOccupancyOccupants)c+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(t.lotOccupantType)+'">'+cityssm.escapeHTML(t.occupantName)+"</span><br />";i.insertAdjacentHTML("beforeend",'<tr><td class="has-width-1">'+a+'</td><td><a class="has-text-weight-bold" href="'+t+"/lotOccupancies/"+s.lotOccupancyId+'">'+cityssm.escapeHTML(s.occupancyType)+"</a></td><td>"+(s.lotName?cityssm.escapeHTML(s.lotName):'<span class="has-text-grey">(No '+cityssm.escapeHTML(exports.aliases.lot)+")</span>")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(s.mapName||"")+"</span></td><td>"+s.occupancyStartDateString+"</td><td>"+(s.occupancyEndDate?s.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+c+"</td>"+(e.length>0?'<td><a class="button is-small" data-tooltip="Print" href="'+t+"/print/"+e[0]+"/?lotOccupancyId="+s.lotOccupancyId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a></td>':"")+"</tr>")}s.innerHTML='<table class="table is-fullwidth is-striped is-hoverable has-sticky-header"><thead><tr><th class="has-width-1"></th><th>'+cityssm.escapeHTML(exports.aliases.occupancy)+" Type</th><th>"+cityssm.escapeHTML(exports.aliases.lot)+"</th><th>"+cityssm.escapeHTML(exports.aliases.occupancyStartDate)+"</th><th>End Date</th><th>"+cityssm.escapeHTML(exports.aliases.occupants)+"</th>"+(e.length>0?'<th class="has-width-1"></th>':"")+'</tr></thead><table><div class="level"><div class="level-left"><div class="level-item has-text-weight-bold">Displaying '+(n+1).toString()+" to "+Math.min(a.count,c+n)+" of "+a.count+'</div></div><div class="level-right">'+(n>0?'<div class="level-item"><button class="button is-rounded is-link is-outlined" data-page="previous" type="button" title="Previous"><i class="fas fa-arrow-left" aria-hidden="true"></i></button></div>':"")+(c+n<a.count?'<div class="level-item"><button class="button is-rounded is-link" data-page="next" type="button" title="Next"><span>Next</span><span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span></button></div>':"")+"</div></div>",s.querySelector("table").append(i),n>0&&s.querySelector("button[data-page='previous']").addEventListener("click",o),c+n<a.count&&s.querySelector("button[data-page='next']").addEventListener("click",l)})},r=()=>{i.value="0",n()},o=()=>{i.value=Math.max(Number.parseInt(i.value,10)-c,0).toString(),n()},l=()=>{i.value=(Number.parseInt(i.value,10)+c).toString(),n()},p=a.querySelectorAll("input, select");for(const t of p)t.addEventListener("change",r);a.addEventListener("submit",t=>{t.preventDefault(),r()}),n()})();

2
public/javascripts/workOrderEdit.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
types/configTypes.d.ts vendored
View File

@ -20,6 +20,7 @@ export interface Config {
maps?: string; maps?: string;
occupancy?: string; occupancy?: string;
occupancies?: string; occupancies?: string;
occupancyStartDate?: string;
occupant?: string; occupant?: string;
occupants?: string; occupants?: string;
externalReceiptNumber?: string; externalReceiptNumber?: string;

1
types/configTypes.ts
View File

@ -20,6 +20,7 @@ export interface Config {
maps?: string; maps?: string;
occupancy?: string; occupancy?: string;
occupancies?: string; occupancies?: string;
occupancyStartDate?: string;
occupant?: string; occupant?: string;
occupants?: string; occupants?: string;
externalReceiptNumber?: string; externalReceiptNumber?: string;

1
views/_footerA.ejs
View File

@ -20,6 +20,7 @@
lots: "<%= configFunctions.getProperty("aliases.lots") %>", lots: "<%= configFunctions.getProperty("aliases.lots") %>",
occupancy: "<%= configFunctions.getProperty("aliases.occupancy") %>", occupancy: "<%= configFunctions.getProperty("aliases.occupancy") %>",
occupancies: "<%= configFunctions.getProperty("aliases.occupancies") %>", occupancies: "<%= configFunctions.getProperty("aliases.occupancies") %>",
occupancyStartDate: "<%= configFunctions.getProperty("aliases.occupancyStartDate") %>",
occupant: "<%= configFunctions.getProperty("aliases.occupant") %>", occupant: "<%= configFunctions.getProperty("aliases.occupant") %>",
occupants: "<%= configFunctions.getProperty("aliases.occupants") %>", occupants: "<%= configFunctions.getProperty("aliases.occupants") %>",
externalReceiptNumber: "<%= configFunctions.getProperty("aliases.externalReceiptNumber") %>" externalReceiptNumber: "<%= configFunctions.getProperty("aliases.externalReceiptNumber") %>"

2
views/lot-edit.ejs
View File

@ -313,7 +313,7 @@
<tr> <tr>
<th class="has-width-10">&nbsp;</th> <th class="has-width-10">&nbsp;</th>
<th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th> <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
<th>Start Date</th> <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
<th>End Date</th> <th>End Date</th>
<th><%= configFunctions.getProperty("aliases.occupants") %></th> <th><%= configFunctions.getProperty("aliases.occupants") %></th>
</tr> </tr>

2
views/lot-view.ejs
View File

@ -139,7 +139,7 @@
<tr> <tr>
<th class="has-width-10">&nbsp;</th> <th class="has-width-10">&nbsp;</th>
<th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th> <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
<th>Start Date</th> <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
<th>End Date</th> <th>End Date</th>
<th><%= configFunctions.getProperty("aliases.occupants") %></th> <th><%= configFunctions.getProperty("aliases.occupants") %></th>
</tr> </tr>

2
views/lotOccupancy-edit.ejs
View File

@ -163,7 +163,7 @@
</div> </div>
<div class="column is-3"> <div class="column is-3">
<div class="field"> <div class="field">
<label class="label" for="lotOccupancy--occupancyStartDateString">Start Date</label> <label class="label" for="lotOccupancy--occupancyStartDateString"><%= configFunctions.getProperty("aliases.occupancyStartDate") %></label>
<div class="control has-icons-left"> <div class="control has-icons-left">
<input class="input" id="lotOccupancy--occupancyStartDateString" name="occupancyStartDateString" type="date" <input class="input" id="lotOccupancy--occupancyStartDateString" name="occupancyStartDateString" type="date"
value="<%= lotOccupancy.occupancyStartDateString %>" required /> value="<%= lotOccupancy.occupancyStartDateString %>" required />

2
views/lotOccupancy-view.ejs
View File

@ -107,7 +107,7 @@
</div> </div>
<div class="column"> <div class="column">
<p class="mb-2"> <p class="mb-2">
<strong>Start Date</strong><br /> <strong><%= configFunctions.getProperty("aliases.occupancyStartDate") %></strong><br />
<%= lotOccupancy.occupancyStartDateString %> <%= lotOccupancy.occupancyStartDateString %>
</p> </p>
<p> <p>

2
views/print/pdf/workOrder.ejs
View File

@ -79,7 +79,7 @@
<tr> <tr>
<th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th> <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
<th><%= configFunctions.getProperty("aliases.lot") %></th> <th><%= configFunctions.getProperty("aliases.lot") %></th>
<th>Start Date</th> <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
<th>End Date</th> <th>End Date</th>
<th><%= configFunctions.getProperty("aliases.occupants") %></th> <th><%= configFunctions.getProperty("aliases.occupants") %></th>
</tr> </tr>

2
views/print/screen/lotOccupancy.ejs
View File

@ -32,7 +32,7 @@
</div> </div>
<div class="column"> <div class="column">
<p class="mb-2"> <p class="mb-2">
<strong>Start Date</strong><br /> <strong><%= configFunctions.getProperty("aliases.occupancyStartDate") %></strong><br />
<%= lotOccupancy.occupancyStartDateString %> <%= lotOccupancy.occupancyStartDateString %>
</p> </p>
<p> <p>

4
views/workOrder-view.ejs
View File

@ -155,9 +155,9 @@
<thead> <thead>
<tr> <tr>
<th class="has-width-1"></th> <th class="has-width-1"></th>
<th>Occupancy Type</th> <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
<th><%= configFunctions.getProperty("aliases.lot") %></th> <th><%= configFunctions.getProperty("aliases.lot") %></th>
<th>Start Date</th> <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
<th>End Date</th> <th>End Date</th>
<th><%= configFunctions.getProperty("aliases.occupants") %></th> <th><%= configFunctions.getProperty("aliases.occupants") %></th>
</tr> </tr>