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

work order open and close date aliases

deepsource-autofix-76c6eb20
Dan Gowans 2022-12-07 09:01:21 -05:00
parent 5b318ac583
commit 8f1b1d7764
16 changed files with 72 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/config.cemetery.js
View File

@ -13,5 +13,7 @@ config.aliases.occupancy = "Contract";
config.aliases.occupancies = "Contracts";
config.aliases.occupant = "Related Party";
config.aliases.occupants = "Related Parties";
config.aliases.workOrderOpenDate = "Order Date";
config.aliases.workOrderCloseDate = "Completion Date";
config.settings.lotOccupancy.occupancyEndDateIsRequired = false;
export default config;

2
data/config.cemetery.ts
View File

@ -16,6 +16,8 @@ config.aliases.occupancy = "Contract";
config.aliases.occupancies = "Contracts";
config.aliases.occupant = "Related Party";
config.aliases.occupants = "Related Parties";
config.aliases.workOrderOpenDate = "Order Date";
config.aliases.workOrderCloseDate = "Completion Date";
config.settings.lotOccupancy.occupancyEndDateIsRequired = false;

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

@ -26,6 +26,8 @@ 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.occupants"): string;
export declare function getProperty(propertyName: "aliases.workOrderOpenDate"): string;
export declare function getProperty(propertyName: "aliases.workOrderCloseDate"): string;
export declare function getProperty(propertyName: "aliases.externalReceiptNumber"): string;
export declare function getProperty(propertyName: "settings.map.mapCityDefault"): string;
export declare function getProperty(propertyName: "settings.map.mapProvinceDefault"): string;

2
helpers/functions.config.js
View File

@ -26,6 +26,8 @@ configFallbackValues.set("aliases.occupancyStartDate", "Start Date");
configFallbackValues.set("aliases.occupant", "Occupant");
configFallbackValues.set("aliases.occupants", "Occupants");
configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number");
configFallbackValues.set("aliases.workOrderOpenDate", "Open Date");
configFallbackValues.set("aliases.workOrderCloseDate", "Close Date");
configFallbackValues.set("settings.map.mapCityDefault", "");
configFallbackValues.set("settings.map.mapProvinceDefault", "");
configFallbackValues.set("settings.lot.lotNameSortNameFunction", (lotName) => lotName);

4
helpers/functions.config.ts
View File

@ -40,6 +40,8 @@ configFallbackValues.set("aliases.occupancyStartDate", "Start Date");
configFallbackValues.set("aliases.occupant", "Occupant");
configFallbackValues.set("aliases.occupants", "Occupants");
configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number");
configFallbackValues.set("aliases.workOrderOpenDate", "Open Date");
configFallbackValues.set("aliases.workOrderCloseDate", "Close Date");
configFallbackValues.set("settings.map.mapCityDefault", "");
configFallbackValues.set("settings.map.mapProvinceDefault", "");
@ -104,6 +106,8 @@ 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.occupants"): string;
export function getProperty(propertyName: "aliases.workOrderOpenDate"): string;
export function getProperty(propertyName: "aliases.workOrderCloseDate"): string;
export function getProperty(propertyName: "aliases.externalReceiptNumber"): string;

28
public-typescript/workOrderSearch.js
View File

@ -73,15 +73,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
relatedHTML +
"</span></td>") +
('<td class="is-nowrap">' +
('<span class="has-tooltip-left" data-tooltip="Open Date">' +
'<i class="fas fa-fw fa-play" aria-label="Open Date"></i> ' +
('<span class="has-tooltip-left" data-tooltip="' +
cityssm.escapeHTML(exports.aliases.workOrderOpenDate) +
'">' +
'<i class="fas fa-fw fa-play" aria-label="' +
cityssm.escapeHTML(exports.aliases.workOrderOpenDate) +
'"></i> ' +
workOrder.workOrderOpenDateString +
"</span><br />") +
('<span class="has-tooltip-left" data-tooltip="Close Date">' +
'<i class="fas fa-fw fa-stop" aria-label="Close Date"></i> ' +
('<span class="has-tooltip-left" data-tooltip="' +
cityssm.escapeHTML(exports.aliases.workOrderCloseDate) +
'">' +
'<i class="fas fa-fw fa-stop" aria-label="' +
cityssm.escapeHTML(exports.aliases.workOrderCloseDate) +
'"></i> ' +
(workOrder.workOrderCloseDate
? workOrder.workOrderCloseDateString
: '<span class="has-text-grey">(No Close Date)</span>') +
: '<span class="has-text-grey">(No ' +
cityssm.escapeHTML(exports.aliases.workOrderCloseDate) +
")</span>") +
"</span>") +
"</td>") +
("<td>" +
@ -148,14 +158,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</div>";
searchResultsContainerElement.querySelector("table").append(resultsTbodyElement);
if (offset > 0) {
searchResultsContainerElement
.querySelector("button[data-page='previous']")
.addEventListener("click", previousAndGetWorkOrders);
searchResultsContainerElement.querySelector("button[data-page='previous']").addEventListener("click", previousAndGetWorkOrders);
}
if (limit + offset < responseJSON.count) {
searchResultsContainerElement
.querySelector("button[data-page='next']")
.addEventListener("click", nextAndGetWorkOrders);
searchResultsContainerElement.querySelector("button[data-page='next']").addEventListener("click", nextAndGetWorkOrders);
}
});
};

36
public-typescript/workOrderSearch.ts
View File

@ -106,15 +106,25 @@ declare const cityssm: cityssmGlobal;
relatedHTML +
"</span></td>") +
('<td class="is-nowrap">' +
('<span class="has-tooltip-left" data-tooltip="Open Date">' +
'<i class="fas fa-fw fa-play" aria-label="Open Date"></i> ' +
('<span class="has-tooltip-left" data-tooltip="' +
cityssm.escapeHTML(exports.aliases.workOrderOpenDate) +
'">' +
'<i class="fas fa-fw fa-play" aria-label="' +
cityssm.escapeHTML(exports.aliases.workOrderOpenDate) +
'"></i> ' +
workOrder.workOrderOpenDateString +
"</span><br />") +
('<span class="has-tooltip-left" data-tooltip="Close Date">' +
'<i class="fas fa-fw fa-stop" aria-label="Close Date"></i> ' +
('<span class="has-tooltip-left" data-tooltip="' +
cityssm.escapeHTML(exports.aliases.workOrderCloseDate) +
'">' +
'<i class="fas fa-fw fa-stop" aria-label="' +
cityssm.escapeHTML(exports.aliases.workOrderCloseDate) +
'"></i> ' +
(workOrder.workOrderCloseDate
? workOrder.workOrderCloseDateString
: '<span class="has-text-grey">(No Close Date)</span>') +
: '<span class="has-text-grey">(No ' +
cityssm.escapeHTML(exports.aliases.workOrderCloseDate) +
")</span>") +
"</span>") +
"</td>") +
("<td>" +
@ -185,15 +195,19 @@ declare const cityssm: cityssmGlobal;
searchResultsContainerElement.querySelector("table")!.append(resultsTbodyElement);
if (offset > 0) {
(searchResultsContainerElement
.querySelector("button[data-page='previous']") as HTMLButtonElement)
.addEventListener("click", previousAndGetWorkOrders);
(
searchResultsContainerElement.querySelector(
"button[data-page='previous']"
) as HTMLButtonElement
).addEventListener("click", previousAndGetWorkOrders);
}
if (limit + offset < responseJSON.count) {
(searchResultsContainerElement
.querySelector("button[data-page='next']") as HTMLButtonElement)
.addEventListener("click", nextAndGetWorkOrders);
(
searchResultsContainerElement.querySelector(
"button[data-page='next']"
) as HTMLButtonElement
).addEventListener("click", nextAndGetWorkOrders);
}
}
);

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

@ -1 +1 @@
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=exports.workOrderPrints,s=document.querySelector("#form--searchFilters");e.initializeDatePickers(s);const a=document.querySelector("#container--searchResults"),r=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),o=document.querySelector("#searchFilter--offset"),i=()=>{const i=Number.parseInt(o.value,10);a.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 Work Orders...</div>',cityssm.postJSON(e.urlPrefix+"/workOrders/doSearchWorkOrders",s,s=>{if(0===s.workOrders.length)return void(a.innerHTML='<div class="message is-info"><p class="message-body">There are no work orders that meet the search criteria.</p></div>');const o=document.createElement("tbody");for(const a of s.workOrders){let s="";for(const e of a.workOrderLots)s+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(e.mapName||"")+'"><i class="fas fa-vector-square" aria-label="'+cityssm.escapeHTML(exports.aliases.lot)+'"></i> '+cityssm.escapeHTML(e.lotName||"(No Lot Name)")+"</span><br />";for(const e of a.workOrderLotOccupancies)for(const t of e.lotOccupancyOccupants)s+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(t.lotOccupantType||"")+'"><i class="fas fa-user" aria-label="'+cityssm.escapeHTML(exports.aliases.occupant)+'"></i> '+cityssm.escapeHTML(t.occupantName||"(No Name)")+"</span><br />";o.insertAdjacentHTML("beforeend",'<tr><td><a class="has-text-weight-bold" href="'+e.urlPrefix+"/workOrders/"+a.workOrderId+'">'+(a.workOrderNumber.trim()?cityssm.escapeHTML(a.workOrderNumber||""):"(No Number)")+"</a></td><td>"+cityssm.escapeHTML(a.workOrderType||"")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(a.workOrderDescription||"")+'</span></td><td class="is-nowrap"><span class="is-size-7">'+s+'</span></td><td class="is-nowrap"><span class="has-tooltip-left" data-tooltip="Open Date"><i class="fas fa-fw fa-play" aria-label="Open Date"></i> '+a.workOrderOpenDateString+'</span><br /><span class="has-tooltip-left" data-tooltip="Close Date"><i class="fas fa-fw fa-stop" aria-label="Close Date"></i> '+(a.workOrderCloseDate?a.workOrderCloseDateString:'<span class="has-text-grey">(No Close Date)</span>')+"</span></td><td>"+(0===a.workOrderMilestoneCount?"-":a.workOrderMilestoneCompletionCount+" / "+a.workOrderMilestoneCount)+"</td>"+(t.length>0?'<td><a class="button is-small" data-tooltip="Print" href="'+e.urlPrefix+"/print/"+t[0]+"/?workOrderId="+a.workOrderId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a></td>':"")+"</tr>")}a.innerHTML='<table class="table is-fullwidth is-striped is-hoverable has-sticky-header"><thead><tr><th>Work Order Number</th><th>Description</th><th>Related</th><th>Date</th><th class="has-tooltip-bottom" data-tooltip="Completed / Total Milestones">Progress</th>'+(t.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 '+(i+1).toString()+" to "+Math.min(s.count,r+i)+" of "+s.count+'</div></div><div class="level-right">'+(i>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>':"")+(r+i<s.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>",a.querySelector("table").append(o),i>0&&a.querySelector("button[data-page='previous']").addEventListener("click",n),r+i<s.count&&a.querySelector("button[data-page='next']").addEventListener("click",c)})},l=()=>{o.value="0",i()},n=()=>{o.value=Math.max(Number.parseInt(o.value,10)-r,0).toString(),i()},c=()=>{o.value=(Number.parseInt(o.value,10)+r).toString(),i()},d=s.querySelectorAll("input, select");for(const e of d)e.addEventListener("change",l);s.addEventListener("submit",e=>{e.preventDefault(),l()}),i()})();
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=exports.workOrderPrints,s=document.querySelector("#form--searchFilters");e.initializeDatePickers(s);const a=document.querySelector("#container--searchResults"),r=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),o=document.querySelector("#searchFilter--offset"),i=()=>{const i=Number.parseInt(o.value,10);a.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 Work Orders...</div>',cityssm.postJSON(e.urlPrefix+"/workOrders/doSearchWorkOrders",s,s=>{if(0===s.workOrders.length)return void(a.innerHTML='<div class="message is-info"><p class="message-body">There are no work orders that meet the search criteria.</p></div>');const o=document.createElement("tbody");for(const a of s.workOrders){let s="";for(const e of a.workOrderLots)s+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(e.mapName||"")+'"><i class="fas fa-vector-square" aria-label="'+cityssm.escapeHTML(exports.aliases.lot)+'"></i> '+cityssm.escapeHTML(e.lotName||"(No Lot Name)")+"</span><br />";for(const e of a.workOrderLotOccupancies)for(const t of e.lotOccupancyOccupants)s+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(t.lotOccupantType||"")+'"><i class="fas fa-user" aria-label="'+cityssm.escapeHTML(exports.aliases.occupant)+'"></i> '+cityssm.escapeHTML(t.occupantName||"(No Name)")+"</span><br />";o.insertAdjacentHTML("beforeend",'<tr><td><a class="has-text-weight-bold" href="'+e.urlPrefix+"/workOrders/"+a.workOrderId+'">'+(a.workOrderNumber.trim()?cityssm.escapeHTML(a.workOrderNumber||""):"(No Number)")+"</a></td><td>"+cityssm.escapeHTML(a.workOrderType||"")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(a.workOrderDescription||"")+'</span></td><td class="is-nowrap"><span class="is-size-7">'+s+'</span></td><td class="is-nowrap"><span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(exports.aliases.workOrderOpenDate)+'"><i class="fas fa-fw fa-play" aria-label="'+cityssm.escapeHTML(exports.aliases.workOrderOpenDate)+'"></i> '+a.workOrderOpenDateString+'</span><br /><span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(exports.aliases.workOrderCloseDate)+'"><i class="fas fa-fw fa-stop" aria-label="'+cityssm.escapeHTML(exports.aliases.workOrderCloseDate)+'"></i> '+(a.workOrderCloseDate?a.workOrderCloseDateString:'<span class="has-text-grey">(No '+cityssm.escapeHTML(exports.aliases.workOrderCloseDate)+")</span>")+"</span></td><td>"+(0===a.workOrderMilestoneCount?"-":a.workOrderMilestoneCompletionCount+" / "+a.workOrderMilestoneCount)+"</td>"+(t.length>0?'<td><a class="button is-small" data-tooltip="Print" href="'+e.urlPrefix+"/print/"+t[0]+"/?workOrderId="+a.workOrderId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a></td>':"")+"</tr>")}a.innerHTML='<table class="table is-fullwidth is-striped is-hoverable has-sticky-header"><thead><tr><th>Work Order Number</th><th>Description</th><th>Related</th><th>Date</th><th class="has-tooltip-bottom" data-tooltip="Completed / Total Milestones">Progress</th>'+(t.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 '+(i+1).toString()+" to "+Math.min(s.count,r+i)+" of "+s.count+'</div></div><div class="level-right">'+(i>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>':"")+(r+i<s.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>",a.querySelector("table").append(o),i>0&&a.querySelector("button[data-page='previous']").addEventListener("click",n),r+i<s.count&&a.querySelector("button[data-page='next']").addEventListener("click",c)})},l=()=>{o.value="0",i()},n=()=>{o.value=Math.max(Number.parseInt(o.value,10)-r,0).toString(),i()},c=()=>{o.value=(Number.parseInt(o.value,10)+r).toString(),i()},d=s.querySelectorAll("input, select");for(const e of d)e.addEventListener("change",l);s.addEventListener("submit",e=>{e.preventDefault(),l()}),i()})();

2
types/configTypes.d.ts vendored
View File

@ -24,6 +24,8 @@ export interface Config {
occupant?: string;
occupants?: string;
externalReceiptNumber?: string;
workOrderOpenDate?: string;
workOrderCloseDate?: string;
};
settings: {
fees: {

2
types/configTypes.ts
View File

@ -24,6 +24,8 @@ export interface Config {
occupant?: string;
occupants?: string;
externalReceiptNumber?: string;
workOrderOpenDate?: string;
workOrderCloseDate?: string;
};
settings: {
fees: {

4
views/_footerA.ejs
View File

@ -23,7 +23,9 @@
occupancyStartDate: "<%= configFunctions.getProperty("aliases.occupancyStartDate") %>",
occupant: "<%= configFunctions.getProperty("aliases.occupant") %>",
occupants: "<%= configFunctions.getProperty("aliases.occupants") %>",
externalReceiptNumber: "<%= configFunctions.getProperty("aliases.externalReceiptNumber") %>"
externalReceiptNumber: "<%= configFunctions.getProperty("aliases.externalReceiptNumber") %>",
workOrderOpenDate: "<%= configFunctions.getProperty("aliases.workOrderOpenDate") %>",
workOrderCloseDate: "<%= configFunctions.getProperty("aliases.workOrderCloseDate") %>"
};
</script>
<script src="<%= urlPrefix %>/lib/cityssm-bulma-js/bulma-js.js"></script>

4
views/print/pdf/workOrder-commentLog.ejs
View File

@ -32,12 +32,12 @@
</td>
<td class="pl-1 is-width-1 has-text-nowrap">
<p>
<strong>Open Date</strong><br />
<strong><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></strong><br />
<%= workOrder.workOrderOpenDateString %>
</p>
<% if (workOrder.workOrderCloseDate) { %>
<p>
<strong>Close Date</strong><br />
<strong><%= configFunctions.getProperty("aliases.workOrderCloseDate") %></strong><br />
<%= workOrder.workOrderCloseDateString %>
</p>
<% } %>

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

@ -32,12 +32,12 @@
</td>
<td class="pl-1 is-width-1 has-text-nowrap">
<p>
<strong>Open Date</strong><br />
<strong><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></strong><br />
<%= workOrder.workOrderOpenDateString %>
</p>
<% if (workOrder.workOrderCloseDate) { %>
<p>
<strong>Close Date</strong><br />
<strong><%= configFunctions.getProperty("aliases.workOrderCloseDate") %></strong><br />
<%= workOrder.workOrderCloseDateString %>
</p>
<% } %>

4
views/workOrder-edit.ejs
View File

@ -133,7 +133,7 @@
<div class="columns">
<div class="column">
<div class="field">
<label class="label" for="workOrderEdit--workOrderOpenDateString">Open Date</label>
<label class="label" for="workOrderEdit--workOrderOpenDateString"><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></label>
<div class="control has-icons-left">
<%
const currentDateString = dateTimeFunctions.dateToString(new Date());
@ -150,7 +150,7 @@
</div>
<div class="column">
<div class="field">
<label class="label" for="workOrderEdit--workOrderCloseDateString">Close Date</label>
<label class="label" for="workOrderEdit--workOrderCloseDateString"><%= configFunctions.getProperty("aliases.workOrderCloseDate") %></label>
<div class="control">
<input class="input" id="workOrderEdit--workOrderCloseDateString" name="workOrderCloseDateString" type="date" value="<%= workOrder.workOrderCloseDateString %>" disabled readonly />
</div>

2
views/workOrder-search.ejs
View File

@ -77,7 +77,7 @@
</div>
<div class="column">
<div class="field">
<label class="label" for="searchFilter--workOrderOpenDateString">Open Date</label>
<label class="label" for="searchFilter--workOrderOpenDateString"><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></label>
<div class="control is-expanded has-icons-left">
<input class="input" id="searchFilter--workOrderOpenDateString" name="workOrderOpenDateString" type="date" value="<%= workOrderOpenDateString %>" max="<%= dateTimeFunctions.dateToString(new Date()) %>" />
<span class="icon is-small is-left">

6
views/workOrder-view.ejs
View File

@ -95,15 +95,15 @@
</div>
<div class="column">
<p class="mb-2">
<strong>Open Date</strong><br />
<strong><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></strong><br />
<%= workOrder.workOrderOpenDateString %>
</p>
<p>
<strong>Close Date</strong><br />
<strong><%= configFunctions.getProperty("aliases.workOrderCloseDate") %></strong><br />
<% if (workOrder.workOrderCloseDate) { %>
<%= workOrder.workOrderCloseDateString %>
<% } else { %>
<span class="has-text-grey">(No Close Date)</span>
<span class="has-text-grey">(No <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>)</span>
<% } %>
</p>
</div>