From 8f1b1d7764e89021b4b625dfb75e0aea0f4f5132 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Wed, 7 Dec 2022 09:01:21 -0500 Subject: [PATCH] work order open and close date aliases --- data/config.cemetery.js | 2 ++ data/config.cemetery.ts | 2 ++ helpers/functions.config.d.ts | 2 ++ helpers/functions.config.js | 2 ++ helpers/functions.config.ts | 4 +++ public-typescript/workOrderSearch.js | 28 +++++++++++------- public-typescript/workOrderSearch.ts | 36 ++++++++++++++++------- public/javascripts/workOrderSearch.min.js | 2 +- types/configTypes.d.ts | 2 ++ types/configTypes.ts | 2 ++ views/_footerA.ejs | 4 ++- views/print/pdf/workOrder-commentLog.ejs | 4 +-- views/print/pdf/workOrder.ejs | 4 +-- views/workOrder-edit.ejs | 4 +-- views/workOrder-search.ejs | 2 +- views/workOrder-view.ejs | 6 ++-- 16 files changed, 72 insertions(+), 34 deletions(-) diff --git a/data/config.cemetery.js b/data/config.cemetery.js index eb92e31a..8d996411 100644 --- a/data/config.cemetery.js +++ b/data/config.cemetery.js @@ -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; diff --git a/data/config.cemetery.ts b/data/config.cemetery.ts index 48371e3b..38d28103 100644 --- a/data/config.cemetery.ts +++ b/data/config.cemetery.ts @@ -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; diff --git a/helpers/functions.config.d.ts b/helpers/functions.config.d.ts index 2d3a7bbc..cc101382 100644 --- a/helpers/functions.config.d.ts +++ b/helpers/functions.config.d.ts @@ -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; diff --git a/helpers/functions.config.js b/helpers/functions.config.js index 06397f2d..ba961d75 100644 --- a/helpers/functions.config.js +++ b/helpers/functions.config.js @@ -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); diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts index c5844d5c..d224bb7d 100644 --- a/helpers/functions.config.ts +++ b/helpers/functions.config.ts @@ -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; diff --git a/public-typescript/workOrderSearch.js b/public-typescript/workOrderSearch.js index 6957168e..d81ae63f 100644 --- a/public-typescript/workOrderSearch.js +++ b/public-typescript/workOrderSearch.js @@ -73,15 +73,25 @@ Object.defineProperty(exports, "__esModule", { value: true }); relatedHTML + "") + ('' + - ('' + - ' ' + + ('' + + ' ' + workOrder.workOrderOpenDateString + "
") + - ('' + - ' ' + + ('' + + ' ' + (workOrder.workOrderCloseDate ? workOrder.workOrderCloseDateString - : '(No Close Date)') + + : '(No ' + + cityssm.escapeHTML(exports.aliases.workOrderCloseDate) + + ")") + "") + "") + ("" + @@ -148,14 +158,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); ""; 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); } }); }; diff --git a/public-typescript/workOrderSearch.ts b/public-typescript/workOrderSearch.ts index d5ee777b..3bdead25 100644 --- a/public-typescript/workOrderSearch.ts +++ b/public-typescript/workOrderSearch.ts @@ -106,15 +106,25 @@ declare const cityssm: cityssmGlobal; relatedHTML + "") + ('' + - ('' + - ' ' + + ('' + + ' ' + workOrder.workOrderOpenDateString + "
") + - ('' + - ' ' + + ('' + + ' ' + (workOrder.workOrderCloseDate ? workOrder.workOrderCloseDateString - : '(No Close Date)') + + : '(No ' + + cityssm.escapeHTML(exports.aliases.workOrderCloseDate) + + ")") + "") + "") + ("" + @@ -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); } } ); diff --git a/public/javascripts/workOrderSearch.min.js b/public/javascripts/workOrderSearch.min.js index d9bb6d8c..34cbe7ca 100644 --- a/public/javascripts/workOrderSearch.min.js +++ b/public/javascripts/workOrderSearch.min.js @@ -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='

Loading Work Orders...
',cityssm.postJSON(e.urlPrefix+"/workOrders/doSearchWorkOrders",s,s=>{if(0===s.workOrders.length)return void(a.innerHTML='

There are no work orders that meet the search criteria.

');const o=document.createElement("tbody");for(const a of s.workOrders){let s="";for(const e of a.workOrderLots)s+=' '+cityssm.escapeHTML(e.lotName||"(No Lot Name)")+"
";for(const e of a.workOrderLotOccupancies)for(const t of e.lotOccupancyOccupants)s+=' '+cityssm.escapeHTML(t.occupantName||"(No Name)")+"
";o.insertAdjacentHTML("beforeend",''+(a.workOrderNumber.trim()?cityssm.escapeHTML(a.workOrderNumber||""):"(No Number)")+""+cityssm.escapeHTML(a.workOrderType||"")+'
'+cityssm.escapeHTML(a.workOrderDescription||"")+''+s+' '+a.workOrderOpenDateString+'
'+(a.workOrderCloseDate?a.workOrderCloseDateString:'(No Close Date)')+""+(0===a.workOrderMilestoneCount?"-":a.workOrderMilestoneCompletionCount+" / "+a.workOrderMilestoneCount)+""+(t.length>0?'':"")+"")}a.innerHTML=''+(t.length>0?'':"")+'
Work Order NumberDescriptionRelatedDateProgress
Displaying '+(i+1).toString()+" to "+Math.min(s.count,r+i)+" of "+s.count+'
'+(i>0?'
':"")+(r+i
':"")+"
",a.querySelector("table").append(o),i>0&&a.querySelector("button[data-page='previous']").addEventListener("click",n),r+i{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()})(); \ No newline at end of file +"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='

Loading Work Orders...
',cityssm.postJSON(e.urlPrefix+"/workOrders/doSearchWorkOrders",s,s=>{if(0===s.workOrders.length)return void(a.innerHTML='

There are no work orders that meet the search criteria.

');const o=document.createElement("tbody");for(const a of s.workOrders){let s="";for(const e of a.workOrderLots)s+=' '+cityssm.escapeHTML(e.lotName||"(No Lot Name)")+"
";for(const e of a.workOrderLotOccupancies)for(const t of e.lotOccupancyOccupants)s+=' '+cityssm.escapeHTML(t.occupantName||"(No Name)")+"
";o.insertAdjacentHTML("beforeend",'"+(t.length>0?'':"")+"")}a.innerHTML='
'+(a.workOrderNumber.trim()?cityssm.escapeHTML(a.workOrderNumber||""):"(No Number)")+""+cityssm.escapeHTML(a.workOrderType||"")+'
'+cityssm.escapeHTML(a.workOrderDescription||"")+'		'+s+' '+a.workOrderOpenDateString+'
'+(a.workOrderCloseDate?a.workOrderCloseDateString:'(No '+cityssm.escapeHTML(exports.aliases.workOrderCloseDate)+")")+"		"+(0===a.workOrderMilestoneCount?"-":a.workOrderMilestoneCompletionCount+" / "+a.workOrderMilestoneCount)+"
'+(t.length>0?'':"")+'
Work Order NumberDescriptionRelatedDateProgress
Displaying '+(i+1).toString()+" to "+Math.min(s.count,r+i)+" of "+s.count+'
'+(i>0?'
':"")+(r+i
':"")+"
",a.querySelector("table").append(o),i>0&&a.querySelector("button[data-page='previous']").addEventListener("click",n),r+i{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()})(); \ No newline at end of file diff --git a/types/configTypes.d.ts b/types/configTypes.d.ts index 3c8786e9..4f1c4074 100644 --- a/types/configTypes.d.ts +++ b/types/configTypes.d.ts @@ -24,6 +24,8 @@ export interface Config { occupant?: string; occupants?: string; externalReceiptNumber?: string; + workOrderOpenDate?: string; + workOrderCloseDate?: string; }; settings: { fees: { diff --git a/types/configTypes.ts b/types/configTypes.ts index fddf24c3..8e640f52 100644 --- a/types/configTypes.ts +++ b/types/configTypes.ts @@ -24,6 +24,8 @@ export interface Config { occupant?: string; occupants?: string; externalReceiptNumber?: string; + workOrderOpenDate?: string; + workOrderCloseDate?: string; }; settings: { fees: { diff --git a/views/_footerA.ejs b/views/_footerA.ejs index f9371ff5..5676b7b3 100644 --- a/views/_footerA.ejs +++ b/views/_footerA.ejs @@ -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") %>" }; diff --git a/views/print/pdf/workOrder-commentLog.ejs b/views/print/pdf/workOrder-commentLog.ejs index 82a84f78..2a9c1cf1 100644 --- a/views/print/pdf/workOrder-commentLog.ejs +++ b/views/print/pdf/workOrder-commentLog.ejs @@ -32,12 +32,12 @@

- Open Date
+ <%= configFunctions.getProperty("aliases.workOrderOpenDate") %>
<%= workOrder.workOrderOpenDateString %>

<% if (workOrder.workOrderCloseDate) { %>

- Close Date
+ <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>
<%= workOrder.workOrderCloseDateString %>

<% } %> diff --git a/views/print/pdf/workOrder.ejs b/views/print/pdf/workOrder.ejs index 935430c4..eb7fc0c5 100644 --- a/views/print/pdf/workOrder.ejs +++ b/views/print/pdf/workOrder.ejs @@ -32,12 +32,12 @@

- Open Date
+ <%= configFunctions.getProperty("aliases.workOrderOpenDate") %>
<%= workOrder.workOrderOpenDateString %>

<% if (workOrder.workOrderCloseDate) { %>

- Close Date
+ <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>
<%= workOrder.workOrderCloseDateString %>

<% } %> diff --git a/views/workOrder-edit.ejs b/views/workOrder-edit.ejs index 1c0e333b..4b893b43 100644 --- a/views/workOrder-edit.ejs +++ b/views/workOrder-edit.ejs @@ -133,7 +133,7 @@
- +
<% const currentDateString = dateTimeFunctions.dateToString(new Date()); @@ -150,7 +150,7 @@
- +
diff --git a/views/workOrder-search.ejs b/views/workOrder-search.ejs index bd1722c3..fb2d4de6 100644 --- a/views/workOrder-search.ejs +++ b/views/workOrder-search.ejs @@ -77,7 +77,7 @@
- +
diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs index 0f74b82d..3eacaef5 100644 --- a/views/workOrder-view.ejs +++ b/views/workOrder-view.ejs @@ -95,15 +95,15 @@

- Open Date
+ <%= configFunctions.getProperty("aliases.workOrderOpenDate") %>
<%= workOrder.workOrderOpenDateString %>

- Close Date
+ <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>
<% if (workOrder.workOrderCloseDate) { %> <%= workOrder.workOrderCloseDateString %> <% } else { %> - (No Close Date) + (No <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>) <% } %>