diff --git a/public-typescript/lotOccupancySearch.js b/public-typescript/lotOccupancySearch.js
index 39bbb835..bc216b59 100644
--- a/public-typescript/lotOccupancySearch.js
+++ b/public-typescript/lotOccupancySearch.js
@@ -7,8 +7,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 renderLotOccupancies(responseJSON) {
+    function renderLotOccupancies(rawResponseJSON) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        const responseJSON = rawResponseJSON;
         if (responseJSON.lotOccupancies.length === 0) {
             searchResultsContainerElement.innerHTML = `<div class="message is-info">
         <p class="message-body">
@@ -80,7 +81,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     los.getLotOccupancyURL(lotOccupancy.lotOccupancyId) +
                     '">' +
                     cityssm.escapeHTML(lotOccupancy.occupancyType) +
-                    '</a>' +
+                    '</a><br />' +
+                    `<span class="is-size-7">#${lotOccupancy.lotOccupancyId}</span>` +
                     '</td>') +
                 ('<td>' +
                     (((_j = lotOccupancy.lotId) !== null && _j !== void 0 ? _j : -1) === -1
@@ -114,7 +116,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         '/print/' +
                         lotOccupancy.printEJS +
                         '/?lotOccupancyId=' +
-                        lotOccupancy.lotOccupancyId +
+                        lotOccupancy.lotOccupancyId.toString() +
                         '" target="_blank">' +
                         '<i class="fas fa-print" aria-label="Print"></i>' +
                         '</a>'
diff --git a/public-typescript/lotOccupancySearch.ts b/public-typescript/lotOccupancySearch.ts
index 477a4790..ef5860c6 100644
--- a/public-typescript/lotOccupancySearch.ts
+++ b/public-typescript/lotOccupancySearch.ts
@@ -26,11 +26,13 @@ declare const cityssm: cityssmGlobal
     '#searchFilter--offset'
   ) as HTMLInputElement
 
-  function renderLotOccupancies(responseJSON: {
-    count: number
-    offset: number
-    lotOccupancies: recordTypes.LotOccupancy[]
-  }): void {
+  function renderLotOccupancies(rawResponseJSON: unknown): void {
+    const responseJSON = rawResponseJSON as {
+      count: number
+      offset: number
+      lotOccupancies: recordTypes.LotOccupancy[]
+    }
+
     if (responseJSON.lotOccupancies.length === 0) {
       searchResultsContainerElement.innerHTML = `<div class="message is-info">
         <p class="message-body">
@@ -128,7 +130,8 @@ declare const cityssm: cityssmGlobal
             los.getLotOccupancyURL(lotOccupancy.lotOccupancyId) +
             '">' +
             cityssm.escapeHTML(lotOccupancy.occupancyType as string) +
-            '</a>' +
+            '</a><br />' +
+            `<span class="is-size-7">#${lotOccupancy.lotOccupancyId!}</span>` +
             '</td>') +
           ('<td>' +
             ((lotOccupancy.lotId ?? -1) === -1
@@ -162,7 +165,7 @@ declare const cityssm: cityssmGlobal
               '/print/' +
               lotOccupancy.printEJS +
               '/?lotOccupancyId=' +
-              lotOccupancy.lotOccupancyId +
+              lotOccupancy.lotOccupancyId!.toString() +
               '" target="_blank">' +
               '<i class="fas fa-print" aria-label="Print"></i>' +
               '</a>'
diff --git a/public-typescript/workOrderEdit.js b/public-typescript/workOrderEdit.js
index 3cb45f33..feae4b55 100644
--- a/public-typescript/workOrderEdit.js
+++ b/public-typescript/workOrderEdit.js
@@ -150,8 +150,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 cityssm.postJSON(los.urlPrefix + '/workOrders/doDeleteWorkOrderLotOccupancy', {
                     workOrderId,
                     lotOccupancyId
-                }, (responseJSON) => {
+                }, (rawResponseJSON) => {
                     var _a;
+                    const responseJSON = rawResponseJSON;
                     if (responseJSON.success) {
                         workOrderLotOccupancies = responseJSON.workOrderLotOccupancies;
                         renderRelatedLotsAndOccupancies();
@@ -179,8 +180,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
             cityssm.postJSON(los.urlPrefix + '/workOrders/doAddWorkOrderLot', {
                 workOrderId,
                 lotId
-            }, (responseJSON) => {
+            }, (rawResponseJSON) => {
                 var _a;
+                const responseJSON = rawResponseJSON;
                 if (responseJSON.success) {
                     workOrderLots = responseJSON.workOrderLots;
                     renderRelatedLotsAndOccupancies();
@@ -192,7 +194,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         contextualColorName: 'danger'
                     });
                 }
-                if (callbackFunction) {
+                if (callbackFunction !== undefined) {
                     callbackFunction(responseJSON.success);
                 }
             });
@@ -201,8 +203,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
             cityssm.postJSON(los.urlPrefix + '/workOrders/doAddWorkOrderLotOccupancy', {
                 workOrderId,
                 lotOccupancyId
-            }, (responseJSON) => {
+            }, (rawResponseJSON) => {
                 var _a;
+                const responseJSON = rawResponseJSON;
                 if (responseJSON.success) {
                     workOrderLotOccupancies = responseJSON.workOrderLotOccupancies;
                     renderRelatedLotsAndOccupancies();
@@ -214,7 +217,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         contextualColorName: 'danger'
                     });
                 }
-                if (callbackFunction) {
+                if (callbackFunction !== undefined) {
                     callbackFunction(responseJSON.success);
                 }
             });
@@ -271,7 +274,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
                             los.getLotOccupancyURL(lotOccupancy.lotOccupancyId) +
                             '">' +
                             cityssm.escapeHTML((_a = lotOccupancy.occupancyType) !== null && _a !== void 0 ? _a : '') +
-                            '</a>' +
+                            '</a><br />' +
+                            `<span class="is-size-7">#${lotOccupancy.lotOccupancyId}</span>` +
                             '</td>');
                 if (lotOccupancy.lotId) {
                     rowElement.insertAdjacentHTML('beforeend', '<td>' +
@@ -280,7 +284,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                             ? ''
                             : ' <button class="button is-small is-light is-success button--addLot"' +
                                 ' data-lot-id="' +
-                                lotOccupancy.lotId +
+                                lotOccupancy.lotId.toString() +
                                 '"' +
                                 ' data-tooltip="Add ' +
                                 los.escapedAliases.Lot +
@@ -348,8 +352,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
             let editCloseModalFunction;
             function doUpdateLotStatus(submitEvent) {
                 submitEvent.preventDefault();
-                cityssm.postJSON(los.urlPrefix + '/workOrders/doUpdateLotStatus', submitEvent.currentTarget, (responseJSON) => {
+                cityssm.postJSON(los.urlPrefix + '/workOrders/doUpdateLotStatus', submitEvent.currentTarget, (rawResponseJSON) => {
                     var _a;
+                    const responseJSON = rawResponseJSON;
                     if (responseJSON.success) {
                         workOrderLots = responseJSON.workOrderLots;
                         renderRelatedLotsAndOccupancies();
@@ -411,8 +416,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 cityssm.postJSON(los.urlPrefix + '/workOrders/doDeleteWorkOrderLot', {
                     workOrderId,
                     lotId
-                }, (responseJSON) => {
+                }, (rawResponseJSON) => {
                     var _a;
+                    const responseJSON = rawResponseJSON;
                     if (responseJSON.success) {
                         workOrderLots = responseJSON.workOrderLots;
                         renderRelatedLotsAndOccupancies();
@@ -468,21 +474,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         cityssm.escapeHTML((_a = lot.lotName) !== null && _a !== void 0 ? _a : '') +
                         '</a>' +
                         '</td>' +
-                        ('<td>' + cityssm.escapeHTML((_b = lot.mapName) !== null && _b !== void 0 ? _b : '') + '</td>') +
-                        ('<td>' + cityssm.escapeHTML((_c = lot.lotType) !== null && _c !== void 0 ? _c : '') + '</td>') +
+                        `<td>${cityssm.escapeHTML((_b = lot.mapName) !== null && _b !== void 0 ? _b : '')}</td>` +
+                        `<td>${cityssm.escapeHTML((_c = lot.lotType) !== null && _c !== void 0 ? _c : '')}</td>` +
                         ('<td>' +
                             (lot.lotStatusId
                                 ? cityssm.escapeHTML((_d = lot.lotStatus) !== null && _d !== void 0 ? _d : '')
                                 : '<span class="has-text-grey">(No Status)</span>') +
                             '</td>') +
-                        ('<td class="is-nowrap">' +
-                            '<button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">' +
-                            '<i class="fas fa-pencil-alt" aria-hidden="true"></i>' +
-                            '</button>' +
-                            ' <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">' +
-                            '<i class="fas fa-trash" aria-hidden="true"></i>' +
-                            '</button>' +
-                            '</td>');
+                        `<td class="is-nowrap">
+                <button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">
+                <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                </button>
+                <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">
+                <i class="fas fa-trash" aria-hidden="true"></i>
+                </button>
+                </td>`;
                 rowElement
                     .querySelector('.button--editLotStatus')
                     .addEventListener('click', openEditLotStatus);
@@ -516,8 +522,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 }
                 searchResultsContainerElement.innerHTML =
                     los.getLoadingParagraphHTML('Searching...');
-                cityssm.postJSON(los.urlPrefix + '/lotOccupancies/doSearchLotOccupancies', searchFormElement, (responseJSON) => {
+                cityssm.postJSON(los.urlPrefix + '/lotOccupancies/doSearchLotOccupancies', searchFormElement, (rawResponseJSON) => {
                     var _a, _b;
+                    const responseJSON = rawResponseJSON;
                     if (responseJSON.lotOccupancies.length === 0) {
                         searchResultsContainerElement.innerHTML = `<div class="message is-info">
                       <p class="message-body">There are no records that meet the search criteria.</p>
@@ -540,15 +547,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         rowElement.className = 'container--lotOccupancy';
                         rowElement.dataset.lotOccupancyId =
                             lotOccupancy.lotOccupancyId.toString();
-                        rowElement.innerHTML =
-                            '<td class="has-text-centered">' +
-                                '<button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">' +
-                                '<i class="fas fa-plus" aria-hidden="true"></i>' +
-                                '</button>' +
-                                '</td>' +
-                                ('<td class="has-text-weight-bold">' +
-                                    cityssm.escapeHTML((_a = lotOccupancy.occupancyType) !== null && _a !== void 0 ? _a : '') +
-                                    '</td>');
+                        rowElement.innerHTML = `<td class="has-text-centered">
+                        <button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">
+                          <i class="fas fa-plus" aria-hidden="true"></i>
+                        </button>
+                      </td>
+                      <td class="has-text-weight-bold">
+                        ${cityssm.escapeHTML((_a = lotOccupancy.occupancyType) !== null && _a !== void 0 ? _a : '')}
+                      </td>`;
                         if (lotOccupancy.lotId) {
                             rowElement.insertAdjacentHTML('beforeend', '<td>' +
                                 cityssm.escapeHTML((_b = lotOccupancy.lotName) !== null && _b !== void 0 ? _b : '') +
@@ -625,8 +631,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 }
                 searchResultsContainerElement.innerHTML =
                     los.getLoadingParagraphHTML('Searching...');
-                cityssm.postJSON(los.urlPrefix + '/lots/doSearchLots', searchFormElement, (responseJSON) => {
+                cityssm.postJSON(los.urlPrefix + '/lots/doSearchLots', searchFormElement, (rawResponseJSON) => {
                     var _a, _b, _c, _d;
+                    const responseJSON = rawResponseJSON;
                     if (responseJSON.lots.length === 0) {
                         searchResultsContainerElement.innerHTML =
                             '<div class="message is-info">' +
diff --git a/public-typescript/workOrderEdit/workOrderEditLots.js b/public-typescript/workOrderEdit/workOrderEditLots.js
index 78fb6fd2..f3f39a38 100644
--- a/public-typescript/workOrderEdit/workOrderEditLots.js
+++ b/public-typescript/workOrderEdit/workOrderEditLots.js
@@ -13,8 +13,9 @@ function deleteLotOccupancy(clickEvent) {
         cityssm.postJSON(los.urlPrefix + '/workOrders/doDeleteWorkOrderLotOccupancy', {
             workOrderId,
             lotOccupancyId
-        }, (responseJSON) => {
+        }, (rawResponseJSON) => {
             var _a;
+            const responseJSON = rawResponseJSON;
             if (responseJSON.success) {
                 workOrderLotOccupancies = responseJSON.workOrderLotOccupancies;
                 renderRelatedLotsAndOccupancies();
@@ -42,8 +43,9 @@ function addLot(lotId, callbackFunction) {
     cityssm.postJSON(los.urlPrefix + '/workOrders/doAddWorkOrderLot', {
         workOrderId,
         lotId
-    }, (responseJSON) => {
+    }, (rawResponseJSON) => {
         var _a;
+        const responseJSON = rawResponseJSON;
         if (responseJSON.success) {
             workOrderLots = responseJSON.workOrderLots;
             renderRelatedLotsAndOccupancies();
@@ -55,7 +57,7 @@ function addLot(lotId, callbackFunction) {
                 contextualColorName: 'danger'
             });
         }
-        if (callbackFunction) {
+        if (callbackFunction !== undefined) {
             callbackFunction(responseJSON.success);
         }
     });
@@ -64,8 +66,9 @@ function addLotOccupancy(lotOccupancyId, callbackFunction) {
     cityssm.postJSON(los.urlPrefix + '/workOrders/doAddWorkOrderLotOccupancy', {
         workOrderId,
         lotOccupancyId
-    }, (responseJSON) => {
+    }, (rawResponseJSON) => {
         var _a;
+        const responseJSON = rawResponseJSON;
         if (responseJSON.success) {
             workOrderLotOccupancies = responseJSON.workOrderLotOccupancies;
             renderRelatedLotsAndOccupancies();
@@ -77,7 +80,7 @@ function addLotOccupancy(lotOccupancyId, callbackFunction) {
                 contextualColorName: 'danger'
             });
         }
-        if (callbackFunction) {
+        if (callbackFunction !== undefined) {
             callbackFunction(responseJSON.success);
         }
     });
@@ -134,7 +137,8 @@ function renderRelatedOccupancies() {
                     los.getLotOccupancyURL(lotOccupancy.lotOccupancyId) +
                     '">' +
                     cityssm.escapeHTML((_a = lotOccupancy.occupancyType) !== null && _a !== void 0 ? _a : '') +
-                    '</a>' +
+                    '</a><br />' +
+                    `<span class="is-size-7">#${lotOccupancy.lotOccupancyId}</span>` +
                     '</td>');
         if (lotOccupancy.lotId) {
             rowElement.insertAdjacentHTML('beforeend', '<td>' +
@@ -143,7 +147,7 @@ function renderRelatedOccupancies() {
                     ? ''
                     : ' <button class="button is-small is-light is-success button--addLot"' +
                         ' data-lot-id="' +
-                        lotOccupancy.lotId +
+                        lotOccupancy.lotId.toString() +
                         '"' +
                         ' data-tooltip="Add ' +
                         los.escapedAliases.Lot +
@@ -211,8 +215,9 @@ function openEditLotStatus(clickEvent) {
     let editCloseModalFunction;
     function doUpdateLotStatus(submitEvent) {
         submitEvent.preventDefault();
-        cityssm.postJSON(los.urlPrefix + '/workOrders/doUpdateLotStatus', submitEvent.currentTarget, (responseJSON) => {
+        cityssm.postJSON(los.urlPrefix + '/workOrders/doUpdateLotStatus', submitEvent.currentTarget, (rawResponseJSON) => {
             var _a;
+            const responseJSON = rawResponseJSON;
             if (responseJSON.success) {
                 workOrderLots = responseJSON.workOrderLots;
                 renderRelatedLotsAndOccupancies();
@@ -274,8 +279,9 @@ function deleteLot(clickEvent) {
         cityssm.postJSON(los.urlPrefix + '/workOrders/doDeleteWorkOrderLot', {
             workOrderId,
             lotId
-        }, (responseJSON) => {
+        }, (rawResponseJSON) => {
             var _a;
+            const responseJSON = rawResponseJSON;
             if (responseJSON.success) {
                 workOrderLots = responseJSON.workOrderLots;
                 renderRelatedLotsAndOccupancies();
@@ -331,21 +337,21 @@ function renderRelatedLots() {
                 cityssm.escapeHTML((_a = lot.lotName) !== null && _a !== void 0 ? _a : '') +
                 '</a>' +
                 '</td>' +
-                ('<td>' + cityssm.escapeHTML((_b = lot.mapName) !== null && _b !== void 0 ? _b : '') + '</td>') +
-                ('<td>' + cityssm.escapeHTML((_c = lot.lotType) !== null && _c !== void 0 ? _c : '') + '</td>') +
+                `<td>${cityssm.escapeHTML((_b = lot.mapName) !== null && _b !== void 0 ? _b : '')}</td>` +
+                `<td>${cityssm.escapeHTML((_c = lot.lotType) !== null && _c !== void 0 ? _c : '')}</td>` +
                 ('<td>' +
                     (lot.lotStatusId
                         ? cityssm.escapeHTML((_d = lot.lotStatus) !== null && _d !== void 0 ? _d : '')
                         : '<span class="has-text-grey">(No Status)</span>') +
                     '</td>') +
-                ('<td class="is-nowrap">' +
-                    '<button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">' +
-                    '<i class="fas fa-pencil-alt" aria-hidden="true"></i>' +
-                    '</button>' +
-                    ' <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">' +
-                    '<i class="fas fa-trash" aria-hidden="true"></i>' +
-                    '</button>' +
-                    '</td>');
+                `<td class="is-nowrap">
+        <button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">
+        <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+        </button>
+        <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">
+        <i class="fas fa-trash" aria-hidden="true"></i>
+        </button>
+        </td>`;
         rowElement
             .querySelector('.button--editLotStatus')
             .addEventListener('click', openEditLotStatus);
@@ -379,8 +385,9 @@ function doAddLotOccupancy(clickEvent) {
         }
         searchResultsContainerElement.innerHTML =
             los.getLoadingParagraphHTML('Searching...');
-        cityssm.postJSON(los.urlPrefix + '/lotOccupancies/doSearchLotOccupancies', searchFormElement, (responseJSON) => {
+        cityssm.postJSON(los.urlPrefix + '/lotOccupancies/doSearchLotOccupancies', searchFormElement, (rawResponseJSON) => {
             var _a, _b;
+            const responseJSON = rawResponseJSON;
             if (responseJSON.lotOccupancies.length === 0) {
                 searchResultsContainerElement.innerHTML = `<div class="message is-info">
               <p class="message-body">There are no records that meet the search criteria.</p>
@@ -403,15 +410,14 @@ function doAddLotOccupancy(clickEvent) {
                 rowElement.className = 'container--lotOccupancy';
                 rowElement.dataset.lotOccupancyId =
                     lotOccupancy.lotOccupancyId.toString();
-                rowElement.innerHTML =
-                    '<td class="has-text-centered">' +
-                        '<button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">' +
-                        '<i class="fas fa-plus" aria-hidden="true"></i>' +
-                        '</button>' +
-                        '</td>' +
-                        ('<td class="has-text-weight-bold">' +
-                            cityssm.escapeHTML((_a = lotOccupancy.occupancyType) !== null && _a !== void 0 ? _a : '') +
-                            '</td>');
+                rowElement.innerHTML = `<td class="has-text-centered">
+                <button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">
+                  <i class="fas fa-plus" aria-hidden="true"></i>
+                </button>
+              </td>
+              <td class="has-text-weight-bold">
+                ${cityssm.escapeHTML((_a = lotOccupancy.occupancyType) !== null && _a !== void 0 ? _a : '')}
+              </td>`;
                 if (lotOccupancy.lotId) {
                     rowElement.insertAdjacentHTML('beforeend', '<td>' +
                         cityssm.escapeHTML((_b = lotOccupancy.lotName) !== null && _b !== void 0 ? _b : '') +
@@ -488,8 +494,9 @@ function doAddLot(clickEvent) {
         }
         searchResultsContainerElement.innerHTML =
             los.getLoadingParagraphHTML('Searching...');
-        cityssm.postJSON(los.urlPrefix + '/lots/doSearchLots', searchFormElement, (responseJSON) => {
+        cityssm.postJSON(los.urlPrefix + '/lots/doSearchLots', searchFormElement, (rawResponseJSON) => {
             var _a, _b, _c, _d;
+            const responseJSON = rawResponseJSON;
             if (responseJSON.lots.length === 0) {
                 searchResultsContainerElement.innerHTML =
                     '<div class="message is-info">' +
diff --git a/public-typescript/workOrderEdit/workOrderEditLots.ts b/public-typescript/workOrderEdit/workOrderEditLots.ts
index a1fd468a..2fee1b7b 100644
--- a/public-typescript/workOrderEdit/workOrderEditLots.ts
+++ b/public-typescript/workOrderEdit/workOrderEditLots.ts
@@ -35,11 +35,13 @@ function deleteLotOccupancy(clickEvent: Event): void {
         workOrderId,
         lotOccupancyId
       },
-      (responseJSON: {
-        success: boolean
-        errorMessage?: string
-        workOrderLotOccupancies?: recordTypes.LotOccupancy[]
-      }) => {
+      (rawResponseJSON) => {
+        const responseJSON = rawResponseJSON as {
+          success: boolean
+          errorMessage?: string
+          workOrderLotOccupancies?: recordTypes.LotOccupancy[]
+        }
+
         if (responseJSON.success) {
           workOrderLotOccupancies = responseJSON.workOrderLotOccupancies!
           renderRelatedLotsAndOccupancies()
@@ -67,7 +69,7 @@ function deleteLotOccupancy(clickEvent: Event): void {
 
 function addLot(
   lotId: number | string,
-  callbackFunction?: (success?: boolean) => void
+  callbackFunction?: (success: boolean) => void
 ): void {
   cityssm.postJSON(
     los.urlPrefix + '/workOrders/doAddWorkOrderLot',
@@ -75,11 +77,13 @@ function addLot(
       workOrderId,
       lotId
     },
-    (responseJSON: {
-      success: boolean
-      errorMessage?: string
-      workOrderLots?: recordTypes.Lot[]
-    }) => {
+    (rawResponseJSON) => {
+      const responseJSON = rawResponseJSON as {
+        success: boolean
+        errorMessage?: string
+        workOrderLots?: recordTypes.Lot[]
+      }
+
       if (responseJSON.success) {
         workOrderLots = responseJSON.workOrderLots!
         renderRelatedLotsAndOccupancies()
@@ -91,7 +95,7 @@ function addLot(
         })
       }
 
-      if (callbackFunction) {
+      if (callbackFunction !== undefined) {
         callbackFunction(responseJSON.success)
       }
     }
@@ -108,11 +112,13 @@ function addLotOccupancy(
       workOrderId,
       lotOccupancyId
     },
-    (responseJSON: {
-      success: boolean
-      errorMessage?: string
-      workOrderLotOccupancies?: recordTypes.LotOccupancy[]
-    }) => {
+    (rawResponseJSON) => {
+      const responseJSON = rawResponseJSON as {
+        success: boolean
+        errorMessage?: string
+        workOrderLotOccupancies?: recordTypes.LotOccupancy[]
+      }
+
       if (responseJSON.success) {
         workOrderLotOccupancies = responseJSON.workOrderLotOccupancies!
         renderRelatedLotsAndOccupancies()
@@ -124,7 +130,7 @@ function addLotOccupancy(
         })
       }
 
-      if (callbackFunction) {
+      if (callbackFunction !== undefined) {
         callbackFunction(responseJSON.success)
       }
     }
@@ -201,7 +207,8 @@ function renderRelatedOccupancies(): void {
         los.getLotOccupancyURL(lotOccupancy.lotOccupancyId) +
         '">' +
         cityssm.escapeHTML(lotOccupancy.occupancyType ?? '') +
-        '</a>' +
+        '</a><br />' +
+        `<span class="is-size-7">#${lotOccupancy.lotOccupancyId!}</span>` +
         '</td>')
 
     if (lotOccupancy.lotId) {
@@ -213,7 +220,7 @@ function renderRelatedOccupancies(): void {
             ? ''
             : ' <button class="button is-small is-light is-success button--addLot"' +
               ' data-lot-id="' +
-              lotOccupancy.lotId +
+              lotOccupancy.lotId.toString() +
               '"' +
               ' data-tooltip="Add ' +
               los.escapedAliases.Lot +
@@ -310,11 +317,13 @@ function openEditLotStatus(clickEvent: Event): void {
     cityssm.postJSON(
       los.urlPrefix + '/workOrders/doUpdateLotStatus',
       submitEvent.currentTarget,
-      (responseJSON: {
-        success: boolean
-        errorMessage?: string
-        workOrderLots?: recordTypes.Lot[]
-      }) => {
+      (rawResponseJSON) => {
+        const responseJSON = rawResponseJSON as {
+          success: boolean
+          errorMessage?: string
+          workOrderLots?: recordTypes.Lot[]
+        }
+
         if (responseJSON.success) {
           workOrderLots = responseJSON.workOrderLots!
           renderRelatedLotsAndOccupancies()
@@ -407,11 +416,13 @@ function deleteLot(clickEvent: Event): void {
         workOrderId,
         lotId
       },
-      (responseJSON: {
-        success: boolean
-        errorMessage?: string
-        workOrderLots?: recordTypes.Lot[]
-      }) => {
+      (rawResponseJSON) => {
+        const responseJSON = rawResponseJSON as {
+          success: boolean
+          errorMessage?: string
+          workOrderLots?: recordTypes.Lot[]
+        }
+
         if (responseJSON.success) {
           workOrderLots = responseJSON.workOrderLots!
           renderRelatedLotsAndOccupancies()
@@ -481,21 +492,21 @@ function renderRelatedLots(): void {
       cityssm.escapeHTML(lot.lotName ?? '') +
       '</a>' +
       '</td>' +
-      ('<td>' + cityssm.escapeHTML(lot.mapName ?? '') + '</td>') +
-      ('<td>' + cityssm.escapeHTML(lot.lotType ?? '') + '</td>') +
+      `<td>${cityssm.escapeHTML(lot.mapName ?? '')}</td>` +
+      `<td>${cityssm.escapeHTML(lot.lotType ?? '')}</td>` +
       ('<td>' +
         (lot.lotStatusId
           ? cityssm.escapeHTML(lot.lotStatus ?? '')
           : '<span class="has-text-grey">(No Status)</span>') +
         '</td>') +
-      ('<td class="is-nowrap">' +
-        '<button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">' +
-        '<i class="fas fa-pencil-alt" aria-hidden="true"></i>' +
-        '</button>' +
-        ' <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">' +
-        '<i class="fas fa-trash" aria-hidden="true"></i>' +
-        '</button>' +
-        '</td>')
+      `<td class="is-nowrap">
+        <button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">
+        <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+        </button>
+        <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">
+        <i class="fas fa-trash" aria-hidden="true"></i>
+        </button>
+        </td>`
 
     rowElement
       .querySelector('.button--editLotStatus')!
@@ -545,7 +556,11 @@ document
       cityssm.postJSON(
         los.urlPrefix + '/lotOccupancies/doSearchLotOccupancies',
         searchFormElement,
-        (responseJSON: { lotOccupancies: recordTypes.LotOccupancy[] }) => {
+        (rawResponseJSON) => {
+          const responseJSON = rawResponseJSON as {
+            lotOccupancies: recordTypes.LotOccupancy[]
+          }
+
           if (responseJSON.lotOccupancies.length === 0) {
             searchResultsContainerElement.innerHTML = `<div class="message is-info">
               <p class="message-body">There are no records that meet the search criteria.</p>
@@ -572,15 +587,14 @@ document
             rowElement.dataset.lotOccupancyId =
               lotOccupancy.lotOccupancyId!.toString()
 
-            rowElement.innerHTML =
-              '<td class="has-text-centered">' +
-              '<button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">' +
-              '<i class="fas fa-plus" aria-hidden="true"></i>' +
-              '</button>' +
-              '</td>' +
-              ('<td class="has-text-weight-bold">' +
-                cityssm.escapeHTML(lotOccupancy.occupancyType ?? '') +
-                '</td>')
+            rowElement.innerHTML = `<td class="has-text-centered">
+                <button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">
+                  <i class="fas fa-plus" aria-hidden="true"></i>
+                </button>
+              </td>
+              <td class="has-text-weight-bold">
+                ${cityssm.escapeHTML(lotOccupancy.occupancyType ?? '')}
+              </td>`
 
             if (lotOccupancy.lotId) {
               rowElement.insertAdjacentHTML(
@@ -715,7 +729,9 @@ document.querySelector('#button--addLot')?.addEventListener('click', () => {
     cityssm.postJSON(
       los.urlPrefix + '/lots/doSearchLots',
       searchFormElement,
-      (responseJSON: { lots: recordTypes.Lot[] }) => {
+      (rawResponseJSON) => {
+        const responseJSON = rawResponseJSON as { lots: recordTypes.Lot[] }
+
         if (responseJSON.lots.length === 0) {
           searchResultsContainerElement.innerHTML =
             '<div class="message is-info">' +
diff --git a/public/javascripts/lotOccupancySearch.min.js b/public/javascripts/lotOccupancySearch.min.js
index e73f9a97..779efa14 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,a=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(a){var c,n,l,i,d,p,u,h,y,f,m,v,g;if(0===a.lotOccupancies.length)return void(e.innerHTML=`<div class="message is-info">\n        <p class="message-body">\n        There are no ${t.escapedAliases.occupancy} records that meet the search criteria.\n        </p>\n        </div>`);const L=document.createElement("tbody"),b=cityssm.dateToString(new Date);for(const e of a.lotOccupancies){let a="";a=e.occupancyStartDateString<=b&&(""===e.occupancyEndDateString||e.occupancyEndDateString>=b)?`<span class="has-tooltip-right" data-tooltip="Current ${t.escapedAliases.Occupancy}">\n          <i class="fas fa-play" aria-label="Current ${t.escapedAliases.Occupancy}"></i>\n          </span>`:e.occupancyStartDateString>b?`<span class="has-tooltip-right" data-tooltip="Future ${t.escapedAliases.Occupancy}">\n          <i class="fas fa-fast-forward" aria-label="Future ${t.escapedAliases.Occupancy}"></i>\n          </span>`:`<span class="has-tooltip-right" data-tooltip="Past ${t.escapedAliases.Occupancy}">\n          <i class="fas fa-stop" aria-label="Past ${t.escapedAliases.Occupancy}"></i>\n          </span>`;let s="";for(const t of e.lotOccupancyOccupants)s+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(null!==(c=t.lotOccupantType)&&void 0!==c?c:"")+'"><i class="fas fa-fw fa-'+cityssm.escapeHTML(""===(null!==(n=t.fontAwesomeIconClass)&&void 0!==n?n:"")?"user":t.fontAwesomeIconClass)+'" aria-hidden="true"></i> '+cityssm.escapeHTML(null!==(l=t.occupantName)&&void 0!==l?l:"")+" "+cityssm.escapeHTML(null!==(i=t.occupantFamilyName)&&void 0!==i?i:"")+"</span><br />";const o=(null!==(p=null===(d=e.lotOccupancyFees)||void 0===d?void 0:d.reduce((t,a)=>{var e,s,c;return t+((null!==(e=a.feeAmount)&&void 0!==e?e:0)+(null!==(s=a.taxAmount)&&void 0!==s?s:0))*(null!==(c=a.quantity)&&void 0!==c?c:0)},0))&&void 0!==p?p:0).toFixed(2),r=(null!==(h=null===(u=e.lotOccupancyTransactions)||void 0===u?void 0:u.reduce((t,a)=>t+a.transactionAmount,0))&&void 0!==h?h:0).toFixed(2);let v="";"0.00"===o&&"0.00"===r||(v=`<span class="icon"\n          data-tooltip="Total Fees: $${o}"\n          aria-label="Total Fees: $${o}">\n          <i class="fas fa-dollar-sign ${o===r?"has-text-success":"has-text-danger"}" aria-hidden="true"></i>\n        </span>`),L.insertAdjacentHTML("beforeend",'<tr><td class="has-width-1">'+a+'</td><td><a class="has-text-weight-bold" href="'+t.getLotOccupancyURL(e.lotOccupancyId)+'">'+cityssm.escapeHTML(e.occupancyType)+"</a></td><td>"+(-1===(null!==(y=e.lotId)&&void 0!==y?y:-1)?'<span class="has-text-grey">(No '+t.escapedAliases.Lot+")</span>":'<a class="has-tooltip-right" data-tooltip="'+cityssm.escapeHTML(null!==(f=e.lotType)&&void 0!==f?f:"")+'" href="'+t.getLotURL(e.lotId)+'">'+cityssm.escapeHTML(e.lotName)+"</a>")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(null!==(m=e.mapName)&&void 0!==m?m:"")+"</span></td><td>"+e.occupancyStartDateString+"</td><td>"+(e.occupancyEndDate?e.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+s+"</td><td>"+v+"</td><td>"+(e.printEJS?'<a class="button is-small" data-tooltip="Print" href="'+t.urlPrefix+"/print/"+e.printEJS+"/?lotOccupancyId="+e.lotOccupancyId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a>':"")+"</td></tr>")}e.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable has-sticky-header">\n      <thead><tr>\n      <th class="has-width-1"></th>\n      <th>${t.escapedAliases.Occupancy} Type</th>\n      <th>${t.escapedAliases.Lot}</th>\n      <th>${t.escapedAliases.OccupancyStartDate}</th>\n      <th>End Date</th>\n      <th>${t.escapedAliases.Occupants}</th>\n      <th class="has-width-1"><span class="is-sr-only">Fees and Transactions</span></th>\n      <th class="has-width-1"><span class="is-sr-only">Print</span></th>\n      </tr></thead>\n      <table>`,e.querySelector("table").append(L),e.insertAdjacentHTML("beforeend",t.getSearchResultsPagerHTML(s,a.offset,a.count)),null===(v=e.querySelector("button[data-page='previous']"))||void 0===v||v.addEventListener("click",o),null===(g=e.querySelector("button[data-page='next']"))||void 0===g||g.addEventListener("click",r)}function l(){e.innerHTML=t.getLoadingParagraphHTML(`Loading ${t.escapedAliases.Occupancies}...`),cityssm.postJSON(t.urlPrefix+"/lotOccupancies/doSearchLotOccupancies",a,n)}function i(){c.value="0",l()}function o(){c.value=Math.max(Number.parseInt(c.value,10)-s,0).toString(),l()}function r(){c.value=(Number.parseInt(c.value,10)+s).toString(),l()}const d=a.querySelectorAll("input, select");for(const t of d)t.addEventListener("change",i);a.addEventListener("submit",t=>{t.preventDefault()}),l()})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const t=exports.los,a=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(a){var c,n,l,i,d,p,u,h,y,f,m,v,g;const L=a;if(0===L.lotOccupancies.length)return void(e.innerHTML=`<div class="message is-info">\n        <p class="message-body">\n        There are no ${t.escapedAliases.occupancy} records that meet the search criteria.\n        </p>\n        </div>`);const b=document.createElement("tbody"),S=cityssm.dateToString(new Date);for(const a of L.lotOccupancies){let e="";e=a.occupancyStartDateString<=S&&(""===a.occupancyEndDateString||a.occupancyEndDateString>=S)?`<span class="has-tooltip-right" data-tooltip="Current ${t.escapedAliases.Occupancy}">\n          <i class="fas fa-play" aria-label="Current ${t.escapedAliases.Occupancy}"></i>\n          </span>`:a.occupancyStartDateString>S?`<span class="has-tooltip-right" data-tooltip="Future ${t.escapedAliases.Occupancy}">\n          <i class="fas fa-fast-forward" aria-label="Future ${t.escapedAliases.Occupancy}"></i>\n          </span>`:`<span class="has-tooltip-right" data-tooltip="Past ${t.escapedAliases.Occupancy}">\n          <i class="fas fa-stop" aria-label="Past ${t.escapedAliases.Occupancy}"></i>\n          </span>`;let s="";for(const t of a.lotOccupancyOccupants)s+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(null!==(c=t.lotOccupantType)&&void 0!==c?c:"")+'"><i class="fas fa-fw fa-'+cityssm.escapeHTML(""===(null!==(n=t.fontAwesomeIconClass)&&void 0!==n?n:"")?"user":t.fontAwesomeIconClass)+'" aria-hidden="true"></i> '+cityssm.escapeHTML(null!==(l=t.occupantName)&&void 0!==l?l:"")+" "+cityssm.escapeHTML(null!==(i=t.occupantFamilyName)&&void 0!==i?i:"")+"</span><br />";const o=(null!==(p=null===(d=a.lotOccupancyFees)||void 0===d?void 0:d.reduce((t,a)=>{var e,s,c;return t+((null!==(e=a.feeAmount)&&void 0!==e?e:0)+(null!==(s=a.taxAmount)&&void 0!==s?s:0))*(null!==(c=a.quantity)&&void 0!==c?c:0)},0))&&void 0!==p?p:0).toFixed(2),r=(null!==(h=null===(u=a.lotOccupancyTransactions)||void 0===u?void 0:u.reduce((t,a)=>t+a.transactionAmount,0))&&void 0!==h?h:0).toFixed(2);let v="";"0.00"===o&&"0.00"===r||(v=`<span class="icon"\n          data-tooltip="Total Fees: $${o}"\n          aria-label="Total Fees: $${o}">\n          <i class="fas fa-dollar-sign ${o===r?"has-text-success":"has-text-danger"}" aria-hidden="true"></i>\n        </span>`),b.insertAdjacentHTML("beforeend",'<tr><td class="has-width-1">'+e+'</td><td><a class="has-text-weight-bold" href="'+t.getLotOccupancyURL(a.lotOccupancyId)+'">'+cityssm.escapeHTML(a.occupancyType)+"</a><br />"+`<span class="is-size-7">#${a.lotOccupancyId}</span>`+"</td><td>"+(-1===(null!==(y=a.lotId)&&void 0!==y?y:-1)?'<span class="has-text-grey">(No '+t.escapedAliases.Lot+")</span>":'<a class="has-tooltip-right" data-tooltip="'+cityssm.escapeHTML(null!==(f=a.lotType)&&void 0!==f?f:"")+'" href="'+t.getLotURL(a.lotId)+'">'+cityssm.escapeHTML(a.lotName)+"</a>")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(null!==(m=a.mapName)&&void 0!==m?m:"")+"</span></td><td>"+a.occupancyStartDateString+"</td><td>"+(a.occupancyEndDate?a.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+s+"</td><td>"+v+"</td><td>"+(a.printEJS?'<a class="button is-small" data-tooltip="Print" href="'+t.urlPrefix+"/print/"+a.printEJS+"/?lotOccupancyId="+a.lotOccupancyId.toString()+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a>':"")+"</td></tr>")}e.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable has-sticky-header">\n      <thead><tr>\n      <th class="has-width-1"></th>\n      <th>${t.escapedAliases.Occupancy} Type</th>\n      <th>${t.escapedAliases.Lot}</th>\n      <th>${t.escapedAliases.OccupancyStartDate}</th>\n      <th>End Date</th>\n      <th>${t.escapedAliases.Occupants}</th>\n      <th class="has-width-1"><span class="is-sr-only">Fees and Transactions</span></th>\n      <th class="has-width-1"><span class="is-sr-only">Print</span></th>\n      </tr></thead>\n      <table>`,e.querySelector("table").append(b),e.insertAdjacentHTML("beforeend",t.getSearchResultsPagerHTML(s,L.offset,L.count)),null===(v=e.querySelector("button[data-page='previous']"))||void 0===v||v.addEventListener("click",o),null===(g=e.querySelector("button[data-page='next']"))||void 0===g||g.addEventListener("click",r)}function l(){e.innerHTML=t.getLoadingParagraphHTML(`Loading ${t.escapedAliases.Occupancies}...`),cityssm.postJSON(t.urlPrefix+"/lotOccupancies/doSearchLotOccupancies",a,n)}function i(){c.value="0",l()}function o(){c.value=Math.max(Number.parseInt(c.value,10)-s,0).toString(),l()}function r(){c.value=(Number.parseInt(c.value,10)+s).toString(),l()}const d=a.querySelectorAll("input, select");for(const t of d)t.addEventListener("change",i);a.addEventListener("submit",t=>{t.preventDefault()}),l()})();
\ No newline at end of file
diff --git a/public/javascripts/workOrderEdit.min.js b/public/javascripts/workOrderEdit.min.js
index 7d18da01..fbf32bb2 100644
--- a/public/javascripts/workOrderEdit.min.js
+++ b/public/javascripts/workOrderEdit.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e;const t=exports.los,o=document.querySelector("#workOrderEdit--workOrderId").value,r=""===o,s=document.querySelector("#form--workOrderEdit");t.initializeDatePickers(s.querySelector("#workOrderEdit--workOrderOpenDateString").closest(".field")),t.initializeUnlockFieldButtons(s),s.addEventListener("submit",e=>{e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/"+(r?"doCreateWorkOrder":"doUpdateWorkOrder"),e.currentTarget,e=>{var o;e.success?(cityssm.disableNavBlocker(),r?window.location.href=t.getWorkOrderURL(e.workOrderId,!0):bulmaJS.alert({message:"Work Order Updated Successfully",contextualColorName:"success"})):bulmaJS.alert({title:"Error Updating Work Order",message:null!==(o=e.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})});const n=s.querySelectorAll("input, select");for(const e of n)e.addEventListener("change",cityssm.enableNavBlocker);function a(){cityssm.postJSON(t.urlPrefix+"/workOrders/doCloseWorkOrder",{workOrderId:o},e=>{var r;e.success?window.location.href=t.getWorkOrderURL(o):bulmaJS.alert({title:"Error Closing Work Order",message:null!==(r=e.errorMessage)&&void 0!==r?r:"",contextualColorName:"danger"})})}function l(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrder",{workOrderId:o},e=>{var o;e.success?window.location.href=t.urlPrefix+"/workOrders":bulmaJS.alert({title:"Error Deleting Work Order",message:null!==(o=e.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})}let i;if(null===(w=document.querySelector("#button--closeWorkOrder"))||void 0===w||w.addEventListener("click",()=>{i.some(e=>!e.workOrderMilestoneCompletionDate)?bulmaJS.alert({title:"Outstanding Milestones",message:"You cannot close a work order with outstanding milestones.\n                        Either complete the outstanding milestones, or remove them from the work order.",contextualColorName:"warning"}):bulmaJS.confirm({title:"Close Work Order",message:"Are you sure you want to close this work order?",contextualColorName:"info",okButton:{text:"Yes, Close Work Order",callbackFunction:a}})}),null===(c=document.querySelector("#button--deleteWorkOrder"))||void 0===c||c.addEventListener("click",e=>{e.preventDefault(),bulmaJS.confirm({title:"Delete Work Order",message:"Are you sure you want to delete this work order?",contextualColorName:"warning",okButton:{text:"Yes, Delete Work Order",callbackFunction:l}})}),!r){var c;Object.defineProperty(exports,"__esModule",{value:!0});let e=exports.workOrderLots;delete exports.workOrderLots;let r=exports.workOrderLotOccupancies;function d(e){const s=e.currentTarget.closest(".container--lotOccupancy").dataset.lotOccupancyId;bulmaJS.confirm({title:`Delete ${t.escapedAliases.Occupancy} Relationship`,message:`Are you sure you want to remove the relationship to this ${t.escapedAliases.occupancy} record from this work order?  Note that the record will remain.`,contextualColorName:"warning",okButton:{text:"Yes, Delete Relationship",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderLotOccupancy",{workOrderId:o,lotOccupancyId:s},e=>{var t;e.success?(r=e.workOrderLotOccupancies,O()):bulmaJS.alert({title:"Error Deleting Relationship",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})})}}})}function u(r,s){cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderLot",{workOrderId:o,lotId:r},o=>{var r;o.success?(e=o.workOrderLots,O()):bulmaJS.alert({title:`Error Adding ${t.escapedAliases.Lot}`,message:null!==(r=o.errorMessage)&&void 0!==r?r:"",contextualColorName:"danger"}),s&&s(o.success)})}function m(e){u(e.currentTarget.dataset.lotId)}function p(r){const s=Number.parseInt(r.currentTarget.closest(".container--lot").dataset.lotId,10),n=e.find(e=>e.lotId===s);let a;function l(o){o.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doUpdateLotStatus",o.currentTarget,t=>{var o;t.success?(e=t.workOrderLots,O(),a()):bulmaJS.alert({title:"Error Deleting Relationship",message:null!==(o=t.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})}cityssm.openHtmlModal("lot-editLotStatus",{onshow(e){t.populateAliases(e),e.querySelector("#lotStatusEdit--lotId").value=s.toString(),e.querySelector("#lotStatusEdit--lotName").value=n.lotName;const r=e.querySelector("#lotStatusEdit--lotStatusId");let a=!1;for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,e.lotStatusId===n.lotStatusId&&(a=!0),r.append(t)}if(!a&&n.lotStatusId){const e=document.createElement("option");e.value=n.lotStatusId.toString(),e.textContent=n.lotStatus,r.append(e)}n.lotStatusId&&(r.value=n.lotStatusId.toString()),e.querySelector("form").insertAdjacentHTML("beforeend",`<input name="workOrderId" type="hidden" value="${o}" />`)},onshown(e,t){a=t,bulmaJS.toggleHtmlClipped(),e.querySelector("form").addEventListener("submit",l)},onremoved(){bulmaJS.toggleHtmlClipped()}})}function y(r){const s=r.currentTarget.closest(".container--lot").dataset.lotId;bulmaJS.confirm({title:`Delete ${t.escapedAliases.Occupancy} Relationship`,message:`Are you sure you want to remove the relationship to this ${t.escapedAliases.occupancy} record from this work order?  Note that the record will remain.`,contextualColorName:"warning",okButton:{text:"Yes, Delete Relationship",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderLot",{workOrderId:o,lotId:s},t=>{var o;t.success?(e=t.workOrderLots,O()):bulmaJS.alert({title:"Error Deleting Relationship",message:null!==(o=t.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})}}})}function O(){!function(){var o,s,n,a;const l=document.querySelector("#container--lotOccupancies");if(document.querySelector(".tabs a[href='#relatedTab--lotOccupancies'] .tag").textContent=r.length.toString(),0===r.length)return void(l.innerHTML=`<div class="message is-info">\n                    <p class="message-body">There are no ${t.escapedAliases.occupancies} associated with this work order.</p>\n                    </div>`);l.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                <thead><tr>\n                <th class="has-width-1"></th>\n                <th>${t.escapedAliases.Occupancy} Type</th>\n                <th>${t.escapedAliases.Lot}</th>\n                <th>${t.escapedAliases.OccupancyStartDate}</th>\n                <th>End Date</th>\n                <th>${t.escapedAliases.Occupants}</th>\n                <th class="has-width-1"></th>\n                </tr></thead>\n                <tbody></tbody>\n                </table>`;const i=cityssm.dateToString(new Date);for(const c of r){const r=document.createElement("tr");r.className="container--lotOccupancy",r.dataset.lotOccupancyId=c.lotOccupancyId.toString();const u=!(c.occupancyEndDate&&c.occupancyEndDateString<i),p=c.lotId&&e.some(e=>c.lotId===e.lotId);r.innerHTML='<td class="is-width-1 has-text-centered">'+(u?'<i class="fas fa-play" title="Current '+t.escapedAliases.Occupancy+'"></i>':'<i class="fas fa-stop" title="Previous '+t.escapedAliases.Occupancy+'"></i>')+'</td><td><a class="has-text-weight-bold" href="'+t.getLotOccupancyURL(c.lotOccupancyId)+'">'+cityssm.escapeHTML(null!==(o=c.occupancyType)&&void 0!==o?o:"")+"</a></td>",c.lotId?r.insertAdjacentHTML("beforeend","<td>"+cityssm.escapeHTML(null!==(s=c.lotName)&&void 0!==s?s:"")+(p?"":' <button class="button is-small is-light is-success button--addLot" data-lot-id="'+c.lotId+'" data-tooltip="Add '+t.escapedAliases.Lot+'" aria-label="Add '+t.escapedAliases.Lot+'" type="button"><i class="fas fa-plus" aria-hidden="true"></i></button>')+"</td>"):r.insertAdjacentHTML("beforeend",`<td><span class="has-text-grey">(No ${t.escapedAliases.Lot})</span></td>`),r.insertAdjacentHTML("beforeend","<td>"+c.occupancyStartDateString+"</td><td>"+(c.occupancyEndDate?c.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+(0===c.lotOccupancyOccupants.length?'<span class="has-text-grey">(No '+t.escapedAliases.Occupants+")</span>":null===(n=c.lotOccupancyOccupants)||void 0===n?void 0:n.reduce((e,o)=>{var r;return e+'<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(o.lotOccupantType)+'"><i class="fas fa-fw fa-'+cityssm.escapeHTML(""===(null!==(r=o.fontAwesomeIconClass)&&void 0!==r?r:"")?"user":o.fontAwesomeIconClass)+'" aria-label="'+t.escapedAliases.Occupant+'"></i> '+cityssm.escapeHTML(o.occupantName)+" "+cityssm.escapeHTML(o.occupantFamilyName)+"</span><br />"},""))+'</td><td><button class="button is-small is-light is-danger button--deleteLotOccupancy" data-tooltip="Delete Relationship" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>'),null===(a=r.querySelector(".button--addLot"))||void 0===a||a.addEventListener("click",m),r.querySelector(".button--deleteLotOccupancy").addEventListener("click",d),l.querySelector("tbody").append(r)}}(),function(){var o,r,s,n;const a=document.querySelector("#container--lots");if(document.querySelector(".tabs a[href='#relatedTab--lots'] .tag").textContent=e.length.toString(),0!==e.length){a.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                <thead><tr>\n                <th>${t.escapedAliases.Lot}</th>\n                <th>${t.escapedAliases.Map}</th>\n                <th>${t.escapedAliases.Lot} Type</th>\n                <th>Status</th>\n                <th class="has-width-1"></th>\n                </tr></thead>\n                <tbody></tbody>\n                </table>`;for(const l of e){const e=document.createElement("tr");e.className="container--lot",e.dataset.lotId=l.lotId.toString(),e.innerHTML='<td><a class="has-text-weight-bold" href="'+t.getLotURL(l.lotId)+'">'+cityssm.escapeHTML(null!==(o=l.lotName)&&void 0!==o?o:"")+"</a></td><td>"+cityssm.escapeHTML(null!==(r=l.mapName)&&void 0!==r?r:"")+"</td><td>"+cityssm.escapeHTML(null!==(s=l.lotType)&&void 0!==s?s:"")+"</td><td>"+(l.lotStatusId?cityssm.escapeHTML(null!==(n=l.lotStatus)&&void 0!==n?n:""):'<span class="has-text-grey">(No Status)</span>')+'</td><td class="is-nowrap"><button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button"><i class="fas fa-pencil-alt" aria-hidden="true"></i></button> <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',e.querySelector(".button--editLotStatus").addEventListener("click",p),e.querySelector(".button--deleteLot").addEventListener("click",y),a.querySelector("tbody").append(e)}}else a.innerHTML=`<div class="message is-info">\n                    <p class="message-body">There are no ${t.escapedAliases.lots} associated with this work order.</p>\n                    </div>`}()}function h(e){const s=e.currentTarget.closest("tr");!function(e,s){cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderLotOccupancy",{workOrderId:o,lotOccupancyId:e},e=>{var o;e.success?(r=e.workOrderLotOccupancies,O()):bulmaJS.alert({title:"Error Adding "+t.escapedAliases.Occupancy,message:null!==(o=e.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"}),s&&s(e.success)})}(s.dataset.lotOccupancyId,e=>{e&&s.remove()})}function S(e){const t=e.currentTarget.closest("tr");u(t.dataset.lotId,e=>{e&&t.remove()})}delete exports.workOrderLotOccupancies,O(),null===(w=document.querySelector("#button--addLotOccupancy"))||void 0===w||w.addEventListener("click",()=>{let e,r;function s(o){o&&o.preventDefault(),r.innerHTML=t.getLoadingParagraphHTML("Searching..."),cityssm.postJSON(t.urlPrefix+"/lotOccupancies/doSearchLotOccupancies",e,e=>{var o,s;if(0!==e.lotOccupancies.length){r.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                    <thead><tr>\n                    <th class="has-width-1"></th>\n                    <th>${t.escapedAliases.Occupancy} Type</th>\n                    <th>${t.escapedAliases.Lot}</th>\n                    <th>${t.escapedAliases.OccupancyStartDate}</th>\n                    <th>End Date</th>\n                    <th>${t.escapedAliases.Occupants}</th>\n                    </tr></thead>\n                    <tbody></tbody>\n                    </table>`;for(const n of e.lotOccupancies){const e=document.createElement("tr");e.className="container--lotOccupancy",e.dataset.lotOccupancyId=n.lotOccupancyId.toString(),e.innerHTML='<td class="has-text-centered"><button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add"><i class="fas fa-plus" aria-hidden="true"></i></button></td><td class="has-text-weight-bold">'+cityssm.escapeHTML(null!==(o=n.occupancyType)&&void 0!==o?o:"")+"</td>",n.lotId?e.insertAdjacentHTML("beforeend","<td>"+cityssm.escapeHTML(null!==(s=n.lotName)&&void 0!==s?s:"")+"</td>"):e.insertAdjacentHTML("beforeend",`<td><span class="has-text-grey">(No ${t.escapedAliases.Lot})</span></td>`),e.insertAdjacentHTML("beforeend",`<td>${n.occupancyStartDateString}</td>`+"<td>"+(n.occupancyEndDate?n.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+(0===n.lotOccupancyOccupants.length?`<span class="has-text-grey">(No ${cityssm.escapeHTML(t.escapedAliases.Occupants)})</span>`:cityssm.escapeHTML(n.lotOccupancyOccupants[0].occupantName+" "+n.lotOccupancyOccupants[0].occupantFamilyName)+(n.lotOccupancyOccupants.length>1?" plus "+(n.lotOccupancyOccupants.length-1):""))+"</td>"),e.querySelector(".button--addLotOccupancy").addEventListener("click",h),r.querySelector("tbody").append(e)}}else r.innerHTML='<div class="message is-info">\n                      <p class="message-body">There are no records that meet the search criteria.</p>\n                      </div>'})}cityssm.openHtmlModal("workOrder-addLotOccupancy",{onshow(n){t.populateAliases(n),e=n.querySelector("form"),r=n.querySelector("#resultsContainer--lotOccupancyAdd"),n.querySelector("#lotOccupancySearch--notWorkOrderId").value=o,n.querySelector("#lotOccupancySearch--occupancyEffectiveDateString").value=document.querySelector("#workOrderEdit--workOrderOpenDateString").value,s()},onshown(t){bulmaJS.toggleHtmlClipped();const o=t.querySelector("#lotOccupancySearch--occupantName");o.addEventListener("change",s),o.focus(),t.querySelector("#lotOccupancySearch--lotName").addEventListener("change",s),e.addEventListener("submit",s)},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#button--addLotOccupancy").focus()}})}),null===(c=document.querySelector("#button--addLot"))||void 0===c||c.addEventListener("click",()=>{let e,r;function s(o){o&&o.preventDefault(),r.innerHTML=t.getLoadingParagraphHTML("Searching..."),cityssm.postJSON(t.urlPrefix+"/lots/doSearchLots",e,e=>{var o,s,n,a;if(0!==e.lots.length){r.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                  <thead><tr>\n                  <th class="has-width-1"></th>\n                  <th>${t.escapedAliases.Lot}</th>\n                  <th>${t.escapedAliases.Map}</th>\n                  <th>${t.escapedAliases.Lot} Type</th>\n                  <th>Status</th>\n                  </tr></thead>\n                  <tbody></tbody>\n                  </table>`;for(const t of e.lots){const e=document.createElement("tr");e.className="container--lot",e.dataset.lotId=t.lotId.toString(),e.innerHTML='<td class="has-text-centered"><button class="button is-small is-success button--addLot" data-tooltip="Add" type="button" aria-label="Add"><i class="fas fa-plus" aria-hidden="true"></i></button></td><td class="has-text-weight-bold">'+cityssm.escapeHTML(null!==(o=t.lotName)&&void 0!==o?o:"")+"</td><td>"+cityssm.escapeHTML(null!==(s=t.mapName)&&void 0!==s?s:"")+"</td><td>"+cityssm.escapeHTML(null!==(n=t.lotType)&&void 0!==n?n:"")+"</td><td>"+cityssm.escapeHTML(null!==(a=t.lotStatus)&&void 0!==a?a:"")+"</td>",e.querySelector(".button--addLot").addEventListener("click",S),r.querySelector("tbody").append(e)}}else r.innerHTML='<div class="message is-info"><p class="message-body">There are no records that meet the search criteria.</p></div>'})}cityssm.openHtmlModal("workOrder-addLot",{onshow(n){t.populateAliases(n),e=n.querySelector("form"),r=n.querySelector("#resultsContainer--lotAdd"),n.querySelector("#lotSearch--notWorkOrderId").value=o;const a=n.querySelector("#lotSearch--lotStatusId");for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,a.append(t)}s()},onshown(t){bulmaJS.toggleHtmlClipped();const o=t.querySelector("#lotSearch--lotName");o.addEventListener("change",s),o.focus(),t.querySelector("#lotSearch--lotStatusId").addEventListener("change",s),e.addEventListener("submit",s)},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#button--addLot").focus()}})})}var w;Object.defineProperty(exports,"__esModule",{value:!0});let g=exports.workOrderComments;function k(e){const r=Number.parseInt(e.currentTarget.closest("tr").dataset.workOrderCommentId,10),s=g.find(e=>e.workOrderCommentId===r);let n,a;function l(e){e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doUpdateWorkOrderComment",n,e=>{var t;e.success?(g=e.workOrderComments,a(),b()):bulmaJS.alert({title:"Error Updating Comment",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})})}cityssm.openHtmlModal("workOrder-editComment",{onshow(e){e.querySelector("#workOrderCommentEdit--workOrderId").value=o,e.querySelector("#workOrderCommentEdit--workOrderCommentId").value=r.toString(),e.querySelector("#workOrderCommentEdit--workOrderComment").value=s.workOrderComment;const t=e.querySelector("#workOrderCommentEdit--workOrderCommentDateString");t.value=s.workOrderCommentDateString;const n=cityssm.dateToString(new Date);t.max=s.workOrderCommentDateString<=n?n:s.workOrderCommentDateString,e.querySelector("#workOrderCommentEdit--workOrderCommentTimeString").value=s.workOrderCommentTimeString},onshown(e,o){bulmaJS.toggleHtmlClipped(),t.initializeDatePickers(e),e.querySelector("#workOrderCommentEdit--workOrderComment").focus(),(n=e.querySelector("form")).addEventListener("submit",l),a=o},onremoved(){bulmaJS.toggleHtmlClipped()}})}function f(e){const r=Number.parseInt(e.currentTarget.closest("tr").dataset.workOrderCommentId,10);bulmaJS.confirm({title:"Remove Comment?",message:"Are you sure you want to remove this comment?",okButton:{text:"Yes, Remove Comment",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderComment",{workOrderId:o,workOrderCommentId:r},e=>{var t;e.success?(g=e.workOrderComments,b()):bulmaJS.alert({title:"Error Removing Comment",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})})}},contextualColorName:"warning"})}function b(){var e,t;const o=document.querySelector("#container--workOrderComments");if(0===g.length)return void(o.innerHTML='<div class="message is-info">\n          <p class="message-body">There are no comments to display.</p>\n          </div>');const r=document.createElement("table");r.className="table is-fullwidth is-striped is-hoverable",r.innerHTML='<thead><tr>\n        <th>Commentor</th>\n        <th>Comment Date</th>\n        <th>Comment</th>\n        <th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const o of g){const s=document.createElement("tr");s.dataset.workOrderCommentId=o.workOrderCommentId.toString(),s.innerHTML="<td>"+cityssm.escapeHTML(null!==(e=o.recordCreate_userName)&&void 0!==e?e:"")+"</td><td>"+o.workOrderCommentDateString+(0===o.workOrderCommentTime?"":" "+o.workOrderCommentTimeString)+"</td><td>"+cityssm.escapeHTML(null!==(t=o.workOrderComment)&&void 0!==t?t:"")+'</td><td class="is-hidden-print"><div class="buttons are-small is-justify-content-end"><button class="button is-primary button--edit" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit</span></button><button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',s.querySelector(".button--edit").addEventListener("click",k),s.querySelector(".button--delete").addEventListener("click",f),r.querySelector("tbody").append(s)}o.innerHTML="",o.append(r)}function v(e){var t;e.success?(i=e.workOrderMilestones,I()):bulmaJS.alert({title:"Error Reopening Milestone",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})}function M(e){e.preventDefault();const r=cityssm.dateToString(new Date),s=Number.parseInt(e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId,10),n=i.find(e=>e.workOrderMilestoneId===s);bulmaJS.confirm({title:"Complete Milestone",message:"Are you sure you want to complete this milestone?"+(""!==n.workOrderMilestoneDateString&&n.workOrderMilestoneDateString>r?"<br /><strong>Note that this milestone is expected to be completed in the future.</strong>":""),messageIsHtml:!0,contextualColorName:"warning",okButton:{text:"Yes, Complete Milestone",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doCompleteWorkOrderMilestone",{workOrderId:o,workOrderMilestoneId:s},v)}}})}function L(e){e.preventDefault();const r=e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;bulmaJS.confirm({title:"Reopen Milestone",message:"Are you sure you want to remove the completion status from this milestone, and reopen it?",contextualColorName:"warning",okButton:{text:"Yes, Reopen Milestone",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doReopenWorkOrderMilestone",{workOrderId:o,workOrderMilestoneId:r},v)}}})}function C(e){e.preventDefault();const r=e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;bulmaJS.confirm({title:"Delete Milestone",message:"Are you sure you want to delete this milestone?",contextualColorName:"warning",okButton:{text:"Yes, Delete Milestone",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderMilestone",{workOrderMilestoneId:r,workOrderId:o},v)}}})}function T(e){e.preventDefault();const r=Number.parseInt(e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId,10),s=i.find(e=>e.workOrderMilestoneId===r);let n;function a(e){e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doUpdateWorkOrderMilestone",e.currentTarget,e=>{v(e),e.success&&n()})}cityssm.openHtmlModal("workOrder-editMilestone",{onshow(e){e.querySelector("#milestoneEdit--workOrderId").value=o,e.querySelector("#milestoneEdit--workOrderMilestoneId").value=s.workOrderMilestoneId.toString();const t=e.querySelector("#milestoneEdit--workOrderMilestoneTypeId");let r=!1;for(const e of exports.workOrderMilestoneTypes){const o=document.createElement("option");o.value=e.workOrderMilestoneTypeId.toString(),o.textContent=e.workOrderMilestoneType,e.workOrderMilestoneTypeId===s.workOrderMilestoneTypeId&&(o.selected=!0,r=!0),t.append(o)}if(!r&&s.workOrderMilestoneTypeId){const e=document.createElement("option");e.value=s.workOrderMilestoneTypeId.toString(),e.textContent=s.workOrderMilestoneType,e.selected=!0,t.append(e)}e.querySelector("#milestoneEdit--workOrderMilestoneDateString").value=s.workOrderMilestoneDateString,s.workOrderMilestoneTime&&(e.querySelector("#milestoneEdit--workOrderMilestoneTimeString").value=s.workOrderMilestoneTimeString),e.querySelector("#milestoneEdit--workOrderMilestoneDescription").value=s.workOrderMilestoneDescription},onshown(e,o){n=o,bulmaJS.toggleHtmlClipped(),t.initializeDatePickers(e),e.querySelector("form").addEventListener("submit",a)},onremoved(){bulmaJS.toggleHtmlClipped()}})}function I(){var e,t,o,r,s;const n=document.querySelector("#panel--milestones"),a=n.querySelectorAll(".panel-block");for(const e of a)e.remove();for(const a of i){const l=document.createElement("div");l.className="panel-block is-block container--milestone",l.dataset.workOrderMilestoneId=a.workOrderMilestoneId.toString(),l.innerHTML='<div class="columns is-mobile"><div class="column is-narrow">'+(a.workOrderMilestoneCompletionDate?'<span class="button is-static" data-tooltip="Completed '+a.workOrderMilestoneCompletionDateString+'" aria-label="Completed '+a.workOrderMilestoneCompletionDateString+'"><span class="icon is-small"><i class="fas fa-check" aria-hidden="true"></i></span></span>':'<button class="button button--completeMilestone" data-tooltip="Incomplete" type="button" aria-label="Incomplete"><span class="icon is-small"><i class="far fa-square" aria-hidden="true"></i></span></button>')+'</div><div class="column">'+(a.workOrderMilestoneTypeId?"<strong>"+cityssm.escapeHTML(null!==(e=a.workOrderMilestoneType)&&void 0!==e?e:"")+"</strong><br />":"")+(0===a.workOrderMilestoneDate?'<span class="has-text-grey">(No Set Date)</span>':a.workOrderMilestoneDateString)+(a.workOrderMilestoneTime?" "+a.workOrderMilestoneTimeString:"")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(null!==(t=a.workOrderMilestoneDescription)&&void 0!==t?t:"")+'</span></div><div class="column is-narrow"><div class="dropdown is-right"><div class="dropdown-trigger"><button class="button is-small" data-tooltip="Options" type="button" aria-label="Options"><i class="fas fa-ellipsis-v" aria-hidden="true"></i></button></div><div class="dropdown-menu"><div class="dropdown-content">'+(a.workOrderMilestoneCompletionDate?'<a class="dropdown-item button--reopenMilestone" href="#"><span class="icon is-small"><i class="fas fa-times" aria-hidden="true"></i></span> <span>Reopen Milestone</span></a>':'<a class="dropdown-item button--editMilestone" href="#"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit Milestone</span></a>')+'<hr class="dropdown-divider" /><a class="dropdown-item button--deleteMilestone" href="#"><span class="icon is-small"><i class="fas fa-trash has-text-danger" aria-hidden="true"></i></span> <span>Delete Milestone</span></a></div></div></div></div></div>',null===(o=l.querySelector(".button--reopenMilestone"))||void 0===o||o.addEventListener("click",L),null===(r=l.querySelector(".button--editMilestone"))||void 0===r||r.addEventListener("click",T),null===(s=l.querySelector(".button--completeMilestone"))||void 0===s||s.addEventListener("click",M),l.querySelector(".button--deleteMilestone").addEventListener("click",C),n.append(l)}bulmaJS.init(n)}delete exports.workOrderComments,null===(w=document.querySelector("#workOrderComments--add"))||void 0===w||w.addEventListener("click",function(){let e;function r(o){o.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderComment",o.currentTarget,t=>{t.success&&(g=t.workOrderComments,b(),e())})}cityssm.openHtmlModal("workOrder-addComment",{onshow(e){t.populateAliases(e),e.querySelector("#workOrderCommentAdd--workOrderId").value=o,e.querySelector("form").addEventListener("submit",r)},onshown(t,o){bulmaJS.toggleHtmlClipped(),e=o,t.querySelector("#workOrderCommentAdd--workOrderComment").focus()},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#workOrderComments--add").focus()}})}),r||b(),r||(i=exports.workOrderMilestones,delete exports.workOrderMilestones,I(),null===(e=document.querySelector("#button--addMilestone"))||void 0===e||e.addEventListener("click",()=>{let e,r,s;function n(o){o&&o.preventDefault();const n=cityssm.dateToString(new Date);function a(){cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderMilestone",r,e=>{v(e),e.success&&s()})}const l=e.querySelector("#milestoneAdd--workOrderMilestoneDateString").value;""!==l&&l<n?bulmaJS.confirm({title:"Milestone Date in the Past",message:"Are you sure you want to create a milestone with a date in the past?",contextualColorName:"warning",okButton:{text:"Yes, Create a Past Milestone",callbackFunction:a}}):a()}cityssm.openHtmlModal("workOrder-addMilestone",{onshow(e){e.querySelector("#milestoneAdd--workOrderId").value=o;const t=e.querySelector("#milestoneAdd--workOrderMilestoneTypeId");for(const e of exports.workOrderMilestoneTypes){const o=document.createElement("option");o.value=e.workOrderMilestoneTypeId.toString(),o.textContent=e.workOrderMilestoneType,t.append(o)}e.querySelector("#milestoneAdd--workOrderMilestoneDateString").valueAsDate=new Date},onshown(o,a){e=o,s=a,t.initializeDatePickers(o),bulmaJS.toggleHtmlClipped(),o.querySelector("#milestoneAdd--workOrderMilestoneTypeId").focus(),(r=o.querySelector("form")).addEventListener("submit",n)},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#button--addMilestone").focus()}})}))})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e;const t=exports.los,o=document.querySelector("#workOrderEdit--workOrderId").value,r=""===o,s=document.querySelector("#form--workOrderEdit");t.initializeDatePickers(s.querySelector("#workOrderEdit--workOrderOpenDateString").closest(".field")),t.initializeUnlockFieldButtons(s),s.addEventListener("submit",e=>{e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/"+(r?"doCreateWorkOrder":"doUpdateWorkOrder"),e.currentTarget,e=>{var o;e.success?(cityssm.disableNavBlocker(),r?window.location.href=t.getWorkOrderURL(e.workOrderId,!0):bulmaJS.alert({message:"Work Order Updated Successfully",contextualColorName:"success"})):bulmaJS.alert({title:"Error Updating Work Order",message:null!==(o=e.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})});const n=s.querySelectorAll("input, select");for(const e of n)e.addEventListener("change",cityssm.enableNavBlocker);function a(){cityssm.postJSON(t.urlPrefix+"/workOrders/doCloseWorkOrder",{workOrderId:o},e=>{var r;e.success?window.location.href=t.getWorkOrderURL(o):bulmaJS.alert({title:"Error Closing Work Order",message:null!==(r=e.errorMessage)&&void 0!==r?r:"",contextualColorName:"danger"})})}function l(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrder",{workOrderId:o},e=>{var o;e.success?window.location.href=t.urlPrefix+"/workOrders":bulmaJS.alert({title:"Error Deleting Work Order",message:null!==(o=e.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})}let c;if(null===(g=document.querySelector("#button--closeWorkOrder"))||void 0===g||g.addEventListener("click",()=>{c.some(e=>!e.workOrderMilestoneCompletionDate)?bulmaJS.alert({title:"Outstanding Milestones",message:"You cannot close a work order with outstanding milestones.\n                        Either complete the outstanding milestones, or remove them from the work order.",contextualColorName:"warning"}):bulmaJS.confirm({title:"Close Work Order",message:"Are you sure you want to close this work order?",contextualColorName:"info",okButton:{text:"Yes, Close Work Order",callbackFunction:a}})}),null===(i=document.querySelector("#button--deleteWorkOrder"))||void 0===i||i.addEventListener("click",e=>{e.preventDefault(),bulmaJS.confirm({title:"Delete Work Order",message:"Are you sure you want to delete this work order?",contextualColorName:"warning",okButton:{text:"Yes, Delete Work Order",callbackFunction:l}})}),!r){var i;Object.defineProperty(exports,"__esModule",{value:!0});let e=exports.workOrderLots;delete exports.workOrderLots;let r=exports.workOrderLotOccupancies;function d(e){const s=e.currentTarget.closest(".container--lotOccupancy").dataset.lotOccupancyId;bulmaJS.confirm({title:`Delete ${t.escapedAliases.Occupancy} Relationship`,message:`Are you sure you want to remove the relationship to this ${t.escapedAliases.occupancy} record from this work order?  Note that the record will remain.`,contextualColorName:"warning",okButton:{text:"Yes, Delete Relationship",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderLotOccupancy",{workOrderId:o,lotOccupancyId:s},e=>{var t;const o=e;o.success?(r=o.workOrderLotOccupancies,O()):bulmaJS.alert({title:"Error Deleting Relationship",message:null!==(t=o.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})})}}})}function u(r,s){cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderLot",{workOrderId:o,lotId:r},o=>{var r;const n=o;n.success?(e=n.workOrderLots,O()):bulmaJS.alert({title:`Error Adding ${t.escapedAliases.Lot}`,message:null!==(r=n.errorMessage)&&void 0!==r?r:"",contextualColorName:"danger"}),void 0!==s&&s(n.success)})}function m(e){u(e.currentTarget.dataset.lotId)}function p(r){const s=Number.parseInt(r.currentTarget.closest(".container--lot").dataset.lotId,10),n=e.find(e=>e.lotId===s);let a;function l(o){o.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doUpdateLotStatus",o.currentTarget,t=>{var o;const r=t;r.success?(e=r.workOrderLots,O(),a()):bulmaJS.alert({title:"Error Deleting Relationship",message:null!==(o=r.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})}cityssm.openHtmlModal("lot-editLotStatus",{onshow(e){t.populateAliases(e),e.querySelector("#lotStatusEdit--lotId").value=s.toString(),e.querySelector("#lotStatusEdit--lotName").value=n.lotName;const r=e.querySelector("#lotStatusEdit--lotStatusId");let a=!1;for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,e.lotStatusId===n.lotStatusId&&(a=!0),r.append(t)}if(!a&&n.lotStatusId){const e=document.createElement("option");e.value=n.lotStatusId.toString(),e.textContent=n.lotStatus,r.append(e)}n.lotStatusId&&(r.value=n.lotStatusId.toString()),e.querySelector("form").insertAdjacentHTML("beforeend",`<input name="workOrderId" type="hidden" value="${o}" />`)},onshown(e,t){a=t,bulmaJS.toggleHtmlClipped(),e.querySelector("form").addEventListener("submit",l)},onremoved(){bulmaJS.toggleHtmlClipped()}})}function y(r){const s=r.currentTarget.closest(".container--lot").dataset.lotId;bulmaJS.confirm({title:`Delete ${t.escapedAliases.Occupancy} Relationship`,message:`Are you sure you want to remove the relationship to this ${t.escapedAliases.occupancy} record from this work order?  Note that the record will remain.`,contextualColorName:"warning",okButton:{text:"Yes, Delete Relationship",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderLot",{workOrderId:o,lotId:s},t=>{var o;const r=t;r.success?(e=r.workOrderLots,O()):bulmaJS.alert({title:"Error Deleting Relationship",message:null!==(o=r.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"})})}}})}function O(){!function(){var o,s,n,a;const l=document.querySelector("#container--lotOccupancies");if(document.querySelector(".tabs a[href='#relatedTab--lotOccupancies'] .tag").textContent=r.length.toString(),0===r.length)return void(l.innerHTML=`<div class="message is-info">\n                    <p class="message-body">There are no ${t.escapedAliases.occupancies} associated with this work order.</p>\n                    </div>`);l.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                <thead><tr>\n                <th class="has-width-1"></th>\n                <th>${t.escapedAliases.Occupancy} Type</th>\n                <th>${t.escapedAliases.Lot}</th>\n                <th>${t.escapedAliases.OccupancyStartDate}</th>\n                <th>End Date</th>\n                <th>${t.escapedAliases.Occupants}</th>\n                <th class="has-width-1"></th>\n                </tr></thead>\n                <tbody></tbody>\n                </table>`;const c=cityssm.dateToString(new Date);for(const i of r){const r=document.createElement("tr");r.className="container--lotOccupancy",r.dataset.lotOccupancyId=i.lotOccupancyId.toString();const u=!(i.occupancyEndDate&&i.occupancyEndDateString<c),p=i.lotId&&e.some(e=>i.lotId===e.lotId);r.innerHTML='<td class="is-width-1 has-text-centered">'+(u?'<i class="fas fa-play" title="Current '+t.escapedAliases.Occupancy+'"></i>':'<i class="fas fa-stop" title="Previous '+t.escapedAliases.Occupancy+'"></i>')+'</td><td><a class="has-text-weight-bold" href="'+t.getLotOccupancyURL(i.lotOccupancyId)+'">'+cityssm.escapeHTML(null!==(o=i.occupancyType)&&void 0!==o?o:"")+"</a><br />"+`<span class="is-size-7">#${i.lotOccupancyId}</span>`+"</td>",i.lotId?r.insertAdjacentHTML("beforeend","<td>"+cityssm.escapeHTML(null!==(s=i.lotName)&&void 0!==s?s:"")+(p?"":' <button class="button is-small is-light is-success button--addLot" data-lot-id="'+i.lotId.toString()+'" data-tooltip="Add '+t.escapedAliases.Lot+'" aria-label="Add '+t.escapedAliases.Lot+'" type="button"><i class="fas fa-plus" aria-hidden="true"></i></button>')+"</td>"):r.insertAdjacentHTML("beforeend",`<td><span class="has-text-grey">(No ${t.escapedAliases.Lot})</span></td>`),r.insertAdjacentHTML("beforeend","<td>"+i.occupancyStartDateString+"</td><td>"+(i.occupancyEndDate?i.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+(0===i.lotOccupancyOccupants.length?'<span class="has-text-grey">(No '+t.escapedAliases.Occupants+")</span>":null===(n=i.lotOccupancyOccupants)||void 0===n?void 0:n.reduce((e,o)=>{var r;return e+'<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(o.lotOccupantType)+'"><i class="fas fa-fw fa-'+cityssm.escapeHTML(""===(null!==(r=o.fontAwesomeIconClass)&&void 0!==r?r:"")?"user":o.fontAwesomeIconClass)+'" aria-label="'+t.escapedAliases.Occupant+'"></i> '+cityssm.escapeHTML(o.occupantName)+" "+cityssm.escapeHTML(o.occupantFamilyName)+"</span><br />"},""))+'</td><td><button class="button is-small is-light is-danger button--deleteLotOccupancy" data-tooltip="Delete Relationship" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>'),null===(a=r.querySelector(".button--addLot"))||void 0===a||a.addEventListener("click",m),r.querySelector(".button--deleteLotOccupancy").addEventListener("click",d),l.querySelector("tbody").append(r)}}(),function(){var o,r,s,n;const a=document.querySelector("#container--lots");if(document.querySelector(".tabs a[href='#relatedTab--lots'] .tag").textContent=e.length.toString(),0!==e.length){a.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                <thead><tr>\n                <th>${t.escapedAliases.Lot}</th>\n                <th>${t.escapedAliases.Map}</th>\n                <th>${t.escapedAliases.Lot} Type</th>\n                <th>Status</th>\n                <th class="has-width-1"></th>\n                </tr></thead>\n                <tbody></tbody>\n                </table>`;for(const l of e){const e=document.createElement("tr");e.className="container--lot",e.dataset.lotId=l.lotId.toString(),e.innerHTML='<td><a class="has-text-weight-bold" href="'+t.getLotURL(l.lotId)+'">'+cityssm.escapeHTML(null!==(o=l.lotName)&&void 0!==o?o:"")+"</a></td>"+`<td>${cityssm.escapeHTML(null!==(r=l.mapName)&&void 0!==r?r:"")}</td>`+`<td>${cityssm.escapeHTML(null!==(s=l.lotType)&&void 0!==s?s:"")}</td>`+"<td>"+(l.lotStatusId?cityssm.escapeHTML(null!==(n=l.lotStatus)&&void 0!==n?n:""):'<span class="has-text-grey">(No Status)</span>')+'</td><td class="is-nowrap">\n                <button class="button is-small is-light is-info button--editLotStatus" data-tooltip="Update Status" type="button">\n                <i class="fas fa-pencil-alt" aria-hidden="true"></i>\n                </button>\n                <button class="button is-small is-light is-danger button--deleteLot" data-tooltip="Delete Relationship" type="button">\n                <i class="fas fa-trash" aria-hidden="true"></i>\n                </button>\n                </td>',e.querySelector(".button--editLotStatus").addEventListener("click",p),e.querySelector(".button--deleteLot").addEventListener("click",y),a.querySelector("tbody").append(e)}}else a.innerHTML=`<div class="message is-info">\n                    <p class="message-body">There are no ${t.escapedAliases.lots} associated with this work order.</p>\n                    </div>`}()}function h(e){const s=e.currentTarget.closest("tr");!function(e,s){cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderLotOccupancy",{workOrderId:o,lotOccupancyId:e},e=>{var o;const n=e;n.success?(r=n.workOrderLotOccupancies,O()):bulmaJS.alert({title:"Error Adding "+t.escapedAliases.Occupancy,message:null!==(o=n.errorMessage)&&void 0!==o?o:"",contextualColorName:"danger"}),void 0!==s&&s(n.success)})}(s.dataset.lotOccupancyId,e=>{e&&s.remove()})}function S(e){const t=e.currentTarget.closest("tr");u(t.dataset.lotId,e=>{e&&t.remove()})}delete exports.workOrderLotOccupancies,O(),null===(g=document.querySelector("#button--addLotOccupancy"))||void 0===g||g.addEventListener("click",()=>{let e,r;function s(o){o&&o.preventDefault(),r.innerHTML=t.getLoadingParagraphHTML("Searching..."),cityssm.postJSON(t.urlPrefix+"/lotOccupancies/doSearchLotOccupancies",e,e=>{var o,s;const n=e;if(0!==n.lotOccupancies.length){r.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                    <thead><tr>\n                    <th class="has-width-1"></th>\n                    <th>${t.escapedAliases.Occupancy} Type</th>\n                    <th>${t.escapedAliases.Lot}</th>\n                    <th>${t.escapedAliases.OccupancyStartDate}</th>\n                    <th>End Date</th>\n                    <th>${t.escapedAliases.Occupants}</th>\n                    </tr></thead>\n                    <tbody></tbody>\n                    </table>`;for(const e of n.lotOccupancies){const n=document.createElement("tr");n.className="container--lotOccupancy",n.dataset.lotOccupancyId=e.lotOccupancyId.toString(),n.innerHTML=`<td class="has-text-centered">\n                        <button class="button is-small is-success button--addLotOccupancy" data-tooltip="Add" type="button" aria-label="Add">\n                          <i class="fas fa-plus" aria-hidden="true"></i>\n                        </button>\n                      </td>\n                      <td class="has-text-weight-bold">\n                        ${cityssm.escapeHTML(null!==(o=e.occupancyType)&&void 0!==o?o:"")}\n                      </td>`,e.lotId?n.insertAdjacentHTML("beforeend","<td>"+cityssm.escapeHTML(null!==(s=e.lotName)&&void 0!==s?s:"")+"</td>"):n.insertAdjacentHTML("beforeend",`<td><span class="has-text-grey">(No ${t.escapedAliases.Lot})</span></td>`),n.insertAdjacentHTML("beforeend",`<td>${e.occupancyStartDateString}</td>`+"<td>"+(e.occupancyEndDate?e.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+(0===e.lotOccupancyOccupants.length?`<span class="has-text-grey">(No ${cityssm.escapeHTML(t.escapedAliases.Occupants)})</span>`:cityssm.escapeHTML(e.lotOccupancyOccupants[0].occupantName+" "+e.lotOccupancyOccupants[0].occupantFamilyName)+(e.lotOccupancyOccupants.length>1?" plus "+(e.lotOccupancyOccupants.length-1):""))+"</td>"),n.querySelector(".button--addLotOccupancy").addEventListener("click",h),r.querySelector("tbody").append(n)}}else r.innerHTML='<div class="message is-info">\n                      <p class="message-body">There are no records that meet the search criteria.</p>\n                      </div>'})}cityssm.openHtmlModal("workOrder-addLotOccupancy",{onshow(n){t.populateAliases(n),e=n.querySelector("form"),r=n.querySelector("#resultsContainer--lotOccupancyAdd"),n.querySelector("#lotOccupancySearch--notWorkOrderId").value=o,n.querySelector("#lotOccupancySearch--occupancyEffectiveDateString").value=document.querySelector("#workOrderEdit--workOrderOpenDateString").value,s()},onshown(t){bulmaJS.toggleHtmlClipped();const o=t.querySelector("#lotOccupancySearch--occupantName");o.addEventListener("change",s),o.focus(),t.querySelector("#lotOccupancySearch--lotName").addEventListener("change",s),e.addEventListener("submit",s)},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#button--addLotOccupancy").focus()}})}),null===(i=document.querySelector("#button--addLot"))||void 0===i||i.addEventListener("click",()=>{let e,r;function s(o){o&&o.preventDefault(),r.innerHTML=t.getLoadingParagraphHTML("Searching..."),cityssm.postJSON(t.urlPrefix+"/lots/doSearchLots",e,e=>{var o,s,n,a;const l=e;if(0!==l.lots.length){r.innerHTML=`<table class="table is-fullwidth is-striped is-hoverable">\n                  <thead><tr>\n                  <th class="has-width-1"></th>\n                  <th>${t.escapedAliases.Lot}</th>\n                  <th>${t.escapedAliases.Map}</th>\n                  <th>${t.escapedAliases.Lot} Type</th>\n                  <th>Status</th>\n                  </tr></thead>\n                  <tbody></tbody>\n                  </table>`;for(const e of l.lots){const t=document.createElement("tr");t.className="container--lot",t.dataset.lotId=e.lotId.toString(),t.innerHTML='<td class="has-text-centered"><button class="button is-small is-success button--addLot" data-tooltip="Add" type="button" aria-label="Add"><i class="fas fa-plus" aria-hidden="true"></i></button></td><td class="has-text-weight-bold">'+cityssm.escapeHTML(null!==(o=e.lotName)&&void 0!==o?o:"")+"</td><td>"+cityssm.escapeHTML(null!==(s=e.mapName)&&void 0!==s?s:"")+"</td><td>"+cityssm.escapeHTML(null!==(n=e.lotType)&&void 0!==n?n:"")+"</td><td>"+cityssm.escapeHTML(null!==(a=e.lotStatus)&&void 0!==a?a:"")+"</td>",t.querySelector(".button--addLot").addEventListener("click",S),r.querySelector("tbody").append(t)}}else r.innerHTML='<div class="message is-info"><p class="message-body">There are no records that meet the search criteria.</p></div>'})}cityssm.openHtmlModal("workOrder-addLot",{onshow(n){t.populateAliases(n),e=n.querySelector("form"),r=n.querySelector("#resultsContainer--lotAdd"),n.querySelector("#lotSearch--notWorkOrderId").value=o;const a=n.querySelector("#lotSearch--lotStatusId");for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,a.append(t)}s()},onshown(t){bulmaJS.toggleHtmlClipped();const o=t.querySelector("#lotSearch--lotName");o.addEventListener("change",s),o.focus(),t.querySelector("#lotSearch--lotStatusId").addEventListener("change",s),e.addEventListener("submit",s)},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#button--addLot").focus()}})})}var g;Object.defineProperty(exports,"__esModule",{value:!0});let w=exports.workOrderComments;function k(e){const r=Number.parseInt(e.currentTarget.closest("tr").dataset.workOrderCommentId,10),s=w.find(e=>e.workOrderCommentId===r);let n,a;function l(e){e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doUpdateWorkOrderComment",n,e=>{var t;e.success?(w=e.workOrderComments,a(),b()):bulmaJS.alert({title:"Error Updating Comment",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})})}cityssm.openHtmlModal("workOrder-editComment",{onshow(e){e.querySelector("#workOrderCommentEdit--workOrderId").value=o,e.querySelector("#workOrderCommentEdit--workOrderCommentId").value=r.toString(),e.querySelector("#workOrderCommentEdit--workOrderComment").value=s.workOrderComment;const t=e.querySelector("#workOrderCommentEdit--workOrderCommentDateString");t.value=s.workOrderCommentDateString;const n=cityssm.dateToString(new Date);t.max=s.workOrderCommentDateString<=n?n:s.workOrderCommentDateString,e.querySelector("#workOrderCommentEdit--workOrderCommentTimeString").value=s.workOrderCommentTimeString},onshown(e,o){bulmaJS.toggleHtmlClipped(),t.initializeDatePickers(e),e.querySelector("#workOrderCommentEdit--workOrderComment").focus(),(n=e.querySelector("form")).addEventListener("submit",l),a=o},onremoved(){bulmaJS.toggleHtmlClipped()}})}function f(e){const r=Number.parseInt(e.currentTarget.closest("tr").dataset.workOrderCommentId,10);bulmaJS.confirm({title:"Remove Comment?",message:"Are you sure you want to remove this comment?",okButton:{text:"Yes, Remove Comment",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderComment",{workOrderId:o,workOrderCommentId:r},e=>{var t;e.success?(w=e.workOrderComments,b()):bulmaJS.alert({title:"Error Removing Comment",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})})}},contextualColorName:"warning"})}function b(){var e,t;const o=document.querySelector("#container--workOrderComments");if(0===w.length)return void(o.innerHTML='<div class="message is-info">\n          <p class="message-body">There are no comments to display.</p>\n          </div>');const r=document.createElement("table");r.className="table is-fullwidth is-striped is-hoverable",r.innerHTML='<thead><tr>\n        <th>Commentor</th>\n        <th>Comment Date</th>\n        <th>Comment</th>\n        <th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const o of w){const s=document.createElement("tr");s.dataset.workOrderCommentId=o.workOrderCommentId.toString(),s.innerHTML="<td>"+cityssm.escapeHTML(null!==(e=o.recordCreate_userName)&&void 0!==e?e:"")+"</td><td>"+o.workOrderCommentDateString+(0===o.workOrderCommentTime?"":" "+o.workOrderCommentTimeString)+"</td><td>"+cityssm.escapeHTML(null!==(t=o.workOrderComment)&&void 0!==t?t:"")+'</td><td class="is-hidden-print"><div class="buttons are-small is-justify-content-end"><button class="button is-primary button--edit" type="button"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit</span></button><button class="button is-light is-danger button--delete" data-tooltip="Delete Comment" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',s.querySelector(".button--edit").addEventListener("click",k),s.querySelector(".button--delete").addEventListener("click",f),r.querySelector("tbody").append(s)}o.innerHTML="",o.append(r)}function v(e){var t;e.success?(c=e.workOrderMilestones,I()):bulmaJS.alert({title:"Error Reopening Milestone",message:null!==(t=e.errorMessage)&&void 0!==t?t:"",contextualColorName:"danger"})}function M(e){e.preventDefault();const r=cityssm.dateToString(new Date),s=Number.parseInt(e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId,10),n=c.find(e=>e.workOrderMilestoneId===s);bulmaJS.confirm({title:"Complete Milestone",message:"Are you sure you want to complete this milestone?"+(""!==n.workOrderMilestoneDateString&&n.workOrderMilestoneDateString>r?"<br /><strong>Note that this milestone is expected to be completed in the future.</strong>":""),messageIsHtml:!0,contextualColorName:"warning",okButton:{text:"Yes, Complete Milestone",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doCompleteWorkOrderMilestone",{workOrderId:o,workOrderMilestoneId:s},v)}}})}function L(e){e.preventDefault();const r=e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;bulmaJS.confirm({title:"Reopen Milestone",message:"Are you sure you want to remove the completion status from this milestone, and reopen it?",contextualColorName:"warning",okButton:{text:"Yes, Reopen Milestone",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doReopenWorkOrderMilestone",{workOrderId:o,workOrderMilestoneId:r},v)}}})}function C(e){e.preventDefault();const r=e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;bulmaJS.confirm({title:"Delete Milestone",message:"Are you sure you want to delete this milestone?",contextualColorName:"warning",okButton:{text:"Yes, Delete Milestone",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/workOrders/doDeleteWorkOrderMilestone",{workOrderMilestoneId:r,workOrderId:o},v)}}})}function T(e){e.preventDefault();const r=Number.parseInt(e.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId,10),s=c.find(e=>e.workOrderMilestoneId===r);let n;function a(e){e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doUpdateWorkOrderMilestone",e.currentTarget,e=>{v(e),e.success&&n()})}cityssm.openHtmlModal("workOrder-editMilestone",{onshow(e){e.querySelector("#milestoneEdit--workOrderId").value=o,e.querySelector("#milestoneEdit--workOrderMilestoneId").value=s.workOrderMilestoneId.toString();const t=e.querySelector("#milestoneEdit--workOrderMilestoneTypeId");let r=!1;for(const e of exports.workOrderMilestoneTypes){const o=document.createElement("option");o.value=e.workOrderMilestoneTypeId.toString(),o.textContent=e.workOrderMilestoneType,e.workOrderMilestoneTypeId===s.workOrderMilestoneTypeId&&(o.selected=!0,r=!0),t.append(o)}if(!r&&s.workOrderMilestoneTypeId){const e=document.createElement("option");e.value=s.workOrderMilestoneTypeId.toString(),e.textContent=s.workOrderMilestoneType,e.selected=!0,t.append(e)}e.querySelector("#milestoneEdit--workOrderMilestoneDateString").value=s.workOrderMilestoneDateString,s.workOrderMilestoneTime&&(e.querySelector("#milestoneEdit--workOrderMilestoneTimeString").value=s.workOrderMilestoneTimeString),e.querySelector("#milestoneEdit--workOrderMilestoneDescription").value=s.workOrderMilestoneDescription},onshown(e,o){n=o,bulmaJS.toggleHtmlClipped(),t.initializeDatePickers(e),e.querySelector("form").addEventListener("submit",a)},onremoved(){bulmaJS.toggleHtmlClipped()}})}function I(){var e,t,o,r,s;const n=document.querySelector("#panel--milestones"),a=n.querySelectorAll(".panel-block");for(const e of a)e.remove();for(const a of c){const l=document.createElement("div");l.className="panel-block is-block container--milestone",l.dataset.workOrderMilestoneId=a.workOrderMilestoneId.toString(),l.innerHTML='<div class="columns is-mobile"><div class="column is-narrow">'+(a.workOrderMilestoneCompletionDate?'<span class="button is-static" data-tooltip="Completed '+a.workOrderMilestoneCompletionDateString+'" aria-label="Completed '+a.workOrderMilestoneCompletionDateString+'"><span class="icon is-small"><i class="fas fa-check" aria-hidden="true"></i></span></span>':'<button class="button button--completeMilestone" data-tooltip="Incomplete" type="button" aria-label="Incomplete"><span class="icon is-small"><i class="far fa-square" aria-hidden="true"></i></span></button>')+'</div><div class="column">'+(a.workOrderMilestoneTypeId?"<strong>"+cityssm.escapeHTML(null!==(e=a.workOrderMilestoneType)&&void 0!==e?e:"")+"</strong><br />":"")+(0===a.workOrderMilestoneDate?'<span class="has-text-grey">(No Set Date)</span>':a.workOrderMilestoneDateString)+(a.workOrderMilestoneTime?" "+a.workOrderMilestoneTimeString:"")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(null!==(t=a.workOrderMilestoneDescription)&&void 0!==t?t:"")+'</span></div><div class="column is-narrow"><div class="dropdown is-right"><div class="dropdown-trigger"><button class="button is-small" data-tooltip="Options" type="button" aria-label="Options"><i class="fas fa-ellipsis-v" aria-hidden="true"></i></button></div><div class="dropdown-menu"><div class="dropdown-content">'+(a.workOrderMilestoneCompletionDate?'<a class="dropdown-item button--reopenMilestone" href="#"><span class="icon is-small"><i class="fas fa-times" aria-hidden="true"></i></span> <span>Reopen Milestone</span></a>':'<a class="dropdown-item button--editMilestone" href="#"><span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span>Edit Milestone</span></a>')+'<hr class="dropdown-divider" /><a class="dropdown-item button--deleteMilestone" href="#"><span class="icon is-small"><i class="fas fa-trash has-text-danger" aria-hidden="true"></i></span> <span>Delete Milestone</span></a></div></div></div></div></div>',null===(o=l.querySelector(".button--reopenMilestone"))||void 0===o||o.addEventListener("click",L),null===(r=l.querySelector(".button--editMilestone"))||void 0===r||r.addEventListener("click",T),null===(s=l.querySelector(".button--completeMilestone"))||void 0===s||s.addEventListener("click",M),l.querySelector(".button--deleteMilestone").addEventListener("click",C),n.append(l)}bulmaJS.init(n)}delete exports.workOrderComments,null===(g=document.querySelector("#workOrderComments--add"))||void 0===g||g.addEventListener("click",function(){let e;function r(o){o.preventDefault(),cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderComment",o.currentTarget,t=>{t.success&&(w=t.workOrderComments,b(),e())})}cityssm.openHtmlModal("workOrder-addComment",{onshow(e){t.populateAliases(e),e.querySelector("#workOrderCommentAdd--workOrderId").value=o,e.querySelector("form").addEventListener("submit",r)},onshown(t,o){bulmaJS.toggleHtmlClipped(),e=o,t.querySelector("#workOrderCommentAdd--workOrderComment").focus()},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#workOrderComments--add").focus()}})}),r||b(),r||(c=exports.workOrderMilestones,delete exports.workOrderMilestones,I(),null===(e=document.querySelector("#button--addMilestone"))||void 0===e||e.addEventListener("click",()=>{let e,r,s;function n(o){o&&o.preventDefault();const n=cityssm.dateToString(new Date);function a(){cityssm.postJSON(t.urlPrefix+"/workOrders/doAddWorkOrderMilestone",r,e=>{v(e),e.success&&s()})}const l=e.querySelector("#milestoneAdd--workOrderMilestoneDateString").value;""!==l&&l<n?bulmaJS.confirm({title:"Milestone Date in the Past",message:"Are you sure you want to create a milestone with a date in the past?",contextualColorName:"warning",okButton:{text:"Yes, Create a Past Milestone",callbackFunction:a}}):a()}cityssm.openHtmlModal("workOrder-addMilestone",{onshow(e){e.querySelector("#milestoneAdd--workOrderId").value=o;const t=e.querySelector("#milestoneAdd--workOrderMilestoneTypeId");for(const e of exports.workOrderMilestoneTypes){const o=document.createElement("option");o.value=e.workOrderMilestoneTypeId.toString(),o.textContent=e.workOrderMilestoneType,t.append(o)}e.querySelector("#milestoneAdd--workOrderMilestoneDateString").valueAsDate=new Date},onshown(o,a){e=o,s=a,t.initializeDatePickers(o),bulmaJS.toggleHtmlClipped(),o.querySelector("#milestoneAdd--workOrderMilestoneTypeId").focus(),(r=o.querySelector("form")).addEventListener("submit",n)},onremoved(){bulmaJS.toggleHtmlClipped(),document.querySelector("#button--addMilestone").focus()}})}))})();
\ No newline at end of file
diff --git a/views/lot-edit.ejs b/views/lot-edit.ejs
index b3357999..67f156c0 100644
--- a/views/lot-edit.ejs
+++ b/views/lot-edit.ejs
@@ -4,26 +4,26 @@
   <ul>
     <li><a href="<%= urlPrefix %>/dashboard">Home</a></li>
     <li>
-        <a href="<%= urlPrefix %>/lots">
-            <span class="icon is-small"><i class="fas fa-vector-square" aria-hidden="true"></i></span>
-            <span><%= configFunctions.getProperty("aliases.lots") %></span>
-        </a>
+      <a href="<%= urlPrefix %>/lots">
+        <span class="icon is-small"><i class="fas fa-vector-square" aria-hidden="true"></i></span>
+        <span><%= configFunctions.getProperty("aliases.lots") %></span>
+      </a>
     </li>
     <% if (!isCreate) { %>
-        <li>
-            <a href="<%= urlPrefix %>/lots/<%= lot.lotId %>" accesskey="v">
-                <%= lot.lotName %>
-            </a>
-        </li>
+      <li>
+        <a href="<%= urlPrefix %>/lots/<%= lot.lotId %>" accesskey="v">
+          <%= lot.lotName %>
+        </a>
+      </li>
     <% } %>
     <li class="is-active">
-        <a href="#" aria-current="page">
-            <% if (isCreate) { %>
-            Create a New <%= configFunctions.getProperty("aliases.lot") %>
-            <% } else { %>
-            Update <%= configFunctions.getProperty("aliases.lot") %>
-            <% } %>
-        </a>
+      <a href="#" aria-current="page">
+        <% if (isCreate) { %>
+          Create a New <%= configFunctions.getProperty("aliases.lot") %>
+        <% } else { %>
+          Update <%= configFunctions.getProperty("aliases.lot") %>
+        <% } %>
+      </a>
     </li>
   </ul>
 </nav>
@@ -49,20 +49,20 @@
       <div class="level-item">
         <div class="dropdown is-right is-up">
             <div class="dropdown-trigger">
-                <button class="button" type="button">
-                    <span>More Options</span>
-                    <span class="icon is-small">
-                        <i class="fas fa-angle-up" aria-hidden="true"></i>
-                    </span>
-                </button>
+              <button class="button" type="button">
+                <span>More Options</span>
+                <span class="icon is-small">
+                  <i class="fas fa-angle-up" aria-hidden="true"></i>
+                </span>
+              </button>
             </div>
             <div class="dropdown-menu">
-                <div class="dropdown-content">
-                    <a class="dropdown-item" id="button--deleteLot" href="#">
-                        <span class="icon is-small"><i class="fas fa-trash has-text-danger" aria-hidden="true"></i></span>
-                        <span>Delete <%= configFunctions.getProperty("aliases.lot") %></span>
-                    </a>
-                </div>
+              <div class="dropdown-content">
+                <a class="dropdown-item" id="button--deleteLot" href="#">
+                  <span class="icon is-small"><i class="fas fa-trash has-text-danger" aria-hidden="true"></i></span>
+                  <span>Delete <%= configFunctions.getProperty("aliases.lot") %></span>
+                </a>
+              </div>
             </div>
         </div>
       </div>
@@ -71,8 +71,8 @@
       <button class="button is-primary" type="submit" form="form--lot">
         <span class="icon is-small"><i class="fas fa-save" aria-hidden="true"></i></span>
         <span>
-            <%= (isCreate ? "Create" : "Update") %>
-            <%= configFunctions.getProperty("aliases.lot") %>
+          <%= (isCreate ? "Create" : "Update") %>
+          <%= configFunctions.getProperty("aliases.lot") %>
         </span>
       </button>
     </div>
@@ -81,265 +81,263 @@
 </div>
 
 <form id="form--lot">
-    <input id="lot--lotId" name="lotId" type="hidden" value="<%= isCreate ? "" : lot.lotId %>" />
+  <input id="lot--lotId" name="lotId" type="hidden" value="<%= isCreate ? "" : lot.lotId %>" />
 
-    <div class="panel">
-        <div class="panel-block is-block">
-            <div class="columns">
-                <div class="column">
-                    <div class="field">
-                        <label class="label" for="lot--lotName">
-                            <%= configFunctions.getProperty("aliases.lot") %> Name
-                        </label>
-                        <div class="control">
-                            <input class="input" id="lot--lotName" name="lotName" value="<%= lot.lotName %>" 
-                                <% if (configFunctions.getProperty("settings.lot.lotNamePattern")) { %>
-                                    pattern="<%= configFunctions.getProperty("settings.lot.lotNamePattern").source %>"
-                                <% } %>
-                                maxlength="100" 
-                                required
-                                accesskey="f"
-                                <%= (isCreate ? " autofocus" : "") %> />
-                        </div>
-                        <% if (configFunctions.getProperty("settings.lot.lotNameHelpText")) { %>
-                            <p class="help">
-                                <%- configFunctions.getProperty("settings.lot.lotNameHelpText").replace(/\n/g, "<br />") %>
-                            </p>
-                        <% } %>
+  <div class="panel">
+    <div class="panel-block is-block">
+      <div class="columns">
+          <div class="column">
+              <div class="field">
+                  <label class="label" for="lot--lotName">
+                      <%= configFunctions.getProperty("aliases.lot") %> Name
+                  </label>
+                  <div class="control">
+                      <input class="input" id="lot--lotName" name="lotName" value="<%= lot.lotName %>" 
+                          <% if (configFunctions.getProperty("settings.lot.lotNamePattern")) { %>
+                              pattern="<%= configFunctions.getProperty("settings.lot.lotNamePattern").source %>"
+                          <% } %>
+                          maxlength="100" 
+                          required
+                          accesskey="f"
+                          <%= (isCreate ? " autofocus" : "") %> />
+                  </div>
+                  <% if (configFunctions.getProperty("settings.lot.lotNameHelpText")) { %>
+                      <p class="help">
+                          <%- configFunctions.getProperty("settings.lot.lotNameHelpText").replace(/\n/g, "<br />") %>
+                      </p>
+                  <% } %>
+              </div>
+          </div>
+          <div class="column">
+              <label class="label" for="lot--lotTypeId">
+                  <%= configFunctions.getProperty("aliases.lot") %> Type
+              </label>
+              <div class="field has-addons">
+                  <div class="control is-expanded">
+                      <div class="select is-fullwidth">
+                          <select 
+                              <% if (!isCreate) { %>
+                                  class="is-readonly" 
+                              <% } %>
+                              id="lot--lotTypeId" name="lotTypeId" required>
+                              <% if (isCreate) { %>
+                                  <option value="">(No Type)</option>
+                              <% } %>
+                              <% let typeIsFound = false; %>
+                              <% for (const lotType of lotTypes) { %>
+                                  <% 
+                                      if (lot.lotTypeId === lotType.lotTypeId) {
+                                          typeIsFound = true;
+                                      }
+                                  %>
+                                  <option value="<%= lotType.lotTypeId %>"
+                                      <%= (lot.lotTypeId === lotType.lotTypeId ? " selected" : "") %>
+                                      <%= (!isCreate && lot.lotTypeId !== lotType.lotTypeId ? " disabled" : "") %>>
+                                      <%= lotType.lotType %>
+                                  </option>
+                              <% } %>
+                              <% if (lot.lotTypeId && !typeIsFound) { %>
+                                  <option value="<%= lot.lotTypeId %>" selected>
+                                      <%= lot.lotType %>
+                                  </option>
+                              <% } %>
+                          </select>
+                      </div>
+                  </div>
+                  <div class="control">
+                      <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock Field">
+                          <i class="fas fa-unlock" aria-hidden="true"></i>
+                      </button>
+                  </div>
+              </div>
+              <label class="label" for="lot--lotStatusId">
+                  <%= configFunctions.getProperty("aliases.lot") %> Status
+              </label>
+              <div class="field">
+                  <div class="control">
+                      <div class="select is-fullwidth">
+                          <select id="lot--lotStatusId" name="lotStatusId">
+                              <option value="">(No Status)</option>
+                              <% let statusIsFound = false; %>
+                              <% for (const lotStatus of lotStatuses) { %>
+                                  <% 
+                                      if (lot.lotStatusId === lotStatus.lotStatusId) {
+                                          statusIsFound = true;
+                                      }
+                                  %>
+                                  <option value="<%= lotStatus.lotStatusId %>"
+                                      <%= (lot.lotStatusId === lotStatus.lotStatusId ? " selected" : "") %>>
+                                      <%= lotStatus.lotStatus %>
+                                  </option>
+                              <% } %>
+                              <% if (lot.lotStatusId && !statusIsFound) { %>
+                                  <option value="<%= lot.lotStatusId %>" selected>
+                                      <%= lot.lotStatus %>
+                                  </option>
+                              <% } %>
+                          </select>
+                      </div>
+                  </div>
+              </div>
+          </div>
+          <div class="column">
+              <div id="container--lotFields">
+                  <% if (isCreate) { %>
+                      <div class="message is-info">
+                          <p class="message-body">
+                              Select the <%= configFunctions.getProperty("aliases.lot").toLowerCase() %> type to load the available fields.
+                          </p>
+                      </div>
+                  <% } else if (lot.lotFields.length === 0) { %>
+                      <div class="message is-info">
+                          <p class="message-body">
+                              The current <%= configFunctions.getProperty("aliases.lot").toLowerCase() %> type has no additional fields.
+                          </p>
+                      </div>
+                  <% } else { %>
+                      <% let lotTypeFieldIds = ""; %>
+                      <% for (const lotField of lot.lotFields) { %>
+                          <% lotTypeFieldIds += "," + lotField.lotTypeFieldId; %>
+                          <div class="field">
+                              <label class="label" for="lot--lotFieldValue_<%= lotField.lotTypeFieldId %>">
+                                  <%= lotField.lotTypeField %>
+                              </label>
+                              <div class="control">
+                                  <% if (!lotField.lotTypeFieldValues || lotField.lotTypeFieldValues === "") { %>
+                                      <input class="input"
+                                          id="lot--lotFieldValue_<%= lotField.lotTypeFieldId %>"
+                                          name="lotFieldValue_<%= lotField.lotTypeFieldId %>"
+                                          type="text"
+                                          value="<%= lotField.lotFieldValue %>"
+                                          <% if (lotField.pattern !== "") { %>
+                                              pattern="<%= lotField.pattern %>"
+                                          <% } %>
+                                          minlength="<%= lotField.minimumLength %>"
+                                          maxlength="<%= lotField.maximumLength %>"
+                                          <%= lotField.isRequired ? " required" : "" %> />
+                                  <% } else { %>
+                                      <%
+                                          const fieldValues = lotField.lotTypeFieldValues.split("\n");
+                                          let valueFound = false;
+                                      %>
+                                      <div class="select is-fullwidth">
+                                          <select id="lot--lotFieldValue_<%= lotField.lotTypeFieldId %>"
+                                              name="lotFieldValue_<%= lotField.lotTypeFieldId %>">
+                                              <% if (!lotField.isRequired || lotField.lotFieldValue === "") { %>
+                                                  <option value="">(Not Set)</option>
+                                              <% } %>
+                                              <% for (const fieldValue of fieldValues) { %>
+                                                  <% 
+                                                      if (fieldValue === lotField.lotFieldValue) {
+                                                          valueFound = true;
+                                                      }
+                                                  %>
+                                                  <option value="<%= fieldValue %>"
+                                                      <%= (fieldValue === lotField.lotFieldValue ? " selected" : "") %>>
+                                                      <%= fieldValue %>
+                                                  </option>
+                                              <% } %>
+                                              <% if (!valueFound && lotField.lotFieldValue !== "") { %>
+                                                  <option value="<%= lotField.lotFieldValue %>" selected>
+                                                      <%= lotField.lotFieldValue %>
+                                                  </option>
+                                              <% } %>
+                                          </select>
+                                      </div>
+                                  <% } %>
+                              </div>
+                          </div>
+                      <% } %>
+                      <input id="lot--lotTypeFieldIds" name="lotTypeFieldIds" type="hidden" value="<%= lotTypeFieldIds.slice(1) %>" />
+                  <% } %>
+              </div>
+          </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="columns">
+    <div class="column">
+        <div class="panel">
+            <h2 class="panel-heading">Geographic Location</h2>
+            <div class="panel-block is-block">
+                <div class="field">
+                    <label class="label" for="lot--lotLatitude">Latitude</label>
+                    <div class="control">
+                        <input class="input" id="lot--lotLatitude" name="lotLatitude" type="number" min="-90" max="90" step="0.00000001" value="<%= lot.lotLatitude %>" onwheel="return false" />
                     </div>
                 </div>
-                <div class="column">
-                    <label class="label" for="lot--lotTypeId">
-                        <%= configFunctions.getProperty("aliases.lot") %> Type
-                    </label>
-                    <div class="field has-addons">
-                        <div class="control is-expanded">
-                            <div class="select is-fullwidth">
-                                <select 
-                                    <% if (!isCreate) { %>
-                                        class="is-readonly" 
-                                    <% } %>
-                                    id="lot--lotTypeId" name="lotTypeId" required>
-                                    <% if (isCreate) { %>
-                                        <option value="">(No Type)</option>
-                                    <% } %>
-                                    <% let typeIsFound = false; %>
-                                    <% for (const lotType of lotTypes) { %>
-                                        <% 
-                                            if (lot.lotTypeId === lotType.lotTypeId) {
-                                                typeIsFound = true;
-                                            }
-                                        %>
-                                        <option value="<%= lotType.lotTypeId %>"
-                                            <%= (lot.lotTypeId === lotType.lotTypeId ? " selected" : "") %>
-                                            <%= (!isCreate && lot.lotTypeId !== lotType.lotTypeId ? " disabled" : "") %>>
-                                            <%= lotType.lotType %>
-                                        </option>
-                                    <% } %>
-                                    <% if (lot.lotTypeId && !typeIsFound) { %>
-                                        <option value="<%= lot.lotTypeId %>" selected>
-                                            <%= lot.lotType %>
-                                        </option>
-                                    <% } %>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="control">
-                            <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock Field">
-                                <i class="fas fa-unlock" aria-hidden="true"></i>
-                            </button>
-                        </div>
-                    </div>
-                    <label class="label" for="lot--lotStatusId">
-                        <%= configFunctions.getProperty("aliases.lot") %> Status
-                    </label>
-                    <div class="field">
-                        <div class="control">
-                            <div class="select is-fullwidth">
-                                <select id="lot--lotStatusId" name="lotStatusId">
-                                    <option value="">(No Status)</option>
-                                    <% let statusIsFound = false; %>
-                                    <% for (const lotStatus of lotStatuses) { %>
-                                        <% 
-                                            if (lot.lotStatusId === lotStatus.lotStatusId) {
-                                                statusIsFound = true;
-                                            }
-                                        %>
-                                        <option value="<%= lotStatus.lotStatusId %>"
-                                            <%= (lot.lotStatusId === lotStatus.lotStatusId ? " selected" : "") %>>
-                                            <%= lotStatus.lotStatus %>
-                                        </option>
-                                    <% } %>
-                                    <% if (lot.lotStatusId && !statusIsFound) { %>
-                                        <option value="<%= lot.lotStatusId %>" selected>
-                                            <%= lot.lotStatus %>
-                                        </option>
-                                    <% } %>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="column">
-                    <div id="container--lotFields">
-                        <% if (isCreate) { %>
-                            <div class="message is-info">
-                                <p class="message-body">
-                                    Select the <%= configFunctions.getProperty("aliases.lot").toLowerCase() %> type to load the available fields.
-                                </p>
-                            </div>
-                        <% } else if (lot.lotFields.length === 0) { %>
-                            <div class="message is-info">
-                                <p class="message-body">
-                                    The current <%= configFunctions.getProperty("aliases.lot").toLowerCase() %> type has no additional fields.
-                                </p>
-                            </div>
-                        <% } else { %>
-                            <% let lotTypeFieldIds = ""; %>
-                            <% for (const lotField of lot.lotFields) { %>
-                                <% lotTypeFieldIds += "," + lotField.lotTypeFieldId; %>
-                                <div class="field">
-                                    <label class="label" for="lot--lotFieldValue_<%= lotField.lotTypeFieldId %>">
-                                        <%= lotField.lotTypeField %>
-                                    </label>
-                                    <div class="control">
-                                        <% if (!lotField.lotTypeFieldValues || lotField.lotTypeFieldValues === "") { %>
-                                            <input class="input"
-                                                id="lot--lotFieldValue_<%= lotField.lotTypeFieldId %>"
-                                                name="lotFieldValue_<%= lotField.lotTypeFieldId %>"
-                                                type="text"
-                                                value="<%= lotField.lotFieldValue %>"
-                                                <% if (lotField.pattern !== "") { %>
-                                                    pattern="<%= lotField.pattern %>"
-                                                <% } %>
-                                                minlength="<%= lotField.minimumLength %>"
-                                                maxlength="<%= lotField.maximumLength %>"
-                                                <%= lotField.isRequired ? " required" : "" %> />
-                                        <% } else { %>
-                                            <%
-                                                const fieldValues = lotField.lotTypeFieldValues.split("\n");
-                                                let valueFound = false;
-                                            %>
-                                            <div class="select is-fullwidth">
-                                                <select id="lot--lotFieldValue_<%= lotField.lotTypeFieldId %>"
-                                                    name="lotFieldValue_<%= lotField.lotTypeFieldId %>">
-                                                    <% if (!lotField.isRequired || lotField.lotFieldValue === "") { %>
-                                                        <option value="">(Not Set)</option>
-                                                    <% } %>
-                                                    <% for (const fieldValue of fieldValues) { %>
-                                                        <% 
-                                                            if (fieldValue === lotField.lotFieldValue) {
-                                                                valueFound = true;
-                                                            }
-                                                        %>
-                                                        <option value="<%= fieldValue %>"
-                                                            <%= (fieldValue === lotField.lotFieldValue ? " selected" : "") %>>
-                                                            <%= fieldValue %>
-                                                        </option>
-                                                    <% } %>
-                                                    <% if (!valueFound && lotField.lotFieldValue !== "") { %>
-                                                        <option value="<%= lotField.lotFieldValue %>" selected>
-                                                            <%= lotField.lotFieldValue %>
-                                                        </option>
-                                                    <% } %>
-                                                </select>
-                                            </div>
-                                        <% } %>
-                                    </div>
-                                </div>
-                            <% } %>
-                            <input id="lot--lotTypeFieldIds" name="lotTypeFieldIds" type="hidden" value="<%= lotTypeFieldIds.slice(1) %>" />
-                        <% } %>
+                <div class="field">
+                    <label class="label" for="lot--lotLongitude">Longitude</label>
+                    <div class="control">
+                        <input class="input" id="lot--lotLongitude" name="lotLongitude" type="number" min="-180" max="180" step="0.00000001" value="<%= lot.lotLongitude %>" onwheel="return false" />
                     </div>
                 </div>
             </div>
         </div>
     </div>
-
-    <div class="columns">
-      <div class="column">
-          <div class="panel">
-              <h2 class="panel-heading">Geographic Location</h2>
-              <div class="panel-block is-block">
-                  <div class="field">
-                      <label class="label" for="lot--lotLatitude">Latitude</label>
-                      <div class="control">
-                          <input class="input" id="lot--lotLatitude" name="lotLatitude" type="number" min="-90" max="90" step="0.00000001" value="<%= lot.lotLatitude %>" onwheel="return false" />
-                      </div>
-                  </div>
-                  <div class="field">
-                      <label class="label" for="lot--lotLongitude">Longitude</label>
-                      <div class="control">
-                          <input class="input" id="lot--lotLongitude" name="lotLongitude" type="number" min="-180" max="180" step="0.00000001" value="<%= lot.lotLongitude %>" onwheel="return false" />
-                      </div>
-                  </div>
-              </div>
-          </div>
-      </div>
-      <div class="column">
-          <div class="panel">
-              <h2 class="panel-heading">Image</h2>
-              <div class="panel-block is-block">
-                  <label class="label" for="lot--mapId"><%= configFunctions.getProperty("aliases.map") %></label>
-                  <div class="field has-addons">
-                      <div class="control is-expanded">
-                          <div class="select is-fullwidth">
-                              <select
-                                  <% if (!isCreate) { %>
-                                      class="is-readonly"
-                                  <% } %>
-                                  id="lot--mapId" name="mapId">
-                                  <option value="" <%= (!isCreate && lot.mapId ? " disabled" : "") %>>
-                                      (No <%= configFunctions.getProperty("aliases.map") %> Selected)
-                                  </option>
-                                  <% let mapIsFound = false; %>
-                                  <% for (const map of maps) { %>
-                                      <%
-                                          if (lot.mapId === map.mapId) {
-                                              mapIsFound = true;
-                                          }
-                                      %>
-                                      <option value="<%= map.mapId %>"
-                                          <%= (lot.mapId === map.mapId ? " selected" : "") %>
-                                          <%= (!isCreate && lot.mapId !== map.mapId ? " disabled" : "") %>>
-                                          <%= map.mapName || "(No Name)"  %>
-                                      </option>
-                                  <% } %>
-                                  <% if (lot.mapId && !mapIsFound) { %>
-                                      <option value="<%= lot.mapId %>" selected>
-                                          <%= lot.mapName %>
-                                      </option>
-                                  <% } %>
-                              </select>
-                          </div>
-                      </div>
-                      <div class="control">
-                          <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock Field">
-                              <i class="fas fa-unlock" aria-hidden="true"></i>
-                          </button>
-                      </div>
-                  </div>
-          
-                  <div class="field">
-                      <label class="label" for="lot--mapKey">
-                          <%= configFunctions.getProperty("aliases.map") %> SVG ID
-                      </label>
-                      <div class="control">
-                          <input class="input" id="lot--mapKey" name="mapKey" value="<%= lot.mapKey %>" maxlength="100" pattern="^[\d\w-]*$" />
-                      </div>
-                      <p class="help">
-                          <a href="https://cityssm.github.io/lot-occupancy-system/docs/mapImages.html" target="_blank" rel="noreferrer">
-                              <i class="fa fa-question-circle" aria-hidden="true"></i>
-                              What is the SVG ID?
-                          </a>
-                      </p>
-                  </div>
-              </div>
-          </div>
-      </div>
+    <div class="column">
+        <div class="panel">
+            <h2 class="panel-heading">Image</h2>
+            <div class="panel-block is-block">
+                <label class="label" for="lot--mapId"><%= configFunctions.getProperty("aliases.map") %></label>
+                <div class="field has-addons">
+                    <div class="control is-expanded">
+                        <div class="select is-fullwidth">
+                            <select
+                                <% if (!isCreate) { %>
+                                    class="is-readonly"
+                                <% } %>
+                                id="lot--mapId" name="mapId">
+                                <option value="" <%= (!isCreate && lot.mapId ? " disabled" : "") %>>
+                                    (No <%= configFunctions.getProperty("aliases.map") %> Selected)
+                                </option>
+                                <% let mapIsFound = false; %>
+                                <% for (const map of maps) { %>
+                                    <%
+                                        if (lot.mapId === map.mapId) {
+                                            mapIsFound = true;
+                                        }
+                                    %>
+                                    <option value="<%= map.mapId %>"
+                                        <%= (lot.mapId === map.mapId ? " selected" : "") %>
+                                        <%= (!isCreate && lot.mapId !== map.mapId ? " disabled" : "") %>>
+                                        <%= map.mapName || "(No Name)"  %>
+                                    </option>
+                                <% } %>
+                                <% if (lot.mapId && !mapIsFound) { %>
+                                    <option value="<%= lot.mapId %>" selected>
+                                        <%= lot.mapName %>
+                                    </option>
+                                <% } %>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="control">
+                        <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock Field">
+                            <i class="fas fa-unlock" aria-hidden="true"></i>
+                        </button>
+                    </div>
+                </div>
+        
+                <div class="field">
+                    <label class="label" for="lot--mapKey">
+                        <%= configFunctions.getProperty("aliases.map") %> SVG ID
+                    </label>
+                    <div class="control">
+                        <input class="input" id="lot--mapKey" name="mapKey" value="<%= lot.mapKey %>" maxlength="100" pattern="^[\d\w-]*$" />
+                    </div>
+                    <p class="help">
+                        <a href="https://cityssm.github.io/lot-occupancy-system/docs/mapImages.html" target="_blank" rel="noreferrer">
+                            <i class="fa fa-question-circle" aria-hidden="true"></i>
+                            What is the SVG ID?
+                        </a>
+                    </p>
+                </div>
+            </div>
+        </div>
     </div>
-
-
+  </div>
 </form>
 
 <% if (isCreate) { %>
@@ -350,26 +348,26 @@
   </div>
 <% } else { %>
     <div class="panel">
-        <div class="panel-heading">
-            <div class="level is-mobile">
-                <div class="level-left">
-                    <div class="level-item">
-                        <h2 class="has-text-weight-bold is-size-5">
-                            Comments
-                        </h2>
-                    </div>
-                </div>
-                <div class="level-right">
-                    <div class="level-item">
-                        <button class="button is-small is-success" id="lotComments--add" type="button">
-                            <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
-                            <span>Add a Comment</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="panel-block is-block" id="container--lotComments"></div>
+      <div class="panel-heading">
+          <div class="level is-mobile">
+              <div class="level-left">
+                  <div class="level-item">
+                      <h2 class="has-text-weight-bold is-size-5">
+                          Comments
+                      </h2>
+                  </div>
+              </div>
+              <div class="level-right">
+                  <div class="level-item">
+                      <button class="button is-small is-success" id="lotComments--add" type="button">
+                          <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
+                          <span>Add a Comment</span>
+                      </button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <div class="panel-block is-block" id="container--lotComments"></div>
     </div>
     
     <div class="panel">
@@ -395,44 +393,50 @@
         </div>
         <div class="panel-block is-block">
             <% if (lot.lotOccupancies.length === 0) { %>
-            <div class="message is-info">
-                <p class="message-body">There are no <%= configFunctions.getProperty("aliases.occupancy").toLowerCase() %> records asscociated with this <%= configFunctions.getProperty("aliases.lot") %>.</p>
-            </div>
+              <div class="message is-info">
+                <p class="message-body">
+                  There are no <%= configFunctions.getProperty("aliases.occupancy").toLowerCase() %> records
+                  asscociated with this <%= configFunctions.getProperty("aliases.lot") %>.
+                </p>
+              </div>
             <% } else { %>
-            <table class="table is-fullwidth is-striped is-hoverable">
+              <table class="table is-fullwidth is-striped is-hoverable">
                 <thead>
-                <tr>
+                  <tr>
                     <th class="has-width-10">&nbsp;</th>
                     <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
                     <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
                     <th>End Date</th>
                     <th><%= configFunctions.getProperty("aliases.occupants") %></th>
-                </tr>
+                  </tr>
                 </thead>
                 <tbody>
-                <% const currentDate = dateTimeFunctions.dateToInteger(new Date()); %>
-                <% for (const lotOccupancy of lot.lotOccupancies) { %>
+                  <% const currentDate = dateTimeFunctions.dateToInteger(new Date()); %>
+                  <% for (const lotOccupancy of lot.lotOccupancies) { %>
                     <% const isActive = !(lotOccupancy.occupancyEndDate && lotOccupancy.occupancyEndDate < currentDate); %>
                     <tr>
                         <td class="has-text-centered">
-                            <% if (isActive) { %>
-                                <i class="fas fa-play" title="Current <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
-                            <% } else { %>
-                                <i class="fas fa-stop" title="Previous <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
-                            <% } %>
+                          <% if (isActive) { %>
+                            <i class="fas fa-play" title="Current <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
+                          <% } else { %>
+                            <i class="fas fa-stop" title="Previous <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
+                          <% } %>
                         </td>
                         <td>
-                            <a class="has-text-weight-bold" href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>">
-                                <%= lotOccupancy.occupancyType %>
-                            </a>
+                          <a class="has-text-weight-bold" href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>">
+                            <%= lotOccupancy.occupancyType %>
+                          </a><br />
+                          <span class="is-size-7">
+                            #<%= lotOccupancy.lotOccupancyId %>
+                          </span>
                         </td>
                         <td><%= lotOccupancy.occupancyStartDateString %></td>
                         <td>
-                            <% if (lotOccupancy.occupancyEndDate) { %>
+                          <% if (lotOccupancy.occupancyEndDate) { %>
                             <%= lotOccupancy.occupancyEndDateString %>
-                            <% } else { %>
-                                <span class="has-text-grey">(No End Date)</span>
-                            <% } %>
+                          <% } else { %>
+                            <span class="has-text-grey">(No End Date)</span>
+                          <% } %>
                         </td>
                         <td>
                           <% if (lotOccupancy.lotOccupancyOccupants.length === 0) { %>
@@ -447,9 +451,9 @@
                           <% } %>
                         </td>
                     </tr>
-                <% } %>
+                  <% } %>
                 </tbody>
-            </table>
+              </table>
             <% } %>
         </div>
     </div>
diff --git a/views/lot-view.ejs b/views/lot-view.ejs
index b5955d90..49a3f761 100644
--- a/views/lot-view.ejs
+++ b/views/lot-view.ejs
@@ -30,29 +30,29 @@
   <div class="level-right">
     <div class="level-item">
       <a class="button is-link is-outlined has-tooltip-left"
-          data-tooltip="Previous <%= configFunctions.getProperty("aliases.lot") %>"
-          href="<%= urlPrefix %>/lots/<%= lot.lotId %>/previous"
-          accesskey=",">
-          <i class="fas fa-arrow-left" aria-hidden="true"></i>
-          <span class="sr-only">Previous <%= configFunctions.getProperty("aliases.lot") %></span>
+        data-tooltip="Previous <%= configFunctions.getProperty("aliases.lot") %>"
+        href="<%= urlPrefix %>/lots/<%= lot.lotId %>/previous"
+        accesskey=",">
+        <i class="fas fa-arrow-left" aria-hidden="true"></i>
+        <span class="sr-only">Previous <%= configFunctions.getProperty("aliases.lot") %></span>
       </a>
     </div>
     <div class="level-item">
       <a class="button is-link has-tooltip-left"
-          data-tooltip="Next <%= configFunctions.getProperty("aliases.lot") %>"
-          href="<%= urlPrefix %>/lots/<%= lot.lotId %>/next"
-          accesskey=".">
-          <span>Next</span>
-          <span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span>
+        data-tooltip="Next <%= configFunctions.getProperty("aliases.lot") %>"
+        href="<%= urlPrefix %>/lots/<%= lot.lotId %>/next"
+        accesskey=".">
+        <span>Next</span>
+        <span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span>
       </a>
     </div>
     <% if (user.userProperties.canUpdate) { %>
       <div class="level-item">
         <a class="button is-primary"
-            href="<%= urlPrefix %>/lots/<%= lot.lotId %>/edit"
-            accesskey="e">
-            <span class="icon"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span>
-            <span>Switch to Edit Mode</span>
+          href="<%= urlPrefix %>/lots/<%= lot.lotId %>/edit"
+          accesskey="e">
+          <span class="icon"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span>
+          <span>Switch to Edit Mode</span>
         </a>
       </div>
     <% } %>
@@ -60,155 +60,158 @@
 </div>
 
 <div class="columns">
+  <div class="column">
+      <div class="panel">
+          <div class="panel-block is-block">
+              <div class="columns">
+                  <div class="column">
+                      <p class="mb-2">
+                          <strong><%= configFunctions.getProperty("aliases.map") %></strong><br />
+                          <a href="<%= urlPrefix %>/maps/<%= lot.mapId %>">
+                              <%= lot.mapName || "(No Name)" %>
+                          </a>
+                      </p>
+                      <p class="mb-2">
+                          <strong><%= configFunctions.getProperty("aliases.lot") %> Type</strong><br />
+                          <%= lot.lotType %>
+                      </p>
+                      <p>
+                          <strong>Status</strong><br />
+                          <%= lot.lotStatus %>
+                      </p>
+                  </div>
+                  <% if (lot.lotFields.length > 0) { %>
+                      <div class="column">
+                          <% for (const lotField of lot.lotFields) { %>
+                              <p class="mb-2">
+                                  <strong><%= lotField.lotTypeField %></strong><br />
+                                  <% if (lotField.lotFieldValue) { %>
+                                      <%= lotField.lotFieldValue %>
+                                  <% } else { %>
+                                      <span class="has-text-grey">(No Value)</span>
+                                  <% } %>
+                              </p>
+                          <% } %>
+                      </div>
+                  <% } %>
+              </div>
+          </div>
+      </div>
+  </div>
+  <% if (lot.mapSVG) { %>
     <div class="column">
-        <div class="panel">
-            <div class="panel-block is-block">
-                <div class="columns">
-                    <div class="column">
-                        <p class="mb-2">
-                            <strong><%= configFunctions.getProperty("aliases.map") %></strong><br />
-                            <a href="<%= urlPrefix %>/maps/<%= lot.mapId %>">
-                                <%= lot.mapName || "(No Name)" %>
-                            </a>
-                        </p>
-                        <p class="mb-2">
-                            <strong><%= configFunctions.getProperty("aliases.lot") %> Type</strong><br />
-                            <%= lot.lotType %>
-                        </p>
-                        <p>
-                            <strong>Status</strong><br />
-                            <%= lot.lotStatus %>
-                        </p>
-                    </div>
-                    <% if (lot.lotFields.length > 0) { %>
-                        <div class="column">
-                            <% for (const lotField of lot.lotFields) { %>
-                                <p class="mb-2">
-                                    <strong><%= lotField.lotTypeField %></strong><br />
-                                    <% if (lotField.lotFieldValue) { %>
-                                        <%= lotField.lotFieldValue %>
-                                    <% } else { %>
-                                        <span class="has-text-grey">(No Value)</span>
-                                    <% } %>
-                                </p>
-                            <% } %>
-                        </div>
-                    <% } %>
-                </div>
-            </div>
-        </div>
+      <div class="panel">
+        <h2 class="panel-heading">Image</h2>
+        <div class="panel-block is-block">
+          <% const imageURL = urlPrefix + "/images/maps/" + lot.mapSVG %>
+          <div class="image" id="lot--map" data-map-key="<%= lot.mapKey %>">
+            <%- include('../public/images/maps/' + lot.mapSVG); -%>
+          </div>
+      </div>
+      </div>
     </div>
-    <% if (lot.mapSVG) { %>
-        <div class="column">
-            <div class="panel">
-                <h2 class="panel-heading">Image</h2>
-                <div class="panel-block is-block">
-                    <% const imageURL = urlPrefix + "/images/maps/" + lot.mapSVG %>
-                    <div class="image" id="lot--map" data-map-key="<%= lot.mapKey %>">
-                        <%- include('../public/images/maps/' + lot.mapSVG); -%>
-                    </div>
-                </div>
-            </div>
-        </div>
-    <% } %>
+  <% } %>
 </div>
 
 
 <% if (lot.lotComments.length > 0) { %>
-    <div class="panel">
-        <h2 class="panel-heading">Comments</h2>
-        <div class="panel-block is-block">
-            <table class="table is-fullwidth is-striped is-hoverable">
-                <thead>
-                    <tr>
-                        <th>Commentor</th>
-                        <th>Comment Date</th>
-                        <th>Comment</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <% for (const lotComment of lot.lotComments) { %>
-                        <tr>
-                            <td><%= lotComment.recordCreate_userName %></td>
-                            <td>
-                                <%= lotComment.lotCommentDateString %>
-                                <%= (lotComment.lotCommentTime === 0 ? "" : lotComment.lotCommentTimeString) %>
-                            </td>
-                            <td><%= lotComment.lotComment %></td>
-                        </tr>
-                    <% } %>
-                </tbody>
-            </table>
-        </div>
-    </div>
+  <div class="panel">
+      <h2 class="panel-heading">Comments</h2>
+      <div class="panel-block is-block">
+          <table class="table is-fullwidth is-striped is-hoverable">
+              <thead>
+                  <tr>
+                      <th>Commentor</th>
+                      <th>Comment Date</th>
+                      <th>Comment</th>
+                  </tr>
+              </thead>
+              <tbody>
+                  <% for (const lotComment of lot.lotComments) { %>
+                      <tr>
+                          <td><%= lotComment.recordCreate_userName %></td>
+                          <td>
+                              <%= lotComment.lotCommentDateString %>
+                              <%= (lotComment.lotCommentTime === 0 ? "" : lotComment.lotCommentTimeString) %>
+                          </td>
+                          <td><%= lotComment.lotComment %></td>
+                      </tr>
+                  <% } %>
+              </tbody>
+          </table>
+      </div>
+  </div>
 <% } %>
 
 <div class="panel">
-    <h2 class="panel-heading">
-        <%= configFunctions.getProperty("aliases.occupancies") %>
-        <span class="tag"><%= lot.lotOccupancies.length %></span>
-    </h2>
-    <div class="panel-block is-block">
-        <% if (lot.lotOccupancies.length === 0) { %>
-            <div class="message is-info">
-                <p class="message-body">There are no occupancy records asscociated with this
-                    <%= configFunctions.getProperty("aliases.lot") %>.</p>
-            </div>
-        <% } else { %>
-            <table class="table is-fullwidth is-striped is-hoverable">
-                <thead>
-                    <tr>
-                        <th class="has-width-10">&nbsp;</th>
-                        <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
-                        <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
-                        <th>End Date</th>
-                        <th><%= configFunctions.getProperty("aliases.occupants") %></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <% const currentDate = dateTimeFunctions.dateToInteger(new Date()); %>
-                    <% for (const lotOccupancy of lot.lotOccupancies) { %>
-                    <% const isActive = !(lotOccupancy.occupancyEndDate && lotOccupancy.occupancyEndDate < currentDate); %>
-                    <tr>
-                        <td class="has-text-centered">
-                            <% if (isActive) { %>
-                            <i class="fas fa-play" title="Current <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
-                            <% } else { %>
-                            <i class="fas fa-stop" title="Previous <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
-                            <% } %>
-                        </td>
-                        <td>
-                            <a class="has-text-weight-bold"
-                                href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>">
-                                <%= lotOccupancy.occupancyType %>
-                            </a>
-                        </td>
-                        <td><%= lotOccupancy.occupancyStartDateString %></td>
-                        <td>
-                            <% if (lotOccupancy.occupancyEndDate) { %>
-                                <%= lotOccupancy.occupancyEndDateString %>
-                            <% } else { %>
-                                <span class="has-text-grey">(No End Date)</span>
-                            <% } %>
-                        </td>
-                        <td>
-                            <% if (lotOccupancy.lotOccupancyOccupants.length === 0) { %>
-                                <span class="has-text-grey">(No <%= configFunctions.getProperty("aliases.occupants") %>)</span>
-                            <% } else { %>
-                                <% for (const occupant of lotOccupancy.lotOccupancyOccupants) { %>
-                                    <span class="has-tooltip-left" data-tooltip="<%= occupant.lotOccupantType %>">
-                                        <i class="fas fa-fw fa-<%= occupant.fontAwesomeIconClass || 'user' %>" aria-hidden="true"></i>
-                                        <%= occupant.occupantName + ' ' + occupant.occupantFamilyName %>
-                                    </span><br />
-                                <% } %>
-                            <% } %>
-                        </td>
-                    </tr>
-                    <% } %>
-                </tbody>
-            </table>
-        <% } %>
-    </div>
+  <h2 class="panel-heading">
+    <%= configFunctions.getProperty("aliases.occupancies") %>
+    <span class="tag"><%= lot.lotOccupancies.length %></span>
+  </h2>
+  <div class="panel-block is-block">
+      <% if (lot.lotOccupancies.length === 0) { %>
+        <div class="message is-info">
+          <p class="message-body">
+            There are no occupancy records asscociated with this
+            <%= configFunctions.getProperty("aliases.lot") %>.
+          </p>
+        </div>
+      <% } else { %>
+          <table class="table is-fullwidth is-striped is-hoverable">
+              <thead>
+                <tr>
+                  <th class="has-width-10">&nbsp;</th>
+                  <th><%= configFunctions.getProperty("aliases.occupancy") %> Type</th>
+                  <th><%= configFunctions.getProperty("aliases.occupancyStartDate") %></th>
+                  <th>End Date</th>
+                  <th><%= configFunctions.getProperty("aliases.occupants") %></th>
+                </tr>
+              </thead>
+              <tbody>
+                <% const currentDate = dateTimeFunctions.dateToInteger(new Date()); %>
+                <% for (const lotOccupancy of lot.lotOccupancies) { %>
+                  <% const isActive = !(lotOccupancy.occupancyEndDate && lotOccupancy.occupancyEndDate < currentDate); %>
+                  <tr>
+                      <td class="has-text-centered">
+                        <% if (isActive) { %>
+                          <i class="fas fa-play" title="Current <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
+                        <% } else { %>
+                          <i class="fas fa-stop" title="Previous <%= configFunctions.getProperty("aliases.occupancy") %>"></i>
+                        <% } %>
+                      </td>
+                      <td>
+                        <a class="has-text-weight-bold"
+                          href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>">
+                          <%= lotOccupancy.occupancyType %>
+                        </a><br />
+                        <span class="is-size-7">#<%= lotOccupancy.lotOccupancyId %></span>
+                      </td>
+                      <td><%= lotOccupancy.occupancyStartDateString %></td>
+                      <td>
+                          <% if (lotOccupancy.occupancyEndDate) { %>
+                              <%= lotOccupancy.occupancyEndDateString %>
+                          <% } else { %>
+                              <span class="has-text-grey">(No End Date)</span>
+                          <% } %>
+                      </td>
+                      <td>
+                        <% if (lotOccupancy.lotOccupancyOccupants.length === 0) { %>
+                          <span class="has-text-grey">(No <%= configFunctions.getProperty("aliases.occupants") %>)</span>
+                        <% } else { %>
+                          <% for (const occupant of lotOccupancy.lotOccupancyOccupants) { %>
+                            <span class="has-tooltip-left" data-tooltip="<%= occupant.lotOccupantType %>">
+                              <i class="fas fa-fw fa-<%= occupant.fontAwesomeIconClass || 'user' %>" aria-hidden="true"></i>
+                              <%= occupant.occupantName + ' ' + occupant.occupantFamilyName %>
+                            </span><br />
+                          <% } %>
+                        <% } %>
+                      </td>
+                  </tr>
+                <% } %>
+              </tbody>
+          </table>
+      <% } %>
+  </div>
 </div>
 
 <%- include('_footerA'); -%>
diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs
index aabfc8b5..dcd8a244 100644
--- a/views/workOrder-view.ejs
+++ b/views/workOrder-view.ejs
@@ -89,34 +89,36 @@
     <div class="panel">
       <div class="panel-block is-block">
           <div class="columns">
-              <div class="column">
-                  <p class="mb-2">
-                      <strong>Work Order Type</strong><br />
-                      <%= workOrder.workOrderType %>
-                  </p>
-                  <p>
-                      <strong>Description</strong><br />
-                      <% if (workOrder.workOrderDescription) { %>
-                          <%= workOrder.workOrderDescription %>
-                      <% } else { %>
-                          <span class="has-text-grey">(No Description)</span>
-                      <% } %>
-                  </p>
-              </div>
-              <div class="column">
-                  <p class="mb-2">
-                      <strong><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></strong><br />
-                      <%= workOrder.workOrderOpenDateString %>
-                  </p>
-                  <p>
-                      <strong><%= configFunctions.getProperty("aliases.workOrderCloseDate") %></strong><br />
-                      <% if (workOrder.workOrderCloseDate) { %>
-                          <%= workOrder.workOrderCloseDateString %>
-                      <% } else { %>
-                          <span class="has-text-grey">(No <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>)</span>
-                      <% } %>
-                  </p>
-              </div>
+            <div class="column">
+              <p class="mb-2">
+                <strong>Work Order Type</strong><br />
+                <%= workOrder.workOrderType %>
+              </p>
+              <p>
+                <strong>Description</strong><br />
+                <% if (workOrder.workOrderDescription) { %>
+                  <%= workOrder.workOrderDescription %>
+                <% } else { %>
+                  <span class="has-text-grey">(No Description)</span>
+                <% } %>
+              </p>
+            </div>
+            <div class="column">
+              <p class="mb-2">
+                <strong><%= configFunctions.getProperty("aliases.workOrderOpenDate") %></strong><br />
+                <%= workOrder.workOrderOpenDateString %>
+              </p>
+              <p>
+                <strong><%= configFunctions.getProperty("aliases.workOrderCloseDate") %></strong><br />
+                <% if (workOrder.workOrderCloseDate) { %>
+                  <%= workOrder.workOrderCloseDateString %>
+                <% } else { %>
+                  <span class="has-text-grey">
+                    (No <%= configFunctions.getProperty("aliases.workOrderCloseDate") %>)
+                  </span>
+                <% } %>
+              </p>
+            </div>
           </div>
       </div>
     </div>
@@ -129,18 +131,18 @@
           %>
           <div class="tabs is-boxed">
             <ul>
-                <li class="<%= (tabToSelect === "lotOccupancies" ? "is-active" : "") %>">
-                    <a href="#relatedTab--lotOccupancies">
-                        <span><%= configFunctions.getProperty("aliases.occupancies") %></span>
-                        <span class="ml-2 tag"><%= workOrder.workOrderLotOccupancies.length %></span>
-                    </a>
-                </li>
-                <li class="<%= (tabToSelect === "lots" ? "is-active" : "") %>">
-                    <a href="#relatedTab--lots">
-                        <span><%= configFunctions.getProperty("aliases.lots") %></span>
-                        <span class="ml-2 tag"><%= workOrder.workOrderLots.length %></span>
-                    </a>
-                </li>
+              <li class="<%= (tabToSelect === "lotOccupancies" ? "is-active" : "") %>">
+                <a href="#relatedTab--lotOccupancies">
+                  <span><%= configFunctions.getProperty("aliases.occupancies") %></span>
+                  <span class="ml-2 tag"><%= workOrder.workOrderLotOccupancies.length %></span>
+                </a>
+              </li>
+              <li class="<%= (tabToSelect === "lots" ? "is-active" : "") %>">
+                <a href="#relatedTab--lots">
+                  <span><%= configFunctions.getProperty("aliases.lots") %></span>
+                  <span class="ml-2 tag"><%= workOrder.workOrderLots.length %></span>
+                </a>
+              </li>
             </ul>
           </div>
           <div class="tab-container">
@@ -179,10 +181,13 @@
                                         <% } %>
                                       </td>
                                       <td>
-                                          <a class="has-text-weight-bold"
-                                              href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>">
-                                              <%= lotOccupancy.occupancyType %>
-                                          </a>
+                                        <a class="has-text-weight-bold"
+                                          href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>">
+                                          <%= lotOccupancy.occupancyType %>
+                                        </a><br />
+                                        <span class="is-size-7">
+                                          #<%= lotOccupancy.lotOccupancyId %>
+                                        </span>
                                       </td>
                                       <td>
                                           <% if (lotOccupancy.lotId) { %>