diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.js b/helpers/lotOccupancyDB/getLotOccupancyTransactions.js
index c6e14662..badc944d 100644
--- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.js
+++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.js
@@ -8,13 +8,13 @@ export async function getLotOccupancyTransactions(lotOccupancyId, options, conne
database.function('userFn_timeIntegerToString', timeIntegerToString);
const lotOccupancyTransactions = database
.prepare(`select lotOccupancyId, transactionIndex,
- transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString,
- transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString,
- transactionAmount, externalReceiptNumber, transactionNote
- from LotOccupancyTransactions
- where recordDelete_timeMillis is null
- and lotOccupancyId = ?
- order by transactionDate, transactionTime, transactionIndex`)
+ transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString,
+ transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString,
+ transactionAmount, externalReceiptNumber, transactionNote
+ from LotOccupancyTransactions
+ where recordDelete_timeMillis is null
+ and lotOccupancyId = ?
+ order by transactionDate, transactionTime, transactionIndex`)
.all(lotOccupancyId);
if (connectedDatabase === undefined) {
database.release();
diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts b/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts
index bee3759d..85785277 100644
--- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts
+++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts
@@ -26,13 +26,13 @@ export async function getLotOccupancyTransactions(
const lotOccupancyTransactions = database
.prepare(
`select lotOccupancyId, transactionIndex,
- transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString,
- transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString,
- transactionAmount, externalReceiptNumber, transactionNote
- from LotOccupancyTransactions
- where recordDelete_timeMillis is null
- and lotOccupancyId = ?
- order by transactionDate, transactionTime, transactionIndex`
+ transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString,
+ transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString,
+ transactionAmount, externalReceiptNumber, transactionNote
+ from LotOccupancyTransactions
+ where recordDelete_timeMillis is null
+ and lotOccupancyId = ?
+ order by transactionDate, transactionTime, transactionIndex`
)
.all(lotOccupancyId) as recordTypes.LotOccupancyTransaction[]
diff --git a/public-typescript/lotOccupancySearch.js b/public-typescript/lotOccupancySearch.js
index 485b2d10..9166d4c2 100644
--- a/public-typescript/lotOccupancySearch.js
+++ b/public-typescript/lotOccupancySearch.js
@@ -110,7 +110,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
('| ' +
(occupantsHTML === ''
? ''
- : '') +
+ : '') +
' | ') +
('' + feeIconHTML + ' | ') +
'' +
diff --git a/public-typescript/lotOccupancySearch.ts b/public-typescript/lotOccupancySearch.ts
index 55339c0b..ee100c08 100644
--- a/public-typescript/lotOccupancySearch.ts
+++ b/public-typescript/lotOccupancySearch.ts
@@ -159,7 +159,7 @@ declare const cityssm: cityssmGlobal
(' | ' +
(occupantsHTML === ''
? ''
- : '') +
+ : '') +
' | ') +
('' + feeIconHTML + ' | ') +
'' +
diff --git a/public-typescript/workOrderSearch.js b/public-typescript/workOrderSearch.js
index ae1ce044..f29334d8 100644
--- a/public-typescript/workOrderSearch.js
+++ b/public-typescript/workOrderSearch.js
@@ -9,8 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
const searchResultsContainerElement = document.querySelector('#container--searchResults');
const limit = Number.parseInt(document.querySelector('#searchFilter--limit').value, 10);
const offsetElement = document.querySelector('#searchFilter--offset');
- function renderWorkOrders(responseJSON) {
+ function renderWorkOrders(rawResponseJSON) {
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+ const responseJSON = rawResponseJSON;
if (responseJSON.workOrders.length === 0) {
searchResultsContainerElement.innerHTML = `
There are no work orders that meet the search criteria.
@@ -21,7 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
for (const workOrder of responseJSON.workOrders) {
let relatedHTML = '';
for (const lot of workOrder.workOrderLots) {
- relatedHTML += `
' +
' | ') +
- ('' +
- cityssm.escapeHTML((_h = workOrder.workOrderType) !== null && _h !== void 0 ? _h : '') +
- '
' +
- '' +
- cityssm.escapeHTML((_j = workOrder.workOrderDescription) !== null && _j !== void 0 ? _j : '') +
- '' +
- ' | ') +
+ `
+ ${cityssm.escapeHTML((_h = workOrder.workOrderType) !== null && _h !== void 0 ? _h : '')}
+
+ ${cityssm.escapeHTML((_j = workOrder.workOrderDescription) !== null && _j !== void 0 ? _j : '')}
+
+ | ` +
('' +
(relatedHTML === ''
? ''
@@ -71,16 +71,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
' | ') +
('' +
'' +
- ('- ' +
- '' +
- ' ' +
- workOrder.workOrderOpenDateString +
- '
') +
- ('-
+
+
+
+ ${workOrder.workOrderOpenDateString}
+
` +
+ ('- ' +
'' +
diff --git a/public-typescript/workOrderSearch.ts b/public-typescript/workOrderSearch.ts
index 73c37f45..23e25a9d 100644
--- a/public-typescript/workOrderSearch.ts
+++ b/public-typescript/workOrderSearch.ts
@@ -29,11 +29,13 @@ declare const cityssm: cityssmGlobal
'#searchFilter--offset'
) as HTMLInputElement
- function renderWorkOrders(responseJSON: {
- count: number
- offset: number
- workOrders: recordTypes.WorkOrder[]
- }): void {
+ function renderWorkOrders(rawResponseJSON: unknown): void {
+ const responseJSON = rawResponseJSON as {
+ count: number
+ offset: number
+ workOrders: recordTypes.WorkOrder[]
+ }
+
if (responseJSON.workOrders.length === 0) {
searchResultsContainerElement.innerHTML = `
There are no work orders that meet the search criteria.
@@ -48,7 +50,7 @@ declare const cityssm: cityssmGlobal
let relatedHTML = ''
for (const lot of workOrder.workOrderLots!) {
- relatedHTML += ` -
@@ -96,13 +98,12 @@ declare const cityssm: cityssmGlobal
: cityssm.escapeHTML(workOrder.workOrderNumber ?? '')) +
'' +
'
| ') +
- ('' +
- cityssm.escapeHTML(workOrder.workOrderType ?? '') +
- '
' +
- '' +
- cityssm.escapeHTML(workOrder.workOrderDescription ?? '') +
- '' +
- ' | ') +
+ `
+ ${cityssm.escapeHTML(workOrder.workOrderType ?? '')}
+
+ ${cityssm.escapeHTML(workOrder.workOrderDescription ?? '')}
+
+ | ` +
('' +
(relatedHTML === ''
? ''
@@ -110,16 +111,15 @@ declare const cityssm: cityssmGlobal
' | ') +
('' +
'' +
- ('- ' +
- '' +
- ' ' +
- workOrder.workOrderOpenDateString! +
- '
') +
- ('-
+
+
+
+ ${workOrder.workOrderOpenDateString!}
+
` +
+ ('- ' +
'' +
diff --git a/public/javascripts/lotOccupancySearch.min.js b/public/javascripts/lotOccupancySearch.min.js
index 1318de77..d24c474b 100644
--- a/public/javascripts/lotOccupancySearch.min.js
+++ b/public/javascripts/lotOccupancySearch.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const a=exports.los,t=document.querySelector("#form--searchFilters"),e=document.querySelector("#container--searchResults"),s=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),c=document.querySelector("#searchFilter--offset");function n(t){var c,n,l,i,d,p,u,h,y,f,m,v,g;const L=t;if(0===L.lotOccupancies.length)return void(e.innerHTML=`
\n \n There are no ${a.escapedAliases.occupancy} records that meet the search criteria.\n \n - '+cityssm.escapeHTML(null!==(l=a.occupantName)&&void 0!==l?l:"")+" "+cityssm.escapeHTML(null!==(i=a.occupantFamilyName)&&void 0!==i?i:"")+"
";const o=(null!==(p=null===(d=t.lotOccupancyFees)||void 0===d?void 0:d.reduce((a,t)=>{var e,s,c;return a+((null!==(e=t.feeAmount)&&void 0!==e?e:0)+(null!==(s=t.taxAmount)&&void 0!==s?s:0))*(null!==(c=t.quantity)&&void 0!==c?c:0)},0))&&void 0!==p?p:0).toFixed(2),r=(null!==(h=null===(u=t.lotOccupancyTransactions)||void 0===u?void 0:u.reduce((a,t)=>a+t.transactionAmount,0))&&void 0!==h?h:0).toFixed(2);let v="";"0.00"===o&&"0.00"===r||(v=`\n \n `),S.insertAdjacentHTML("beforeend",'| '+e+' | '+cityssm.escapeHTML(t.occupancyType)+"
"+`#${t.lotOccupancyId}`+" | "+(-1===(null!==(y=t.lotId)&&void 0!==y?y:-1)?'(No '+a.escapedAliases.Lot+")":''+cityssm.escapeHTML(t.lotName)+"")+'
'+cityssm.escapeHTML(null!==(m=t.mapName)&&void 0!==m?m:"")+" | "+t.occupancyStartDateString+" | "+(t.occupancyEndDate?t.occupancyEndDateString:'(No End Date)')+" | "+(""===s?"":'")+" | "+v+" | "+(t.printEJS?'':"")+" | ")}e.innerHTML=` |