diff --git a/handlers/lots-post/doSearchLots.js b/handlers/lots-post/doSearchLots.js index 8527e14a..1520a12a 100644 --- a/handlers/lots-post/doSearchLots.js +++ b/handlers/lots-post/doSearchLots.js @@ -6,6 +6,7 @@ export const handler = async (request, response) => { }); response.json({ count: result.count, + offset: Number.parseInt(request.body.offset, 10), lots: result.lots }); }; diff --git a/handlers/lots-post/doSearchLots.ts b/handlers/lots-post/doSearchLots.ts index 60ac7c70..f491653d 100644 --- a/handlers/lots-post/doSearchLots.ts +++ b/handlers/lots-post/doSearchLots.ts @@ -10,6 +10,7 @@ export const handler: RequestHandler = async (request, response) => { response.json({ count: result.count, + offset: Number.parseInt(request.body.offset, 10), lots: result.lots }); }; diff --git a/public-typescript/lotOccupancySearch.js b/public-typescript/lotOccupancySearch.js index 1d04b8b9..8a9151f7 100644 --- a/public-typescript/lotOccupancySearch.js +++ b/public-typescript/lotOccupancySearch.js @@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); searchResultsContainerElement.innerHTML = '
"; return; @@ -26,30 +26,30 @@ Object.defineProperty(exports, "__esModule", { value: true }); lotOccupancy.occupancyEndDateString >= nowDateString)) { occupancyTimeHTML = '' + ('') + ""; } else if (lotOccupancy.occupancyStartDateString > nowDateString) { occupancyTimeHTML = '' + ('') + ""; } else { occupancyTimeHTML = '' + ('') + ""; } @@ -88,7 +88,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); cityssm.escapeHTML(lotOccupancy.lotName) + "" : '(No ' + - cityssm.escapeHTML(exports.aliases.lot) + + los.escapedAliases.Lot + ")") + "| ' + - (" | " + cityssm.escapeHTML(exports.aliases.occupancy) + " Type | ") + - ("" + cityssm.escapeHTML(exports.aliases.lot) + " | ") + - ("" + cityssm.escapeHTML(exports.aliases.occupancyStartDate) + " | ") + + ("" + los.escapedAliases.Occupancy + " Type | ") + + ("" + los.escapedAliases.Lot + " | ") + + ("" + los.escapedAliases.OccupancyStartDate + " | ") + "End Date | " + - ("" + cityssm.escapeHTML(exports.aliases.occupants) + " | ") + + ("" + los.escapedAliases.Occupants + " | ") + '
|---|
| ' + - (" | " + cityssm.escapeHTML(exports.aliases.occupancy) + " Type | ") + - ("" + cityssm.escapeHTML(exports.aliases.lot) + " | ") + - ("" + cityssm.escapeHTML(exports.aliases.occupancyStartDate) + " | ") + + ("" + los.escapedAliases.Occupancy + " Type | ") + + ("" + los.escapedAliases.Lot + " | ") + + ("" + los.escapedAliases.OccupancyStartDate + " | ") + "End Date | " + - ("" + cityssm.escapeHTML(exports.aliases.occupants) + " | ") + + ("" + los.escapedAliases.Occupants + " | ") + '
|---|
| " + + '' + + cityssm.escapeHTML(lot.lotName || "") + + "" + + " | ") + + ("" + + '' + + (lot.mapName + ? cityssm.escapeHTML(lot.mapName) + : '(No Name)') + + "" + + " | ") + + ("" + cityssm.escapeHTML(lot.lotType || "") + " | ") + + ("" +
+ (lot.lotStatusId
+ ? cityssm.escapeHTML(lot.lotStatus || "")
+ : '(No Status)') +
+ " " + + (lot.lotOccupancyCount > 0 + ? 'Currently Occupied' + : "") + + " | ") +
+ "
| " + los.escapedAliases.Lot + " | ") + + ("" + los.escapedAliases.Map + " | ") + + ("" + los.escapedAliases.Lot + " Type | ") + + "Status | " + + "
|---|
| " + - '' + - cityssm.escapeHTML(lot.lotName || "") + - "" + - " | ") + - ("" + - '' + - (lot.mapName - ? cityssm.escapeHTML(lot.mapName) - : '(No Name)') + - "" + - " | ") + - ("" + cityssm.escapeHTML(lot.lotType || "") + " | ") + - ("" +
- (lot.lotStatusId
- ? cityssm.escapeHTML(lot.lotStatus || "")
- : '(No Status)') +
- " " + - (lot.lotOccupancyCount > 0 - ? 'Currently Occupied' - : "") + - " | ") +
- "
| " + cityssm.escapeHTML(exports.aliases.lot) + " | ") + - ("" + cityssm.escapeHTML(exports.aliases.map) + " | ") + - ("" + cityssm.escapeHTML(exports.aliases.lot) + " Type | ") + - "Status | " + - "
|---|
| " + + '' + + cityssm.escapeHTML(lot.lotName || "") + + "" + + " | ") + + ("" + + '' + + (lot.mapName + ? cityssm.escapeHTML(lot.mapName) + : '(No Name)') + + "" + + " | ") + + ("" + cityssm.escapeHTML(lot.lotType || "") + " | ") + + ("" +
+ (lot.lotStatusId
+ ? cityssm.escapeHTML(lot.lotStatus || "")
+ : '(No Status)') +
+ " " + + (lot.lotOccupancyCount! > 0 + ? 'Currently Occupied' + : "") + + " | ") +
+ "
| " + los.escapedAliases.Lot + " | ") + + ("" + los.escapedAliases.Map + " | ") + + ("" + los.escapedAliases.Lot + " Type | ") + + "Status | " + + "
|---|
| " + - '' + - cityssm.escapeHTML(lot.lotName || "") + - "" + - " | ") + - ("" + - '' + - (lot.mapName - ? cityssm.escapeHTML(lot.mapName) - : '(No Name)') + - "" + - " | ") + - ("" + cityssm.escapeHTML(lot.lotType || "") + " | ") + - ("" +
- (lot.lotStatusId
- ? cityssm.escapeHTML(lot.lotStatus || "")
- : '(No Status)') +
- " " + - (lot.lotOccupancyCount! > 0 - ? 'Currently Occupied' - : "") + - " | ") +
- "
| " + cityssm.escapeHTML(exports.aliases.lot) + " | ") + - ("" + cityssm.escapeHTML(exports.aliases.map) + " | ") + - ("" + cityssm.escapeHTML(exports.aliases.lot) + " Type | ") + - "Status | " + - "
|---|
| ' +
('' +
' ' +
workOrder.workOrderOpenDateString +
" ") + ('' + ' ' + (workOrder.workOrderCloseDate ? workOrder.workOrderCloseDateString : '(No ' + - cityssm.escapeHTML(exports.aliases.workOrderCloseDate) + + los.escapedAliases.WorkOrderCloseDate + ")") + "") + " | ") +
diff --git a/public-typescript/workOrderSearch.ts b/public-typescript/workOrderSearch.ts
index c9b7ef16..d3116a1e 100644
--- a/public-typescript/workOrderSearch.ts
+++ b/public-typescript/workOrderSearch.ts
@@ -28,7 +28,11 @@ declare const cityssm: cityssmGlobal;
const offsetElement = document.querySelector("#searchFilter--offset") as HTMLInputElement;
- function renderWorkOrders(responseJSON: { count: number; offset: number; workOrders: recordTypes.WorkOrder[]; }) {
+ function renderWorkOrders(responseJSON: {
+ count: number;
+ offset: number;
+ workOrders: recordTypes.WorkOrder[];
+ }) {
if (responseJSON.workOrders.length === 0) {
searchResultsContainerElement.innerHTML =
'"
: "") +
"") +
"";
diff --git a/public/javascripts/lotOccupancySearch.min.js b/public/javascripts/lotOccupancySearch.min.js
index 85fe67c7..b12f8fb7 100644
--- a/public/javascripts/lotOccupancySearch.min.js
+++ b/public/javascripts/lotOccupancySearch.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const t=exports.los,e=document.querySelector("#form--searchFilters"),a=document.querySelector("#container--searchResults"),s=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),c=document.querySelector("#searchFilter--offset");function i(e){if(0===e.lotOccupancies.length)return void(a.innerHTML='");const c=document.createElement("tbody"),i=cityssm.dateToString(new Date);for(const a of e.lotOccupancies){let e="";e=a.occupancyStartDateString<=i&&(""===a.occupancyEndDateString||a.occupancyEndDateString>=i)?'':a.occupancyStartDateString>i?'':'';let s="";for(const t of a.lotOccupancyOccupants)s+=' '+cityssm.escapeHTML(t.occupantName||"")+"||||||
| '+e+' | '+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.printEJS?'':"")+" |
| '+cityssm.escapeHTML(exports.aliases.occupancy)+" Type | "+cityssm.escapeHTML(exports.aliases.lot)+" | "+cityssm.escapeHTML(exports.aliases.occupancyStartDate)+" | End Date | "+cityssm.escapeHTML(exports.aliases.occupants)+' |
|---|
| '+e+' | '+cityssm.escapeHTML(a.occupancyType)+" | "+(a.lotName?''+cityssm.escapeHTML(a.lotName)+"":'(No '+t.escapedAliases.Lot+")")+' '+cityssm.escapeHTML(a.mapName||"")+" | "+a.occupancyStartDateString+" | "+(a.occupancyEndDate?a.occupancyEndDateString:'(No End Date)')+" | "+s+" | "+(a.printEJS?'':"")+" |
| '+t.escapedAliases.Occupancy+" Type | "+t.escapedAliases.Lot+" | "+t.escapedAliases.OccupancyStartDate+" | End Date | "+t.escapedAliases.Occupants+' |
|---|
| '+cityssm.escapeHTML(s.lotName||"")+' | '+(s.mapName?cityssm.escapeHTML(s.mapName):'(No Name)')+" | "+cityssm.escapeHTML(s.lotType||"")+" | "+(s.lotStatusId?cityssm.escapeHTML(s.lotStatus||""):'(No Status)')+" "+(s.lotOccupancyCount>0?'Currently Occupied':"")+" |
| '+cityssm.escapeHTML(exports.aliases.lot)+" | "+cityssm.escapeHTML(exports.aliases.map)+" | "+cityssm.escapeHTML(exports.aliases.lot)+' Type | Status |
|---|
| '+cityssm.escapeHTML(s.lotName||"")+' | '+(s.mapName?cityssm.escapeHTML(s.mapName):'(No Name)')+" | "+cityssm.escapeHTML(s.lotType||"")+" | "+(s.lotStatusId?cityssm.escapeHTML(s.lotStatus||""):'(No Status)')+" "+(s.lotOccupancyCount>0?'Currently Occupied':"")+" |
| '+e.escapedAliases.Lot+" | "+e.escapedAliases.Map+" | "+e.escapedAliases.Lot+' Type | Status |
|---|
| '+(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 Number | Description | Related | Date | Progress | '+(t.length>0?'':"")+' |
|---|
| '+(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 '+e.escapedAliases.WorkOrderCloseDate+")")+" | "+(0===a.workOrderMilestoneCount?"-":a.workOrderMilestoneCompletionCount+" / "+a.workOrderMilestoneCount)+" | "+(t.length>0?'':"")+" |
| Work Order Number | Description | Related | Date | Progress | '+(t.length>0?'':"")+' |
|---|