diff --git a/public-typescript/lotOccupancySearch.js b/public-typescript/lotOccupancySearch.js
index eb454165..a1843e4c 100644
--- a/public-typescript/lotOccupancySearch.js
+++ b/public-typescript/lotOccupancySearch.js
@@ -44,7 +44,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
"" +
"") +
("
" +
- cityssm.escapeHTML(lotOccupancy.lotName || "(No " + exports.aliases.lot + ")") + " " +
+ (lotOccupancy.lotName ? cityssm.escapeHTML(lotOccupancy.lotName) : "(No " + cityssm.escapeHTML(exports.aliases.lot) + ")") + " " +
"" + cityssm.escapeHTML(lotOccupancy.mapName || "") + "" +
" | ") +
("" +
@@ -53,7 +53,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
(" | " +
(lotOccupancy.occupancyEndDate ?
lotOccupancy.occupancyEndDateString :
- "(No End Date)") +
+ "(No End Date)") +
" | ") +
"" + occupantsHTML + " | " +
"");
diff --git a/public-typescript/lotOccupancySearch.ts b/public-typescript/lotOccupancySearch.ts
index fa39b15f..6f3a20fc 100644
--- a/public-typescript/lotOccupancySearch.ts
+++ b/public-typescript/lotOccupancySearch.ts
@@ -76,7 +76,7 @@ declare const cityssm: cityssmGlobal;
"" +
"") +
("" +
- cityssm.escapeHTML(lotOccupancy.lotName || "(No " + exports.aliases.lot + ")") + " " +
+ (lotOccupancy.lotName ? cityssm.escapeHTML(lotOccupancy.lotName) : "(No " + cityssm.escapeHTML(exports.aliases.lot) + ")") + " " +
"" + cityssm.escapeHTML(lotOccupancy.mapName || "") + "" +
" | ") +
("" +
@@ -85,7 +85,7 @@ declare const cityssm: cityssmGlobal;
(" | " +
(lotOccupancy.occupancyEndDate ?
lotOccupancy.occupancyEndDateString :
- "(No End Date)") +
+ "(No End Date)") +
" | ") +
"" + occupantsHTML + " | " +
"");
diff --git a/public/javascripts/lotOccupancySearch.min.js b/public/javascripts/lotOccupancySearch.min.js
index 4c70c854..a461334d 100644
--- a/public/javascripts/lotOccupancySearch.min.js
+++ b/public/javascripts/lotOccupancySearch.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=document.querySelector("main").dataset.urlPrefix,t=document.querySelector("#form--searchFilters"),a=document.querySelector("#container--searchResults"),s=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),c=document.querySelector("#searchFilter--offset"),i=()=>{const i=Number.parseInt(c.value,10);a.innerHTML='
Loading '+exports.aliases.occupancies+"...
",cityssm.postJSON(e+"/lotOccupancies/doSearchLotOccupancies",t,t=>{if(0===t.lotOccupancies.length)return void(a.innerHTML='There are no '+exports.aliases.occupancy.toLowerCase()+" records that meet the search criteria.
");const c=document.createElement("tbody"),n=cityssm.dateToString(new Date);for(const a of t.lotOccupancies){let t="";t=a.occupancyStartDateString<=n&&(""===a.occupancyEndDateString||a.occupancyEndDateString>=n)?'':a.occupancyStartDateString>n?'':'';let s="";for(const e of a.lotOccupancyOccupants)s+=cityssm.escapeHTML(e.occupantName)+"
";c.insertAdjacentHTML("beforeend","| "+t+' | '+cityssm.escapeHTML(a.occupancyType)+" | "+cityssm.escapeHTML(a.lotName||"(No "+exports.aliases.lot+")")+' '+cityssm.escapeHTML(a.mapName||"")+" | "+a.occupancyStartDateString+" | "+(a.occupancyEndDate?a.occupancyEndDateString:"(No End Date)")+" | "+s+" |
")}a.innerHTML=' | '+exports.aliases.occupancy+" Type | "+exports.aliases.lot+" | Start Date | End Date | "+exports.aliases.occupants+' |
|---|
Displaying '+(i+1).toString()+" to "+Math.min(t.count,s+i)+" of "+t.count+'
':"")+"
",a.querySelector("table").append(c),i>0&&a.querySelector("button[data-page='previous']").addEventListener("click",r),s+i{c.value="0",i()},r=()=>{c.value=Math.max(Number.parseInt(c.value,10)-s,0).toString(),i()},o=()=>{c.value=(Number.parseInt(c.value,10)+s).toString(),i()},l=t.querySelectorAll("input, select");for(const e of l)e.addEventListener("change",n);t.addEventListener("submit",e=>{e.preventDefault(),n()}),i()})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=document.querySelector("main").dataset.urlPrefix,t=document.querySelector("#form--searchFilters"),a=document.querySelector("#container--searchResults"),s=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),c=document.querySelector("#searchFilter--offset"),i=()=>{const i=Number.parseInt(c.value,10);a.innerHTML='
Loading '+exports.aliases.occupancies+"...
",cityssm.postJSON(e+"/lotOccupancies/doSearchLotOccupancies",t,t=>{if(0===t.lotOccupancies.length)return void(a.innerHTML='There are no '+exports.aliases.occupancy.toLowerCase()+" records that meet the search criteria.
");const c=document.createElement("tbody"),n=cityssm.dateToString(new Date);for(const a of t.lotOccupancies){let t="";t=a.occupancyStartDateString<=n&&(""===a.occupancyEndDateString||a.occupancyEndDateString>=n)?'':a.occupancyStartDateString>n?'':'';let s="";for(const e of a.lotOccupancyOccupants)s+=cityssm.escapeHTML(e.occupantName)+"
";c.insertAdjacentHTML("beforeend","| "+t+' | '+cityssm.escapeHTML(a.occupancyType)+" | "+(a.lotName?cityssm.escapeHTML(a.lotName):'(No '+cityssm.escapeHTML(exports.aliases.lot)+")")+' '+cityssm.escapeHTML(a.mapName||"")+" | "+a.occupancyStartDateString+" | "+(a.occupancyEndDate?a.occupancyEndDateString:'(No End Date)')+" | "+s+" |
")}a.innerHTML=' | '+exports.aliases.occupancy+" Type | "+exports.aliases.lot+" | Start Date | End Date | "+exports.aliases.occupants+' |
|---|
Displaying '+(i+1).toString()+" to "+Math.min(t.count,s+i)+" of "+t.count+'
':"")+"
",a.querySelector("table").append(c),i>0&&a.querySelector("button[data-page='previous']").addEventListener("click",r),s+i{c.value="0",i()},r=()=>{c.value=Math.max(Number.parseInt(c.value,10)-s,0).toString(),i()},o=()=>{c.value=(Number.parseInt(c.value,10)+s).toString(),i()},l=t.querySelectorAll("input, select");for(const e of l)e.addEventListener("change",n);t.addEventListener("submit",e=>{e.preventDefault(),n()}),i()})();
\ No newline at end of file
diff --git a/views/lotOccupancy-view.ejs b/views/lotOccupancy-view.ejs
index 31e531b5..9a59c6f7 100644
--- a/views/lotOccupancy-view.ejs
+++ b/views/lotOccupancy-view.ejs
@@ -67,7 +67,7 @@
<% if (lotOccupancy.lotId) { %>
<%= lotOccupancy.lotName %>
<% } else { %>
- (No <%= configFunctions.getProperty("aliases.lot") %>)
+ (No <%= configFunctions.getProperty("aliases.lot") %>)
<% } %>
@@ -75,7 +75,7 @@
<% if (lotOccupancy.mapId) { %>
<%= lotOccupancy.mapName %>
<% } else { %>
- (No <%= configFunctions.getProperty("aliases.map") %>)
+ (No <%= configFunctions.getProperty("aliases.map") %>)
<% } %>
@@ -86,7 +86,7 @@
End Date
- <%= (lotOccupancy.occupancyEndDateString === "" ? "(No End Date)" : lotOccupancy.occupancyEndDateString) %>
+ <%= (lotOccupancy.occupancyEndDateString === "" ? "(No End Date)" : lotOccupancy.occupancyEndDateString) %>
<% if (lotOccupancy.lotOccupancyFields.length > 0) { %>