diff --git a/helpers/initializer.database.js b/helpers/initializer.database.js
index f5a895ff..8202b2b1 100644
--- a/helpers/initializer.database.js
+++ b/helpers/initializer.database.js
@@ -187,6 +187,7 @@ export const initializeDatabase = () => {
             " occupantProvince varchar(2)," +
             " occupantPostalCode varchar(7)," +
             " occupantPhoneNumber varchar(30)," +
+            " occupantEmailAddress varchar(200)," +
             " lotOccupantTypeId integer not null," +
             recordColumns +
             "," +
diff --git a/helpers/initializer.database.ts b/helpers/initializer.database.ts
index 15f65ce7..3bec06f0 100644
--- a/helpers/initializer.database.ts
+++ b/helpers/initializer.database.ts
@@ -254,6 +254,7 @@ export const initializeDatabase = (): boolean => {
                     " occupantProvince varchar(2)," +
                     " occupantPostalCode varchar(7)," +
                     " occupantPhoneNumber varchar(30)," +
+                    " occupantEmailAddress varchar(200)," +
                     " lotOccupantTypeId integer not null," +
                     recordColumns +
                     "," +
diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts
index 8bb6941c..1c2f1449 100644
--- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts
+++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts
@@ -9,6 +9,7 @@ interface AddLotOccupancyOccupantForm {
     occupantProvince: string;
     occupantPostalCode: string;
     occupantPhoneNumber: string;
+    occupantEmailAddress: string;
 }
 export declare const addLotOccupancyOccupant: (lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession) => number;
 export default addLotOccupancyOccupant;
diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.js b/helpers/lotOccupancyDB/addLotOccupancyOccupant.js
index 1cdb21e9..8fe9bb92 100644
--- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.js
+++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.js
@@ -20,12 +20,12 @@ export const addLotOccupancyOccupant = (lotOccupancyOccupantForm, requestSession
         " occupantName," +
         " occupantAddress1, occupantAddress2," +
         " occupantCity, occupantProvince, occupantPostalCode," +
-        " occupantPhoneNumber," +
+        " occupantPhoneNumber, occupantEmailAddress," +
         " lotOccupantTypeId," +
         " recordCreate_userName, recordCreate_timeMillis," +
         " recordUpdate_userName, recordUpdate_timeMillis)" +
-        " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
-        .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+        .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     database.close();
     return lotOccupantIndex;
 };
diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
index d101c224..184b1306 100644
--- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
+++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
@@ -14,6 +14,7 @@ interface AddLotOccupancyOccupantForm {
     occupantProvince: string;
     occupantPostalCode: string;
     occupantPhoneNumber: string;
+    occupantEmailAddress: string;
 }
 
 export const addLotOccupancyOccupant = (
@@ -47,11 +48,11 @@ export const addLotOccupancyOccupant = (
                 " occupantName," +
                 " occupantAddress1, occupantAddress2," +
                 " occupantCity, occupantProvince, occupantPostalCode," +
-                " occupantPhoneNumber," +
+                " occupantPhoneNumber, occupantEmailAddress," +
                 " lotOccupantTypeId," +
                 " recordCreate_userName, recordCreate_timeMillis," +
                 " recordUpdate_userName, recordUpdate_timeMillis)" +
-                " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+                " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
         )
         .run(
             lotOccupancyOccupantForm.lotOccupancyId,
@@ -63,6 +64,7 @@ export const addLotOccupancyOccupant = (
             lotOccupancyOccupantForm.occupantProvince,
             lotOccupancyOccupantForm.occupantPostalCode,
             lotOccupancyOccupantForm.occupantPhoneNumber,
+            lotOccupancyOccupantForm.occupantEmailAddress,
             lotOccupancyOccupantForm.lotOccupantTypeId,
             requestSession.user.userName,
             rightNowMillis,
diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.js b/helpers/lotOccupancyDB/getLotOccupancyOccupants.js
index 015900c5..673f15a9 100644
--- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.js
+++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.js
@@ -8,7 +8,8 @@ export const getLotOccupancyOccupants = (lotOccupancyId, connectedDatabase) => {
     const lotOccupancyOccupants = database
         .prepare("select o.lotOccupancyId, o.lotOccupantIndex," +
         " o.occupantName, o.occupantAddress1, o.occupantAddress2," +
-        " o.occupantCity, o.occupantProvince, o.occupantPostalCode, o.occupantPhoneNumber," +
+        " o.occupantCity, o.occupantProvince, o.occupantPostalCode," +
+        " o.occupantPhoneNumber, o.occupantEmailAddress," +
         " o.lotOccupantTypeId, t.lotOccupantType" +
         " from LotOccupancyOccupants o" +
         " left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId" +
diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts b/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
index 1b440a98..3667af90 100644
--- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
+++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
@@ -18,7 +18,8 @@ export const getLotOccupancyOccupants = (
         .prepare(
             "select o.lotOccupancyId, o.lotOccupantIndex," +
                 " o.occupantName, o.occupantAddress1, o.occupantAddress2," +
-                " o.occupantCity, o.occupantProvince, o.occupantPostalCode, o.occupantPhoneNumber," +
+                " o.occupantCity, o.occupantProvince, o.occupantPostalCode," +
+                " o.occupantPhoneNumber, o.occupantEmailAddress," +
                 " o.lotOccupantTypeId, t.lotOccupantType" +
                 " from LotOccupancyOccupants o" +
                 " left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId" +
diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts
index 5a2476d5..c618d1b4 100644
--- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts
+++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts
@@ -10,6 +10,7 @@ interface UpdateLotOccupancyOccupantForm {
     occupantProvince: string;
     occupantPostalCode: string;
     occupantPhoneNumber: string;
+    occupantEmailAddress: string;
 }
 export declare const updateLotOccupancyOccupant: (lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession) => boolean;
 export default updateLotOccupancyOccupant;
diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
index 713e5ec9..8f613ce0 100644
--- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
+++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
@@ -12,13 +12,14 @@ export const updateLotOccupancyOccupant = (lotOccupancyOccupantForm, requestSess
         " occupantProvince = ?," +
         " occupantPostalCode = ?," +
         " occupantPhoneNumber = ?," +
+        " occupantEmailAddress = ?," +
         " lotOccupantTypeId = ?," +
         " recordUpdate_userName = ?," +
         " recordUpdate_timeMillis = ?" +
         " where recordDelete_timeMillis is null" +
         " and lotOccupancyId = ?" +
         " and lotOccupantIndex = ?")
-        .run(lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, lotOccupancyOccupantForm.lotOccupancyId, lotOccupancyOccupantForm.lotOccupantIndex);
+        .run(lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, lotOccupancyOccupantForm.lotOccupancyId, lotOccupancyOccupantForm.lotOccupantIndex);
     database.close();
     return results.changes > 0;
 };
diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
index 5d7aa0cb..c9eb9142 100644
--- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
+++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
@@ -15,6 +15,7 @@ interface UpdateLotOccupancyOccupantForm {
     occupantProvince: string;
     occupantPostalCode: string;
     occupantPhoneNumber: string;
+    occupantEmailAddress: string;
 }
 
 export const updateLotOccupancyOccupant = (
@@ -35,6 +36,7 @@ export const updateLotOccupancyOccupant = (
                 " occupantProvince = ?," +
                 " occupantPostalCode = ?," +
                 " occupantPhoneNumber = ?," +
+                " occupantEmailAddress = ?," +
                 " lotOccupantTypeId = ?," +
                 " recordUpdate_userName = ?," +
                 " recordUpdate_timeMillis = ?" +
@@ -50,6 +52,7 @@ export const updateLotOccupancyOccupant = (
             lotOccupancyOccupantForm.occupantProvince,
             lotOccupancyOccupantForm.occupantPostalCode,
             lotOccupancyOccupantForm.occupantPhoneNumber,
+            lotOccupancyOccupantForm.occupantEmailAddress,
             lotOccupancyOccupantForm.lotOccupantTypeId,
             requestSession.user.userName,
             rightNowMillis,
diff --git a/public-typescript/lotOccupancyEdit.js b/public-typescript/lotOccupancyEdit.js
index f1c0cd83..75ef739b 100644
--- a/public-typescript/lotOccupancyEdit.js
+++ b/public-typescript/lotOccupancyEdit.js
@@ -432,6 +432,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     modalElement.querySelector("#lotOccupancyOccupantEdit--occupantProvince").value = lotOccupancyOccupant.occupantProvince;
                     modalElement.querySelector("#lotOccupancyOccupantEdit--occupantPostalCode").value = lotOccupancyOccupant.occupantPostalCode;
                     modalElement.querySelector("#lotOccupancyOccupantEdit--occupantPhoneNumber").value = lotOccupancyOccupant.occupantPhoneNumber;
+                    modalElement.querySelector("#lotOccupancyOccupantEdit--occupantEmailAddress").value = lotOccupancyOccupant.occupantEmailAddress;
                 },
                 onshown: (modalElement, closeModalFunction) => {
                     bulmaJS.toggleHtmlClipped();
@@ -501,7 +502,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     exports.aliases.occupant +
                     "</th>" +
                     "<th>Address</th>" +
-                    "<th>Phone Number</th>" +
+                    "<th>Other Contact</th>" +
                     '<th class="is-hidden-print"><span class="is-sr-only">Options</span></th>' +
                     "</tr></thead>" +
                     "<tbody></tbody>";
@@ -515,8 +516,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         "</td>" +
                         ("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantName) + "</td>") +
                         ("<td>" +
-                            cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) +
-                            "<br />" +
+                            (lotOccupancyOccupant.occupantAddress1
+                                ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />"
+                                : "") +
                             (lotOccupancyOccupant.occupantAddress2
                                 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress2) + "<br />"
                                 : "") +
@@ -528,7 +530,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
                             cityssm.escapeHTML(lotOccupancyOccupant.occupantPostalCode) +
                             "</td>") +
                         ("<td>" +
-                            cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) +
+                            (lotOccupancyOccupant.occupantPhoneNumber
+                                ? cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) +
+                                    "<br />"
+                                : "") +
+                            (lotOccupancyOccupant.occupantEmailAddress
+                                ? cityssm.escapeHTML(lotOccupancyOccupant.occupantEmailAddress)
+                                : "") +
                             "</td>") +
                         ('<td class="is-hidden-print">' +
                             '<div class="buttons are-small is-justify-content-end">' +
diff --git a/public-typescript/lotOccupancyEdit.ts b/public-typescript/lotOccupancyEdit.ts
index 74b85b87..8527efa5 100644
--- a/public-typescript/lotOccupancyEdit.ts
+++ b/public-typescript/lotOccupancyEdit.ts
@@ -666,16 +666,24 @@ declare const bulmaJS: BulmaJS;
                             "#lotOccupancyOccupantEdit--occupantProvince"
                         ) as HTMLInputElement
                     ).value = lotOccupancyOccupant.occupantProvince;
+
                     (
                         modalElement.querySelector(
                             "#lotOccupancyOccupantEdit--occupantPostalCode"
                         ) as HTMLInputElement
                     ).value = lotOccupancyOccupant.occupantPostalCode;
+
                     (
                         modalElement.querySelector(
                             "#lotOccupancyOccupantEdit--occupantPhoneNumber"
                         ) as HTMLInputElement
                     ).value = lotOccupancyOccupant.occupantPhoneNumber;
+
+                    (
+                        modalElement.querySelector(
+                            "#lotOccupancyOccupantEdit--occupantEmailAddress"
+                        ) as HTMLInputElement
+                    ).value = lotOccupancyOccupant.occupantEmailAddress;
                 },
                 onshown: (modalElement, closeModalFunction) => {
                     bulmaJS.toggleHtmlClipped();
@@ -771,7 +779,7 @@ declare const bulmaJS: BulmaJS;
                 exports.aliases.occupant +
                 "</th>" +
                 "<th>Address</th>" +
-                "<th>Phone Number</th>" +
+                "<th>Other Contact</th>" +
                 '<th class="is-hidden-print"><span class="is-sr-only">Options</span></th>' +
                 "</tr></thead>" +
                 "<tbody></tbody>";
@@ -787,8 +795,9 @@ declare const bulmaJS: BulmaJS;
                     "</td>" +
                     ("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantName) + "</td>") +
                     ("<td>" +
-                        cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) +
-                        "<br />" +
+                        (lotOccupancyOccupant.occupantAddress1
+                            ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />"
+                            : "") +
                         (lotOccupancyOccupant.occupantAddress2
                             ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress2) + "<br />"
                             : "") +
@@ -800,7 +809,13 @@ declare const bulmaJS: BulmaJS;
                         cityssm.escapeHTML(lotOccupancyOccupant.occupantPostalCode) +
                         "</td>") +
                     ("<td>" +
-                        cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) +
+                        (lotOccupancyOccupant.occupantPhoneNumber
+                            ? cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) +
+                              "<br />"
+                            : "") +
+                        (lotOccupancyOccupant.occupantEmailAddress
+                            ? cityssm.escapeHTML(lotOccupancyOccupant.occupantEmailAddress)
+                            : "") +
                         "</td>") +
                     ('<td class="is-hidden-print">' +
                         '<div class="buttons are-small is-justify-content-end">' +
diff --git a/public/html/lotOccupancy-addOccupant.html b/public/html/lotOccupancy-addOccupant.html
index 372eb856..59e40fb1 100644
--- a/public/html/lotOccupancy-addOccupant.html
+++ b/public/html/lotOccupancy-addOccupant.html
@@ -23,18 +23,18 @@
                 <div class="field">
                     <label class="label" for="lotOccupancyOccupantAdd--occupantName"><span class="alias" data-alias="Occupant"></span> Name</label>
                     <div class="control">
-                        <input class="input" id="lotOccupancyOccupantAdd--occupantName" name="occupantName" maxlength="200" autocomplete="off" required />
+                        <input class="input" id="lotOccupancyOccupantAdd--occupantName" name="occupantName" type="text" maxlength="200" autocomplete="off" required />
                     </div>
                 </div>
                 <div class="field">
                     <label class="label" for="lotOccupancyOccupantAdd--occupantAddress1">Address</label>
                     <div class="control">
-                        <input class="input" id="lotOccupancyOccupantAdd--occupantAddress1" name="occupantAddress1" maxlength="50" placeholder="Line 1" autocomplete="off" />
+                        <input class="input" id="lotOccupancyOccupantAdd--occupantAddress1" name="occupantAddress1" type="text" maxlength="50" placeholder="Line 1" autocomplete="off" />
                     </div>
                 </div>
                 <div class="field">
                     <div class="control">
-                        <input class="input" id="lotOccupancyOccupantAdd--occupantAddress2" name="occupantAddress2" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" />
+                        <input class="input" id="lotOccupancyOccupantAdd--occupantAddress2" name="occupantAddress2" type="text" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" />
                     </div>
                 </div>
                 <div class="columns">
@@ -42,7 +42,7 @@
                         <div class="field">
                             <label class="label" for="lotOccupancyOccupantAdd--occupantCity">City</label>
                             <div class="control">
-                                <input class="input" id="lotOccupancyOccupantAdd--occupantCity" name="occupantCity" maxlength="20" />
+                                <input class="input" id="lotOccupancyOccupantAdd--occupantCity" name="occupantCity" type="text" maxlength="20" />
                             </div>
                         </div>
                     </div>
@@ -50,7 +50,7 @@
                         <div class="field">
                             <label class="label" for="lotOccupancyOccupantAdd--occupantProvince">Province</label>
                             <div class="control">
-                                <input class="input" id="lotOccupancyOccupantAdd--occupantProvince" name="occupantProvince" maxlength="2" />
+                                <input class="input" id="lotOccupancyOccupantAdd--occupantProvince" name="occupantProvince" type="text" maxlength="2" />
                             </div>
                         </div>
                     </div>
@@ -58,17 +58,30 @@
                         <div class="field">
                             <label class="label" for="lotOccupancyOccupantAdd--occupantPostalCode">Postal Code</label>
                             <div class="control">
-                                <input class="input" id="lotOccupancyOccupantAdd--occupantPostalCode" name="occupantPostalCode" maxlength="7" autocomplete="off" />
+                                <input class="input" id="lotOccupancyOccupantAdd--occupantPostalCode" name="occupantPostalCode" type="text" maxlength="7" autocomplete="off" />
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="field">
-                    <label class="label" for="lotOccupancyOccupantAdd--occupantPhoneNumber">Phone Number</label>
-                    <div class="control">
-                        <input class="input" id="lotOccupancyOccupantAdd--occupantPhoneNumber" name="occupantPhoneNumber" maxlength="30" autocomplete="off" />
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="lotOccupancyOccupantAdd--occupantPhoneNumber">Phone Number</label>
+                            <div class="control">
+                                <input class="input" id="lotOccupancyOccupantAdd--occupantPhoneNumber" name="occupantPhoneNumber" type="text" maxlength="30" autocomplete="off" />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="lotOccupancyOccupantAdd--occupantEmailAddress">Email Address</label>
+                            <div class="control">
+                                <input class="input" id="lotOccupancyOccupantAdd--occupantEmailAddress" name="occupantEmailAddress" type="email" maxlength="200" autocomplete="off" />
+                            </div>
+                        </div>
                     </div>
                 </div>
+                
             </form>
         </section>
         <footer class="modal-card-foot justify-right">
diff --git a/public/html/lotOccupancy-editOccupant.html b/public/html/lotOccupancy-editOccupant.html
index 7619b74b..36b4f729 100644
--- a/public/html/lotOccupancy-editOccupant.html
+++ b/public/html/lotOccupancy-editOccupant.html
@@ -22,18 +22,18 @@
                 <div class="field">
                     <label class="label" for="lotOccupancyOccupantEdit--occupantName"><span class="alias" data-alias="Occupant"></span> Name</label>
                     <div class="control">
-                        <input class="input" id="lotOccupancyOccupantEdit--occupantName" name="occupantName" maxlength="200" autocomplete="off" required />
+                        <input class="input" id="lotOccupancyOccupantEdit--occupantName" name="occupantName" type="text" maxlength="200" autocomplete="off" required />
                     </div>
                 </div>
                 <div class="field">
                     <label class="label" for="lotOccupancyOccupantEdit--occupantAddress1">Address</label>
                     <div class="control">
-                        <input class="input" id="lotOccupancyOccupantEdit--occupantAddress1" name="occupantAddress1" maxlength="50" placeholder="Line 1" autocomplete="off" />
+                        <input class="input" id="lotOccupancyOccupantEdit--occupantAddress1" name="occupantAddress1" type="text" maxlength="50" placeholder="Line 1" autocomplete="off" />
                     </div>
                 </div>
                 <div class="field">
                     <div class="control">
-                        <input class="input" id="lotOccupancyOccupantEdit--occupantAddress2" name="occupantAddress2" maxlength="50" placeholder="Line 2" aria-label="Address Line 2" autocomplete="off" />
+                        <input class="input" id="lotOccupancyOccupantEdit--occupantAddress2" name="occupantAddress2" type="text" maxlength="50" placeholder="Line 2" aria-label="Address Line 2" autocomplete="off" />
                     </div>
                 </div>
                 <div class="columns">
@@ -41,7 +41,7 @@
                         <div class="field">
                             <label class="label" for="lotOccupancyOccupantEdit--occupantCity">City</label>
                             <div class="control">
-                                <input class="input" id="lotOccupancyOccupantEdit--occupantCity" name="occupantCity" maxlength="20" />
+                                <input class="input" id="lotOccupancyOccupantEdit--occupantCity" name="occupantCity" type="text" maxlength="20" />
                             </div>
                         </div>
                     </div>
@@ -49,7 +49,7 @@
                         <div class="field">
                             <label class="label" for="lotOccupancyOccupantEdit--occupantProvince">Province</label>
                             <div class="control">
-                                <input class="input" id="lotOccupancyOccupantEdit--occupantProvince" name="occupantProvince" maxlength="2" />
+                                <input class="input" id="lotOccupancyOccupantEdit--occupantProvince" name="occupantProvince" type="text" maxlength="2" />
                             </div>
                         </div>
                     </div>
@@ -57,17 +57,30 @@
                         <div class="field">
                             <label class="label" for="lotOccupancyOccupantEdit--occupantPostalCode">Postal Code</label>
                             <div class="control">
-                                <input class="input" id="lotOccupancyOccupantEdit--occupantPostalCode" name="occupantPostalCode" maxlength="7" autocomplete="off" />
+                                <input class="input" id="lotOccupancyOccupantEdit--occupantPostalCode" name="occupantPostalCode" type="text" maxlength="7" autocomplete="off" />
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="field">
-                    <label class="label" for="lotOccupancyOccupantEdit--occupantPhoneNumber">Phone Number</label>
-                    <div class="control">
-                        <input class="input" id="lotOccupancyOccupantEdit--occupantPhoneNumber" name="occupantPhoneNumber" maxlength="30" autocomplete="off" />
+                <div class="columns">
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="lotOccupancyOccupantEdit--occupantPhoneNumber">Phone Number</label>
+                            <div class="control">
+                                <input class="input" id="lotOccupancyOccupantEdit--occupantPhoneNumber" name="occupantPhoneNumber" type="text" maxlength="30" autocomplete="off" />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div class="field">
+                            <label class="label" for="lotOccupancyOccupantEdit--occupantEmailAddress">Phone Number</label>
+                            <div class="control">
+                                <input class="input" id="lotOccupancyOccupantEdit--occupantEmailAddress" name="occupantEmailAddress" type="email" maxlength="200" autocomplete="off" />
+                            </div>
+                        </div>
                     </div>
                 </div>
+                
             </form>
         </section>
         <footer class="modal-card-foot justify-right">
diff --git a/public/javascripts/lotOccupancyEdit.min.js b/public/javascripts/lotOccupancyEdit.min.js
index 347698a3..64bfbb04 100644
--- a/public/javascripts/lotOccupancyEdit.min.js
+++ b/public/javascripts/lotOccupancyEdit.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=document.querySelector("main").dataset.urlPrefix,c=document.querySelector("#lotOccupancy--lotOccupancyId").value,a=""===c;let o=!1,n=a;const s=()=>{o||(o=!0,cityssm.enableNavBlocker())},l=document.querySelector("#form--lotOccupancy");l.addEventListener("submit",e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/"+(a?"doCreateLotOccupancy":"doUpdateLotOccupancy"),l,e=>{e.success?(o=!1,cityssm.disableNavBlocker(),a||n?window.location.href=t+"/lotOccupancies/"+e.lotOccupancyId+"/edit?t="+Date.now():bulmaJS.alert({message:exports.aliases.occupancy+" Updated Successfully",contextualColorName:"success"})):bulmaJS.alert({title:"Error Saving "+exports.aliases.occupancy,message:e.errorMessage,contextualColorName:"danger"})})});const r=l.querySelectorAll("input, select");for(const e of r)e.addEventListener("change",s);a||document.querySelector("#button--deleteLotOccupancy").addEventListener("click",e=>{e.preventDefault();bulmaJS.confirm({title:"Delete "+exports.aliases.occupancy+" Record",message:"Are you sure you want to delete this record?",contextualColorName:"warning",okButton:{text:"Yes, Delete",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancy",{lotOccupancyId:c},e=>{e.success?(cityssm.disableNavBlocker(),window.location.href=t+"/lotOccupancies?t="+Date.now()):bulmaJS.alert({title:"Error Deleting Record",message:e.errorMessage,contextualColorName:"danger"})})}}})});const i=document.querySelector("#lotOccupancy--occupancyTypeId");if(a){const e=document.querySelector("#container--lotOccupancyFields");i.addEventListener("change",()=>{""!==i.value?cityssm.postJSON(t+"/lotOccupancies/doGetOccupancyTypeFields",{occupancyTypeId:i.value},t=>{if(0===t.occupancyTypeFields.length)return void(e.innerHTML='<div class="message is-info"><p class="message-body">There are no additional fields for this '+exports.aliases.occupancy.toLowerCase()+" type.</p></div>");e.innerHTML="";let c="";for(const a of t.occupancyTypeFields){c+=","+a.occupancyTypeFieldId;const t="lotOccupancyFieldValue_"+a.occupancyTypeFieldId,o="lotOccupancy--"+t,n=document.createElement("div");if(n.className="field",n.innerHTML='<label class="label" for="'+o+'"></label><div class="control"></div>',n.querySelector("label").textContent=a.occupancyTypeField,""===a.occupancyTypeFieldValues){const e=document.createElement("input");e.className="input",e.id=o,e.name=t,e.type="text",e.required=a.isRequired,e.minLength=a.minimumLength,e.maxLength=a.maximumLength,a.pattern&&""!==a.pattern&&(e.pattern=a.pattern),n.querySelector(".control").append(e)}else{n.querySelector(".control").innerHTML='<div class="select is-fullwidth"><select id="'+o+'" name="'+t+'"><option value="">(Not Set)</option></select></div>',n.querySelector("select").required=a.isRequired;const e=a.occupancyTypeFieldValues.split("\n");for(const t of e){const e=document.createElement("option");e.value=t,e.textContent=t,n.querySelector("select").append(e)}}e.append(n)}e.insertAdjacentHTML("beforeend",'<input name="occupancyTypeFieldIds" type="hidden" value="'+c.slice(1)+'" />')}):e.innerHTML='<div class="message is-info"><p class="message-body">Select the '+exports.aliases.occupancy.toLowerCase()+" type to load the available fields.</p></div>"})}else{const e=i.value;i.addEventListener("change",()=>{i.value!==e&&bulmaJS.confirm({title:"Confirm Change",message:"Are you sure you want to change the "+exports.aliases.occupancy.toLowerCase()+" type?\nThis change affects the additional fields associated with this record, and may also affect the available fees.",contextualColorName:"warning",okButton:{text:"Yes, Keep the Change",callbackFunction:()=>{n=!0}},cancelButton:{text:"Revert the Change",callbackFunction:()=>{i.value=e}}})})}const u=document.querySelector("#lotOccupancy--lotName");if(u.addEventListener("click",c=>{const a=c.currentTarget.value;let o,n,l,r;const i=(e,t)=>{document.querySelector("#lotOccupancy--lotId").value=e.toString(),document.querySelector("#lotOccupancy--lotName").value=t,s(),o()},u=e=>{e.preventDefault();const t=e.currentTarget;i(t.dataset.lotId,t.dataset.lotName)},d=()=>{r.innerHTML='<p class="has-text-centered"><i class="fas fa-3x fa-pulse fa-spinner" aria-hidden="true"></i><br />Searching...</p>',cityssm.postJSON(t+"/lots/doSearchLots",l,e=>{if(0===e.count)return void(r.innerHTML='<div class="message is-info"><p class="message-body">No results.</p></div>');const t=document.createElement("div");t.className="panel";for(const c of e.lots){const e=document.createElement("a");e.className="panel-block is-block",e.href="#",e.dataset.lotId=c.lotId.toString(),e.dataset.lotName=c.lotName,e.innerHTML='<div class="columns"><div class="column">'+cityssm.escapeHTML(c.lotName)+'<br /><span class="is-size-7">'+cityssm.escapeHTML(c.mapName)+'</span></div><div class="column">'+cityssm.escapeHTML(c.lotStatus)+'<br /><span class="is-size-7">'+(c.lotOccupancyCount>0?"Currently Occupied":"")+"</span></div></div>",e.addEventListener("click",u),t.append(e)}r.innerHTML="",r.append(t)})},p=e=>{e.preventDefault();const c=n.querySelector("#lotCreate--lotName").value;cityssm.postJSON(t+"/lots/doCreateLot",e.currentTarget,e=>{e.success?i(e.lotId,c):bulmaJS.alert({title:"Error Creating "+exports.aliases.lot,message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-selectLot",{onshow:t=>{e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),n=e,o=t,bulmaJS.init(e);const c=e.querySelector("#lotSelect--lotName");""!==document.querySelector("#lotOccupancy--lotId").value&&(c.value=a),c.focus(),c.addEventListener("change",d);const s=e.querySelector("#lotSelect--occupancyStatus");if(s.addEventListener("change",d),""!==a&&(s.value=""),l=e.querySelector("#form--lotSelect"),r=e.querySelector("#resultsContainer--lotSelect"),l.addEventListener("submit",e=>{e.preventDefault()}),d(),exports.lotNamePattern){const t=exports.lotNamePattern;e.querySelector("#lotCreate--lotName").pattern=t.source}const i=e.querySelector("#lotCreate--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,i.append(t)}const u=e.querySelector("#lotCreate--lotStatusId");for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,u.append(t)}const m=e.querySelector("#lotCreate--mapId");for(const e of exports.maps){const t=document.createElement("option");t.value=e.mapId.toString(),t.textContent=e.mapName||"(No Name)",m.append(t)}e.querySelector("#form--lotCreate").addEventListener("submit",p)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),document.querySelector(".is-lot-view-button").addEventListener("click",()=>{const e=document.querySelector("#lotOccupancy--lotId").value;e?window.open(t+"/lots/"+e):bulmaJS.alert({message:"No "+exports.aliases.lot.toLowerCase()+" selected.",contextualColorName:"info"})}),document.querySelector(".is-clear-lot-button").addEventListener("click",()=>{u.disabled?bulmaJS.alert({message:"You need to unlock the field before clearing it.",contextualColorName:"info"}):(u.value="(No "+exports.aliases.lot+")",document.querySelector("#lotOccupancy--lotId").value="",s())}),e.initializeDatePickers(l),document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change",()=>{const e=document.querySelector("#lotOccupancy--occupancyEndDateString").bulmaCalendar.datePicker;e.min=document.querySelector("#lotOccupancy--occupancyStartDateString").value,e.refresh()}),e.initializeUnlockFieldButtons(l),!a){let a=exports.lotOccupancyOccupants;delete exports.lotOccupancyOccupants;const o=o=>{const n=Number.parseInt(o.currentTarget.closest("tr").dataset.lotOccupantIndex,10),l=a.find(e=>e.lotOccupantIndex===n);let r,i;const u=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doUpdateLotOccupancyOccupant",r,e=>{e.success?(a=e.lotOccupancyOccupants,i(),s()):bulmaJS.alert({title:"Error Updating "+exports.aliases.occupant,message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editOccupant",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyOccupantEdit--lotOccupancyId").value=c,t.querySelector("#lotOccupancyOccupantEdit--lotOccupantIndex").value=n.toString();const a=t.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId");let o=!1;for(const e of exports.lotOccupantTypes){const t=document.createElement("option");t.value=e.lotOccupantTypeId.toString(),t.textContent=e.lotOccupantType,e.lotOccupantTypeId===l.lotOccupantTypeId&&(t.selected=!0,o=!0),a.append(t)}if(!o){const e=document.createElement("option");e.value=l.lotOccupantTypeId.toString(),e.textContent=l.lotOccupantType,e.selected=!0,a.append(e)}t.querySelector("#lotOccupancyOccupantEdit--occupantName").value=l.occupantName,t.querySelector("#lotOccupancyOccupantEdit--occupantAddress1").value=l.occupantAddress1,t.querySelector("#lotOccupancyOccupantEdit--occupantAddress2").value=l.occupantAddress2,t.querySelector("#lotOccupancyOccupantEdit--occupantCity").value=l.occupantCity,t.querySelector("#lotOccupancyOccupantEdit--occupantProvince").value=l.occupantProvince,t.querySelector("#lotOccupancyOccupantEdit--occupantPostalCode").value=l.occupantPostalCode,t.querySelector("#lotOccupancyOccupantEdit--occupantPhoneNumber").value=l.occupantPhoneNumber},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId").focus(),(r=e.querySelector("form")).addEventListener("submit",u),i=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},n=e=>{const o=e.currentTarget.closest("tr").dataset.lotOccupantIndex;bulmaJS.confirm({title:"Remove "+exports.aliases.occupant+"?",message:"Are you sure you want to remove this "+exports.aliases.occupant.toLowerCase()+"?",okButton:{text:"Yes, Remove "+exports.aliases.occupant,callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyOccupant",{lotOccupancyId:c,lotOccupantIndex:o},e=>{e.success?(a=e.lotOccupancyOccupants,s()):bulmaJS.alert({title:"Error Removing "+exports.aliases.occupant,message:e.errorMessage,contextualColorName:"danger"})})}},contextualColorName:"warning"})},s=()=>{const e=document.querySelector("#container--lotOccupancyOccupants");if(cityssm.clearElement(e),0===a.length)return void(e.innerHTML='<div class="message is-warning"><p class="message-body">There are no '+exports.aliases.occupants.toLowerCase()+" associated with this record.</p></div>");const t=document.createElement("table");t.className="table is-fullwidth is-striped is-hoverable",t.innerHTML="<thead><tr><th>"+exports.aliases.occupant+" Type</th><th>"+exports.aliases.occupant+'</th><th>Address</th><th>Phone Number</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const e of a){const c=document.createElement("tr");c.dataset.lotOccupantIndex=e.lotOccupantIndex.toString(),c.innerHTML="<td>"+cityssm.escapeHTML(e.lotOccupantType)+"</td><td>"+cityssm.escapeHTML(e.occupantName)+"</td><td>"+cityssm.escapeHTML(e.occupantAddress1)+"<br />"+(e.occupantAddress2?cityssm.escapeHTML(e.occupantAddress2)+"<br />":"")+(e.occupantCity?cityssm.escapeHTML(e.occupantCity)+", ":"")+cityssm.escapeHTML(e.occupantProvince)+"<br />"+cityssm.escapeHTML(e.occupantPostalCode)+"</td><td>"+cityssm.escapeHTML(e.occupantPhoneNumber)+'</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 '+cityssm.escapeHTML(exports.aliases.occupant)+'" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',c.querySelector(".button--edit").addEventListener("click",o),c.querySelector(".button--delete").addEventListener("click",n),t.querySelector("tbody").append(c)}e.append(t)};document.querySelector("#button--addOccupant").addEventListener("click",()=>{let o,n;const l=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyOccupant",o,e=>{e.success?(a=e.lotOccupancyOccupants,n(),s()):bulmaJS.alert({title:"Error Adding "+exports.aliases.occupant,message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addOccupant",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyOccupantAdd--lotOccupancyId").value=c;const a=t.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId");for(const e of exports.lotOccupantTypes){const t=document.createElement("option");t.value=e.lotOccupantTypeId.toString(),t.textContent=e.lotOccupantType,a.append(t)}t.querySelector("#lotOccupancyOccupantAdd--occupantCity").value=exports.occupantCityDefault,t.querySelector("#lotOccupancyOccupantAdd--occupantProvince").value=exports.occupantProvinceDefault},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId").focus(),(o=e.querySelector("form")).addEventListener("submit",l),n=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),s()}if(!a){let a=exports.lotOccupancyComments;delete exports.lotOccupancyComments;const o=o=>{const n=Number.parseInt(o.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10),l=a.find(e=>e.lotOccupancyCommentId===n);let r,i;const u=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doUpdateLotOccupancyComment",r,e=>{e.success?(a=e.lotOccupancyComments,i(),s()):bulmaJS.alert({title:"Error Updating Comment",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editComment",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyCommentEdit--lotOccupancyId").value=c,t.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentId").value=n.toString(),t.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").value=l.lotOccupancyComment;const a=t.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentDateString");a.value=l.lotOccupancyCommentDateString;const o=cityssm.dateToString(new Date);a.max=l.lotOccupancyCommentDateString<=o?o:l.lotOccupancyCommentDateString,t.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentTimeString").value=l.lotOccupancyCommentTimeString},onshown:(t,c)=>{bulmaJS.toggleHtmlClipped(),e.initializeDatePickers(t),e.initializeTimePickers(t),t.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").focus(),(r=t.querySelector("form")).addEventListener("submit",u),i=c},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},n=e=>{const o=Number.parseInt(e.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10);bulmaJS.confirm({title:"Remove Comment?",message:"Are you sure you want to remove this comment?",okButton:{text:"Yes, Remove Comment",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyComment",{lotOccupancyId:c,lotOccupancyCommentId:o},e=>{e.success?(a=e.lotOccupancyComments,s()):bulmaJS.alert({title:"Error Removing Comment",message:e.errorMessage,contextualColorName:"danger"})})}},contextualColorName:"warning"})},s=()=>{const e=document.querySelector("#container--lotOccupancyComments");if(0===a.length)return void(e.innerHTML='<div class="message is-info"><p class="message-body">There are no comments associated with this record.</p></div>');const t=document.createElement("table");t.className="table is-fullwidth is-striped is-hoverable",t.innerHTML='<thead><tr><th>Commentor</th><th>Comment Date</th><th>Comment</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const e of a){const c=document.createElement("tr");c.dataset.lotOccupancyCommentId=e.lotOccupancyCommentId.toString(),c.innerHTML="<td>"+cityssm.escapeHTML(e.recordCreate_userName)+"</td><td>"+e.lotOccupancyCommentDateString+(0===e.lotOccupancyCommentTime?"":" "+e.lotOccupancyCommentTimeString)+"</td><td>"+cityssm.escapeHTML(e.lotOccupancyComment)+'</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>',c.querySelector(".button--edit").addEventListener("click",o),c.querySelector(".button--delete").addEventListener("click",n),t.querySelector("tbody").append(c)}e.innerHTML="",e.append(t)};document.querySelector("#button--addComment").addEventListener("click",()=>{let o,n;const l=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyComment",o,e=>{e.success?(a=e.lotOccupancyComments,n(),s()):bulmaJS.alert({title:"Error Adding Comment",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addComment",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyCommentAdd--lotOccupancyId").value=c},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyCommentAdd--lotOccupancyComment").focus(),(o=e.querySelector("form")).addEventListener("submit",l),n=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),s()}if(!a){let a=exports.lotOccupancyFees;delete exports.lotOccupancyFees;const n=document.querySelector("#container--lotOccupancyFees"),s=()=>{let e=0;for(const t of a)e+=(t.feeAmount+t.taxAmount)*t.quantity;return e},l=e=>{const o=e.currentTarget.closest(".container--lotOccupancyFee").dataset.feeId;bulmaJS.confirm({title:"Delete Fee",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete Fee",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyFee",{lotOccupancyId:c,feeId:o},e=>{e.success?(a=e.lotOccupancyFees,r()):bulmaJS.alert({title:"Error Deleting Fee",message:e.errorMessage,contextualColorName:"danger"})})}}})},r=()=>{if(0===a.length)return n.innerHTML='<div class="message is-info"><p class="message-body">There are no fees associated with this record.</p></div>',void m();n.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th>Fee</th><th><span class="is-sr-only">Unit Cost</span></th><th class="has-width-1"><span class="is-sr-only">&times;</span></th><th class="has-width-1"><span class="is-sr-only">Quantity</span></th><th class="has-width-1"><span class="is-sr-only">equals</span></th><th class="has-width-1 has-text-right">Total</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="5">Subtotal</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--feeAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Tax</th><td class="has-text-right" id="lotOccupancyFees--taxAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Grand Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let e=0,t=0;for(const c of a){const a=document.createElement("tr");a.className="container--lotOccupancyFee",a.dataset.feeId=c.feeId.toString(),a.dataset.includeQuantity=c.includeQuantity?"1":"0",a.innerHTML='<td colspan="'+(1===c.quantity?"5":"1")+'">'+cityssm.escapeHTML(c.feeName)+"</td>"+(1===c.quantity?"":'<td class="has-text-right">$'+c.feeAmount.toFixed(2)+'</td><td>&times;</td><td class="has-text-right">'+c.quantity+"</td><td>=</td>")+'<td class="has-text-right">$'+(c.feeAmount*c.quantity).toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Fee" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',a.querySelector("button").addEventListener("click",l),n.querySelector("tbody").append(a),e+=c.feeAmount*c.quantity,t+=c.taxAmount*c.quantity}n.querySelector("#lotOccupancyFees--feeAmountTotal").textContent="$"+e.toFixed(2),n.querySelector("#lotOccupancyFees--taxAmountTotal").textContent="$"+t.toFixed(2),n.querySelector("#lotOccupancyFees--grandTotal").textContent="$"+(e+t).toFixed(2),m()};document.querySelector("#button--addFee").addEventListener("click",()=>{if(o)return void bulmaJS.alert({message:"Please save all unsaved changes before adding fees.",contextualColorName:"warning"});let e,s,l;const i=(e,o=1)=>{cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyFee",{lotOccupancyId:c,feeId:e,quantity:o},e=>{e.success?(a=e.lotOccupancyFees,r(),d()):bulmaJS.alert({title:"Error Adding Fee",message:e.errorMessage,contextualColorName:"danger"})})},u=t=>{t.preventDefault();const c=Number.parseInt(t.currentTarget.dataset.feeId,10),a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),o=e.find(e=>e.feeCategoryId===a).fees.find(e=>e.feeId===c);o.includeQuantity?(e=>{let t,c;const a=a=>{a.preventDefault(),i(e.feeId,t.value),c()};cityssm.openHtmlModal("lotOccupancy-setFeeQuantity",{onshow:t=>{t.querySelector("#lotOccupancyFeeQuantity--quantityUnit").textContent=e.quantityUnit},onshown:(e,o)=>{c=o,t=e.querySelector("#lotOccupancyFeeQuantity--quantity"),e.querySelector("form").addEventListener("submit",a)}})})(o):i(c)},d=()=>{const t=s.value.trim().toLowerCase().split(" ");l.innerHTML="";for(const c of e){const e=document.createElement("div");e.className="container--feeCategory",e.dataset.feeCategoryId=c.feeCategoryId.toString(),e.innerHTML='<h4 class="title is-5 mt-2">'+cityssm.escapeHTML(c.feeCategory)+'</h4><div class="panel mb-5"></div>';let a=!1;for(const o of c.fees){if(n.querySelector(".container--lotOccupancyFee[data-fee-id='"+o.feeId+"'][data-include-quantity='0']"))continue;let c=!0;for(const e of t)if(!o.feeName.toLowerCase().includes(e)){c=!1;break}if(!c)continue;a=!0;const s=document.createElement("a");s.className="panel-block is-block container--fee",s.dataset.feeId=o.feeId.toString(),s.href="#",s.innerHTML="<strong>"+cityssm.escapeHTML(o.feeName)+"</strong><br /><small>"+cityssm.escapeHTML(o.feeDescription).replace(/\n/g,"<br />")+"</small>",s.addEventListener("click",u),e.querySelector(".panel").append(s)}a&&l.append(e)}};cityssm.openHtmlModal("lotOccupancy-addFee",{onshow:a=>{s=a.querySelector("#feeSelect--feeName"),l=a.querySelector("#resultsContainer--feeSelect"),cityssm.postJSON(t+"/lotOccupancies/doGetFees",{lotOccupancyId:c},t=>{e=t.feeCategories,s.disabled=!1,s.addEventListener("keyup",d),s.focus(),d()})},onshown:()=>{bulmaJS.toggleHtmlClipped()},onhidden:()=>{r()},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})});let i=exports.lotOccupancyTransactions;delete exports.lotOccupancyTransactions;const u=document.querySelector("#container--lotOccupancyTransactions"),d=()=>{let e=0;for(const t of i)e+=t.transactionAmount;return e},p=e=>{const a=e.currentTarget.closest(".container--lotOccupancyTransaction").dataset.transactionIndex;bulmaJS.confirm({title:"Delete Trasnaction",message:"Are you sure you want to delete this transaction?",contextualColorName:"warning",okButton:{text:"Yes, Delete Transaction",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyTransaction",{lotOccupancyId:c,transactionIndex:a},e=>{e.success?(i=e.lotOccupancyTransactions,m()):bulmaJS.alert({title:"Error Deleting Transaction",message:e.errorMessage,contextualColorName:"danger"})})}}})},m=()=>{if(0===i.length)return void(u.innerHTML='<div class="message '+(0===a.length?"is-info":"is-warning")+'"><p class="message-body">There are no transactions associated with this record.</p></div>');u.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th class="has-width-1">Date</th><th>'+cityssm.escapeHTML(exports.aliases.externalReceiptNumber)+'</th><th class="has-text-right has-width-1">Amount</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="2">Transaction Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyTransactions--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let e=0;for(const t of i){e+=t.transactionAmount;const c=document.createElement("tr");c.className="container--lotOccupancyTransaction",c.dataset.transactionIndex=t.transactionIndex.toString(),c.innerHTML="<td>"+t.transactionDateString+"</td><td>"+cityssm.escapeHTML(t.externalReceiptNumber)+"<br /><small>"+cityssm.escapeHTML(t.transactionNote)+'</small></td><td class="has-text-right">$'+t.transactionAmount.toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Transaction" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',c.querySelector("button").addEventListener("click",p),u.querySelector("tbody").append(c)}u.querySelector("#lotOccupancyTransactions--grandTotal").textContent="$"+e.toFixed(2);const t=s();t>e&&u.insertAdjacentHTML("afterbegin",'<div class="message is-warning"><div class="message-body"><div class="level"><div class="level-left"><div class="level-item">Outstanding Balance</div></div><div class="level-right"><div class="level-item">$'+(t-e).toFixed(2)+"</div></div></div></div></div>")};document.querySelector("#button--addTransaction").addEventListener("click",()=>{let a;const o=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyTransaction",e.currentTarget,e=>{e.success?(i=e.lotOccupancyTransactions,a(),m()):bulmaJS.confirm({title:"Error Adding Transaction",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addTransaction",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyTransactionAdd--lotOccupancyId").value=c.toString();const a=s(),o=d(),n=t.querySelector("#lotOccupancyTransactionAdd--transactionAmount");n.min=(-1*o).toFixed(2),n.max=Math.max(a-o,0).toFixed(2),n.value=Math.max(a-o,0).toFixed(2)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),a=t,e.querySelector("form").addEventListener("submit",o)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),r()}})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=document.querySelector("main").dataset.urlPrefix,c=document.querySelector("#lotOccupancy--lotOccupancyId").value,a=""===c;let o=!1,n=a;const s=()=>{o||(o=!0,cityssm.enableNavBlocker())},l=document.querySelector("#form--lotOccupancy");l.addEventListener("submit",e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/"+(a?"doCreateLotOccupancy":"doUpdateLotOccupancy"),l,e=>{e.success?(o=!1,cityssm.disableNavBlocker(),a||n?window.location.href=t+"/lotOccupancies/"+e.lotOccupancyId+"/edit?t="+Date.now():bulmaJS.alert({message:exports.aliases.occupancy+" Updated Successfully",contextualColorName:"success"})):bulmaJS.alert({title:"Error Saving "+exports.aliases.occupancy,message:e.errorMessage,contextualColorName:"danger"})})});const r=l.querySelectorAll("input, select");for(const e of r)e.addEventListener("change",s);a||document.querySelector("#button--deleteLotOccupancy").addEventListener("click",e=>{e.preventDefault();bulmaJS.confirm({title:"Delete "+exports.aliases.occupancy+" Record",message:"Are you sure you want to delete this record?",contextualColorName:"warning",okButton:{text:"Yes, Delete",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancy",{lotOccupancyId:c},e=>{e.success?(cityssm.disableNavBlocker(),window.location.href=t+"/lotOccupancies?t="+Date.now()):bulmaJS.alert({title:"Error Deleting Record",message:e.errorMessage,contextualColorName:"danger"})})}}})});const i=document.querySelector("#lotOccupancy--occupancyTypeId");if(a){const e=document.querySelector("#container--lotOccupancyFields");i.addEventListener("change",()=>{""!==i.value?cityssm.postJSON(t+"/lotOccupancies/doGetOccupancyTypeFields",{occupancyTypeId:i.value},t=>{if(0===t.occupancyTypeFields.length)return void(e.innerHTML='<div class="message is-info"><p class="message-body">There are no additional fields for this '+exports.aliases.occupancy.toLowerCase()+" type.</p></div>");e.innerHTML="";let c="";for(const a of t.occupancyTypeFields){c+=","+a.occupancyTypeFieldId;const t="lotOccupancyFieldValue_"+a.occupancyTypeFieldId,o="lotOccupancy--"+t,n=document.createElement("div");if(n.className="field",n.innerHTML='<label class="label" for="'+o+'"></label><div class="control"></div>',n.querySelector("label").textContent=a.occupancyTypeField,""===a.occupancyTypeFieldValues){const e=document.createElement("input");e.className="input",e.id=o,e.name=t,e.type="text",e.required=a.isRequired,e.minLength=a.minimumLength,e.maxLength=a.maximumLength,a.pattern&&""!==a.pattern&&(e.pattern=a.pattern),n.querySelector(".control").append(e)}else{n.querySelector(".control").innerHTML='<div class="select is-fullwidth"><select id="'+o+'" name="'+t+'"><option value="">(Not Set)</option></select></div>',n.querySelector("select").required=a.isRequired;const e=a.occupancyTypeFieldValues.split("\n");for(const t of e){const e=document.createElement("option");e.value=t,e.textContent=t,n.querySelector("select").append(e)}}e.append(n)}e.insertAdjacentHTML("beforeend",'<input name="occupancyTypeFieldIds" type="hidden" value="'+c.slice(1)+'" />')}):e.innerHTML='<div class="message is-info"><p class="message-body">Select the '+exports.aliases.occupancy.toLowerCase()+" type to load the available fields.</p></div>"})}else{const e=i.value;i.addEventListener("change",()=>{i.value!==e&&bulmaJS.confirm({title:"Confirm Change",message:"Are you sure you want to change the "+exports.aliases.occupancy.toLowerCase()+" type?\nThis change affects the additional fields associated with this record, and may also affect the available fees.",contextualColorName:"warning",okButton:{text:"Yes, Keep the Change",callbackFunction:()=>{n=!0}},cancelButton:{text:"Revert the Change",callbackFunction:()=>{i.value=e}}})})}const u=document.querySelector("#lotOccupancy--lotName");if(u.addEventListener("click",c=>{const a=c.currentTarget.value;let o,n,l,r;const i=(e,t)=>{document.querySelector("#lotOccupancy--lotId").value=e.toString(),document.querySelector("#lotOccupancy--lotName").value=t,s(),o()},u=e=>{e.preventDefault();const t=e.currentTarget;i(t.dataset.lotId,t.dataset.lotName)},d=()=>{r.innerHTML='<p class="has-text-centered"><i class="fas fa-3x fa-pulse fa-spinner" aria-hidden="true"></i><br />Searching...</p>',cityssm.postJSON(t+"/lots/doSearchLots",l,e=>{if(0===e.count)return void(r.innerHTML='<div class="message is-info"><p class="message-body">No results.</p></div>');const t=document.createElement("div");t.className="panel";for(const c of e.lots){const e=document.createElement("a");e.className="panel-block is-block",e.href="#",e.dataset.lotId=c.lotId.toString(),e.dataset.lotName=c.lotName,e.innerHTML='<div class="columns"><div class="column">'+cityssm.escapeHTML(c.lotName)+'<br /><span class="is-size-7">'+cityssm.escapeHTML(c.mapName)+'</span></div><div class="column">'+cityssm.escapeHTML(c.lotStatus)+'<br /><span class="is-size-7">'+(c.lotOccupancyCount>0?"Currently Occupied":"")+"</span></div></div>",e.addEventListener("click",u),t.append(e)}r.innerHTML="",r.append(t)})},p=e=>{e.preventDefault();const c=n.querySelector("#lotCreate--lotName").value;cityssm.postJSON(t+"/lots/doCreateLot",e.currentTarget,e=>{e.success?i(e.lotId,c):bulmaJS.alert({title:"Error Creating "+exports.aliases.lot,message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-selectLot",{onshow:t=>{e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),n=e,o=t,bulmaJS.init(e);const c=e.querySelector("#lotSelect--lotName");""!==document.querySelector("#lotOccupancy--lotId").value&&(c.value=a),c.focus(),c.addEventListener("change",d);const s=e.querySelector("#lotSelect--occupancyStatus");if(s.addEventListener("change",d),""!==a&&(s.value=""),l=e.querySelector("#form--lotSelect"),r=e.querySelector("#resultsContainer--lotSelect"),l.addEventListener("submit",e=>{e.preventDefault()}),d(),exports.lotNamePattern){const t=exports.lotNamePattern;e.querySelector("#lotCreate--lotName").pattern=t.source}const i=e.querySelector("#lotCreate--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,i.append(t)}const u=e.querySelector("#lotCreate--lotStatusId");for(const e of exports.lotStatuses){const t=document.createElement("option");t.value=e.lotStatusId.toString(),t.textContent=e.lotStatus,u.append(t)}const m=e.querySelector("#lotCreate--mapId");for(const e of exports.maps){const t=document.createElement("option");t.value=e.mapId.toString(),t.textContent=e.mapName||"(No Name)",m.append(t)}e.querySelector("#form--lotCreate").addEventListener("submit",p)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),document.querySelector(".is-lot-view-button").addEventListener("click",()=>{const e=document.querySelector("#lotOccupancy--lotId").value;e?window.open(t+"/lots/"+e):bulmaJS.alert({message:"No "+exports.aliases.lot.toLowerCase()+" selected.",contextualColorName:"info"})}),document.querySelector(".is-clear-lot-button").addEventListener("click",()=>{u.disabled?bulmaJS.alert({message:"You need to unlock the field before clearing it.",contextualColorName:"info"}):(u.value="(No "+exports.aliases.lot+")",document.querySelector("#lotOccupancy--lotId").value="",s())}),e.initializeDatePickers(l),document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change",()=>{const e=document.querySelector("#lotOccupancy--occupancyEndDateString").bulmaCalendar.datePicker;e.min=document.querySelector("#lotOccupancy--occupancyStartDateString").value,e.refresh()}),e.initializeUnlockFieldButtons(l),!a){let a=exports.lotOccupancyOccupants;delete exports.lotOccupancyOccupants;const o=o=>{const n=Number.parseInt(o.currentTarget.closest("tr").dataset.lotOccupantIndex,10),l=a.find(e=>e.lotOccupantIndex===n);let r,i;const u=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doUpdateLotOccupancyOccupant",r,e=>{e.success?(a=e.lotOccupancyOccupants,i(),s()):bulmaJS.alert({title:"Error Updating "+exports.aliases.occupant,message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editOccupant",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyOccupantEdit--lotOccupancyId").value=c,t.querySelector("#lotOccupancyOccupantEdit--lotOccupantIndex").value=n.toString();const a=t.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId");let o=!1;for(const e of exports.lotOccupantTypes){const t=document.createElement("option");t.value=e.lotOccupantTypeId.toString(),t.textContent=e.lotOccupantType,e.lotOccupantTypeId===l.lotOccupantTypeId&&(t.selected=!0,o=!0),a.append(t)}if(!o){const e=document.createElement("option");e.value=l.lotOccupantTypeId.toString(),e.textContent=l.lotOccupantType,e.selected=!0,a.append(e)}t.querySelector("#lotOccupancyOccupantEdit--occupantName").value=l.occupantName,t.querySelector("#lotOccupancyOccupantEdit--occupantAddress1").value=l.occupantAddress1,t.querySelector("#lotOccupancyOccupantEdit--occupantAddress2").value=l.occupantAddress2,t.querySelector("#lotOccupancyOccupantEdit--occupantCity").value=l.occupantCity,t.querySelector("#lotOccupancyOccupantEdit--occupantProvince").value=l.occupantProvince,t.querySelector("#lotOccupancyOccupantEdit--occupantPostalCode").value=l.occupantPostalCode,t.querySelector("#lotOccupancyOccupantEdit--occupantPhoneNumber").value=l.occupantPhoneNumber,t.querySelector("#lotOccupancyOccupantEdit--occupantEmailAddress").value=l.occupantEmailAddress},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyOccupantEdit--lotOccupantTypeId").focus(),(r=e.querySelector("form")).addEventListener("submit",u),i=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},n=e=>{const o=e.currentTarget.closest("tr").dataset.lotOccupantIndex;bulmaJS.confirm({title:"Remove "+exports.aliases.occupant+"?",message:"Are you sure you want to remove this "+exports.aliases.occupant.toLowerCase()+"?",okButton:{text:"Yes, Remove "+exports.aliases.occupant,callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyOccupant",{lotOccupancyId:c,lotOccupantIndex:o},e=>{e.success?(a=e.lotOccupancyOccupants,s()):bulmaJS.alert({title:"Error Removing "+exports.aliases.occupant,message:e.errorMessage,contextualColorName:"danger"})})}},contextualColorName:"warning"})},s=()=>{const e=document.querySelector("#container--lotOccupancyOccupants");if(cityssm.clearElement(e),0===a.length)return void(e.innerHTML='<div class="message is-warning"><p class="message-body">There are no '+exports.aliases.occupants.toLowerCase()+" associated with this record.</p></div>");const t=document.createElement("table");t.className="table is-fullwidth is-striped is-hoverable",t.innerHTML="<thead><tr><th>"+exports.aliases.occupant+" Type</th><th>"+exports.aliases.occupant+'</th><th>Address</th><th>Other Contact</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const e of a){const c=document.createElement("tr");c.dataset.lotOccupantIndex=e.lotOccupantIndex.toString(),c.innerHTML="<td>"+cityssm.escapeHTML(e.lotOccupantType)+"</td><td>"+cityssm.escapeHTML(e.occupantName)+"</td><td>"+(e.occupantAddress1?cityssm.escapeHTML(e.occupantAddress1)+"<br />":"")+(e.occupantAddress2?cityssm.escapeHTML(e.occupantAddress2)+"<br />":"")+(e.occupantCity?cityssm.escapeHTML(e.occupantCity)+", ":"")+cityssm.escapeHTML(e.occupantProvince)+"<br />"+cityssm.escapeHTML(e.occupantPostalCode)+"</td><td>"+(e.occupantPhoneNumber?cityssm.escapeHTML(e.occupantPhoneNumber)+"<br />":"")+(e.occupantEmailAddress?cityssm.escapeHTML(e.occupantEmailAddress):"")+'</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 '+cityssm.escapeHTML(exports.aliases.occupant)+'" type="button" aria-label="Delete"><i class="fas fa-trash" aria-hidden="true"></i></button></div></td>',c.querySelector(".button--edit").addEventListener("click",o),c.querySelector(".button--delete").addEventListener("click",n),t.querySelector("tbody").append(c)}e.append(t)};document.querySelector("#button--addOccupant").addEventListener("click",()=>{let o,n;const l=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyOccupant",o,e=>{e.success?(a=e.lotOccupancyOccupants,n(),s()):bulmaJS.alert({title:"Error Adding "+exports.aliases.occupant,message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addOccupant",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyOccupantAdd--lotOccupancyId").value=c;const a=t.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId");for(const e of exports.lotOccupantTypes){const t=document.createElement("option");t.value=e.lotOccupantTypeId.toString(),t.textContent=e.lotOccupantType,a.append(t)}t.querySelector("#lotOccupancyOccupantAdd--occupantCity").value=exports.occupantCityDefault,t.querySelector("#lotOccupancyOccupantAdd--occupantProvince").value=exports.occupantProvinceDefault},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyOccupantAdd--lotOccupantTypeId").focus(),(o=e.querySelector("form")).addEventListener("submit",l),n=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),s()}if(!a){let a=exports.lotOccupancyComments;delete exports.lotOccupancyComments;const o=o=>{const n=Number.parseInt(o.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10),l=a.find(e=>e.lotOccupancyCommentId===n);let r,i;const u=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doUpdateLotOccupancyComment",r,e=>{e.success?(a=e.lotOccupancyComments,i(),s()):bulmaJS.alert({title:"Error Updating Comment",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-editComment",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyCommentEdit--lotOccupancyId").value=c,t.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentId").value=n.toString(),t.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").value=l.lotOccupancyComment;const a=t.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentDateString");a.value=l.lotOccupancyCommentDateString;const o=cityssm.dateToString(new Date);a.max=l.lotOccupancyCommentDateString<=o?o:l.lotOccupancyCommentDateString,t.querySelector("#lotOccupancyCommentEdit--lotOccupancyCommentTimeString").value=l.lotOccupancyCommentTimeString},onshown:(t,c)=>{bulmaJS.toggleHtmlClipped(),e.initializeDatePickers(t),e.initializeTimePickers(t),t.querySelector("#lotOccupancyCommentEdit--lotOccupancyComment").focus(),(r=t.querySelector("form")).addEventListener("submit",u),i=c},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},n=e=>{const o=Number.parseInt(e.currentTarget.closest("tr").dataset.lotOccupancyCommentId,10);bulmaJS.confirm({title:"Remove Comment?",message:"Are you sure you want to remove this comment?",okButton:{text:"Yes, Remove Comment",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyComment",{lotOccupancyId:c,lotOccupancyCommentId:o},e=>{e.success?(a=e.lotOccupancyComments,s()):bulmaJS.alert({title:"Error Removing Comment",message:e.errorMessage,contextualColorName:"danger"})})}},contextualColorName:"warning"})},s=()=>{const e=document.querySelector("#container--lotOccupancyComments");if(0===a.length)return void(e.innerHTML='<div class="message is-info"><p class="message-body">There are no comments associated with this record.</p></div>');const t=document.createElement("table");t.className="table is-fullwidth is-striped is-hoverable",t.innerHTML='<thead><tr><th>Commentor</th><th>Comment Date</th><th>Comment</th><th class="is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody>';for(const e of a){const c=document.createElement("tr");c.dataset.lotOccupancyCommentId=e.lotOccupancyCommentId.toString(),c.innerHTML="<td>"+cityssm.escapeHTML(e.recordCreate_userName)+"</td><td>"+e.lotOccupancyCommentDateString+(0===e.lotOccupancyCommentTime?"":" "+e.lotOccupancyCommentTimeString)+"</td><td>"+cityssm.escapeHTML(e.lotOccupancyComment)+'</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>',c.querySelector(".button--edit").addEventListener("click",o),c.querySelector(".button--delete").addEventListener("click",n),t.querySelector("tbody").append(c)}e.innerHTML="",e.append(t)};document.querySelector("#button--addComment").addEventListener("click",()=>{let o,n;const l=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyComment",o,e=>{e.success?(a=e.lotOccupancyComments,n(),s()):bulmaJS.alert({title:"Error Adding Comment",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addComment",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyCommentAdd--lotOccupancyId").value=c},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#lotOccupancyCommentAdd--lotOccupancyComment").focus(),(o=e.querySelector("form")).addEventListener("submit",l),n=t},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),s()}if(!a){let a=exports.lotOccupancyFees;delete exports.lotOccupancyFees;const n=document.querySelector("#container--lotOccupancyFees"),s=()=>{let e=0;for(const t of a)e+=(t.feeAmount+t.taxAmount)*t.quantity;return e},l=e=>{const o=e.currentTarget.closest(".container--lotOccupancyFee").dataset.feeId;bulmaJS.confirm({title:"Delete Fee",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete Fee",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyFee",{lotOccupancyId:c,feeId:o},e=>{e.success?(a=e.lotOccupancyFees,r()):bulmaJS.alert({title:"Error Deleting Fee",message:e.errorMessage,contextualColorName:"danger"})})}}})},r=()=>{if(0===a.length)return n.innerHTML='<div class="message is-info"><p class="message-body">There are no fees associated with this record.</p></div>',void m();n.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th>Fee</th><th><span class="is-sr-only">Unit Cost</span></th><th class="has-width-1"><span class="is-sr-only">&times;</span></th><th class="has-width-1"><span class="is-sr-only">Quantity</span></th><th class="has-width-1"><span class="is-sr-only">equals</span></th><th class="has-width-1 has-text-right">Total</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="5">Subtotal</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--feeAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Tax</th><td class="has-text-right" id="lotOccupancyFees--taxAmountTotal"></td><td class="is-hidden-print"></td></tr><tr><th colspan="5">Grand Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyFees--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let e=0,t=0;for(const c of a){const a=document.createElement("tr");a.className="container--lotOccupancyFee",a.dataset.feeId=c.feeId.toString(),a.dataset.includeQuantity=c.includeQuantity?"1":"0",a.innerHTML='<td colspan="'+(1===c.quantity?"5":"1")+'">'+cityssm.escapeHTML(c.feeName)+"</td>"+(1===c.quantity?"":'<td class="has-text-right">$'+c.feeAmount.toFixed(2)+'</td><td>&times;</td><td class="has-text-right">'+c.quantity+"</td><td>=</td>")+'<td class="has-text-right">$'+(c.feeAmount*c.quantity).toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Fee" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',a.querySelector("button").addEventListener("click",l),n.querySelector("tbody").append(a),e+=c.feeAmount*c.quantity,t+=c.taxAmount*c.quantity}n.querySelector("#lotOccupancyFees--feeAmountTotal").textContent="$"+e.toFixed(2),n.querySelector("#lotOccupancyFees--taxAmountTotal").textContent="$"+t.toFixed(2),n.querySelector("#lotOccupancyFees--grandTotal").textContent="$"+(e+t).toFixed(2),m()};document.querySelector("#button--addFee").addEventListener("click",()=>{if(o)return void bulmaJS.alert({message:"Please save all unsaved changes before adding fees.",contextualColorName:"warning"});let e,s,l;const i=(e,o=1)=>{cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyFee",{lotOccupancyId:c,feeId:e,quantity:o},e=>{e.success?(a=e.lotOccupancyFees,r(),d()):bulmaJS.alert({title:"Error Adding Fee",message:e.errorMessage,contextualColorName:"danger"})})},u=t=>{t.preventDefault();const c=Number.parseInt(t.currentTarget.dataset.feeId,10),a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),o=e.find(e=>e.feeCategoryId===a).fees.find(e=>e.feeId===c);o.includeQuantity?(e=>{let t,c;const a=a=>{a.preventDefault(),i(e.feeId,t.value),c()};cityssm.openHtmlModal("lotOccupancy-setFeeQuantity",{onshow:t=>{t.querySelector("#lotOccupancyFeeQuantity--quantityUnit").textContent=e.quantityUnit},onshown:(e,o)=>{c=o,t=e.querySelector("#lotOccupancyFeeQuantity--quantity"),e.querySelector("form").addEventListener("submit",a)}})})(o):i(c)},d=()=>{const t=s.value.trim().toLowerCase().split(" ");l.innerHTML="";for(const c of e){const e=document.createElement("div");e.className="container--feeCategory",e.dataset.feeCategoryId=c.feeCategoryId.toString(),e.innerHTML='<h4 class="title is-5 mt-2">'+cityssm.escapeHTML(c.feeCategory)+'</h4><div class="panel mb-5"></div>';let a=!1;for(const o of c.fees){if(n.querySelector(".container--lotOccupancyFee[data-fee-id='"+o.feeId+"'][data-include-quantity='0']"))continue;let c=!0;for(const e of t)if(!o.feeName.toLowerCase().includes(e)){c=!1;break}if(!c)continue;a=!0;const s=document.createElement("a");s.className="panel-block is-block container--fee",s.dataset.feeId=o.feeId.toString(),s.href="#",s.innerHTML="<strong>"+cityssm.escapeHTML(o.feeName)+"</strong><br /><small>"+cityssm.escapeHTML(o.feeDescription).replace(/\n/g,"<br />")+"</small>",s.addEventListener("click",u),e.querySelector(".panel").append(s)}a&&l.append(e)}};cityssm.openHtmlModal("lotOccupancy-addFee",{onshow:a=>{s=a.querySelector("#feeSelect--feeName"),l=a.querySelector("#resultsContainer--feeSelect"),cityssm.postJSON(t+"/lotOccupancies/doGetFees",{lotOccupancyId:c},t=>{e=t.feeCategories,s.disabled=!1,s.addEventListener("keyup",d),s.focus(),d()})},onshown:()=>{bulmaJS.toggleHtmlClipped()},onhidden:()=>{r()},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})});let i=exports.lotOccupancyTransactions;delete exports.lotOccupancyTransactions;const u=document.querySelector("#container--lotOccupancyTransactions"),d=()=>{let e=0;for(const t of i)e+=t.transactionAmount;return e},p=e=>{const a=e.currentTarget.closest(".container--lotOccupancyTransaction").dataset.transactionIndex;bulmaJS.confirm({title:"Delete Trasnaction",message:"Are you sure you want to delete this transaction?",contextualColorName:"warning",okButton:{text:"Yes, Delete Transaction",callbackFunction:()=>{cityssm.postJSON(t+"/lotOccupancies/doDeleteLotOccupancyTransaction",{lotOccupancyId:c,transactionIndex:a},e=>{e.success?(i=e.lotOccupancyTransactions,m()):bulmaJS.alert({title:"Error Deleting Transaction",message:e.errorMessage,contextualColorName:"danger"})})}}})},m=()=>{if(0===i.length)return void(u.innerHTML='<div class="message '+(0===a.length?"is-info":"is-warning")+'"><p class="message-body">There are no transactions associated with this record.</p></div>');u.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th class="has-width-1">Date</th><th>'+cityssm.escapeHTML(exports.aliases.externalReceiptNumber)+'</th><th class="has-text-right has-width-1">Amount</th><th class="has-width-1 is-hidden-print"><span class="is-sr-only">Options</span></th></tr></thead><tbody></tbody><tfoot><tr><th colspan="2">Transaction Total</th><td class="has-text-weight-bold has-text-right" id="lotOccupancyTransactions--grandTotal"></td><td class="is-hidden-print"></td></tr></tfoot></table>';let e=0;for(const t of i){e+=t.transactionAmount;const c=document.createElement("tr");c.className="container--lotOccupancyTransaction",c.dataset.transactionIndex=t.transactionIndex.toString(),c.innerHTML="<td>"+t.transactionDateString+"</td><td>"+cityssm.escapeHTML(t.externalReceiptNumber)+"<br /><small>"+cityssm.escapeHTML(t.transactionNote)+'</small></td><td class="has-text-right">$'+t.transactionAmount.toFixed(2)+'</td><td class="is-hidden-print"><button class="button is-small is-danger is-light" data-tooltip="Delete Transaction" type="button"><i class="fas fa-trash" aria-hidden="true"></i></button></td>',c.querySelector("button").addEventListener("click",p),u.querySelector("tbody").append(c)}u.querySelector("#lotOccupancyTransactions--grandTotal").textContent="$"+e.toFixed(2);const t=s();t>e&&u.insertAdjacentHTML("afterbegin",'<div class="message is-warning"><div class="message-body"><div class="level"><div class="level-left"><div class="level-item">Outstanding Balance</div></div><div class="level-right"><div class="level-item">$'+(t-e).toFixed(2)+"</div></div></div></div></div>")};document.querySelector("#button--addTransaction").addEventListener("click",()=>{let a;const o=e=>{e.preventDefault(),cityssm.postJSON(t+"/lotOccupancies/doAddLotOccupancyTransaction",e.currentTarget,e=>{e.success?(i=e.lotOccupancyTransactions,a(),m()):bulmaJS.confirm({title:"Error Adding Transaction",message:e.errorMessage,contextualColorName:"danger"})})};cityssm.openHtmlModal("lotOccupancy-addTransaction",{onshow:t=>{e.populateAliases(t),t.querySelector("#lotOccupancyTransactionAdd--lotOccupancyId").value=c.toString();const a=s(),o=d(),n=t.querySelector("#lotOccupancyTransactionAdd--transactionAmount");n.min=(-1*o).toFixed(2),n.max=Math.max(a-o,0).toFixed(2),n.value=Math.max(a-o,0).toFixed(2)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),a=t,e.querySelector("form").addEventListener("submit",o)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),r()}})();
\ No newline at end of file
diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js
index 78c78f91..ae8fb0cf 100644
--- a/temp/legacy.importFromCSV.js
+++ b/temp/legacy.importFromCSV.js
@@ -270,7 +270,8 @@ function importFromMasterCSV() {
                     occupantCity: masterRow.CM_CITY,
                     occupantProvince: masterRow.CM_PROV,
                     occupantPostalCode,
-                    occupantPhoneNumber: ""
+                    occupantPhoneNumber: "",
+                    occupantEmailAddress: ""
                 }, user);
                 if (masterRow.CM_REMARK1 !== "") {
                     addLotOccupancyComment({
@@ -329,7 +330,8 @@ function importFromMasterCSV() {
                     occupantCity: masterRow.CM_CITY,
                     occupantProvince: masterRow.CM_PROV,
                     occupantPostalCode: deceasedPostalCode,
-                    occupantPhoneNumber: ""
+                    occupantPhoneNumber: "",
+                    occupantEmailAddress: ""
                 }, user);
                 if (masterRow.CM_DEATH_YR !== "") {
                     const lotOccupancyFieldValue = formatDateString(masterRow.CM_DEATH_YR, masterRow.CM_DEATH_MON, masterRow.CM_DEATH_DAY);
@@ -515,7 +517,8 @@ function importFromPrepaidCSV() {
                 occupantCity: prepaidRow.CMPP_CITY,
                 occupantProvince: prepaidRow.CMPP_PROV.slice(0, 2),
                 occupantPostalCode: prepaidRow.CMPP_POSTAL1 + " " + prepaidRow.CMPP_POSTAL2,
-                occupantPhoneNumber: ""
+                occupantPhoneNumber: "",
+                occupantEmailAddress: ""
             }, user);
             if (prepaidRow.CMPP_ARRANGED_BY_NAME) {
                 addLotOccupancyOccupant({
@@ -527,7 +530,8 @@ function importFromPrepaidCSV() {
                     occupantCity: "",
                     occupantProvince: "",
                     occupantPostalCode: "",
-                    occupantPhoneNumber: ""
+                    occupantPhoneNumber: "",
+                    occupantEmailAddress: ""
                 }, user);
             }
             if (prepaidRow.CMPP_FEE_GRAV_SD !== "0.0") {
@@ -754,7 +758,8 @@ function importFromWorkOrderCSV() {
                 occupantCity: workOrderRow.WO_CITY,
                 occupantProvince: workOrderRow.WO_PROV.slice(0, 2),
                 occupantPostalCode: workOrderRow.WO_POST1 + " " + workOrderRow.WO_POST2,
-                occupantPhoneNumber: ""
+                occupantPhoneNumber: "",
+                occupantEmailAddress: ""
             }, user);
             if (workOrderRow.WO_DEATH_YR !== "") {
                 const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts
index 7dfa3c83..6f70e71c 100644
--- a/temp/legacy.importFromCSV.ts
+++ b/temp/legacy.importFromCSV.ts
@@ -560,7 +560,8 @@ function importFromMasterCSV() {
                         occupantCity: masterRow.CM_CITY,
                         occupantProvince: masterRow.CM_PROV,
                         occupantPostalCode,
-                        occupantPhoneNumber: ""
+                        occupantPhoneNumber: "",
+                        occupantEmailAddress: ""
                     },
                     user
                 );
@@ -657,7 +658,8 @@ function importFromMasterCSV() {
                         occupantCity: masterRow.CM_CITY,
                         occupantProvince: masterRow.CM_PROV,
                         occupantPostalCode: deceasedPostalCode,
-                        occupantPhoneNumber: ""
+                        occupantPhoneNumber: "",
+                        occupantEmailAddress: ""
                     },
                     user
                 );
@@ -948,7 +950,8 @@ function importFromPrepaidCSV() {
                     occupantCity: prepaidRow.CMPP_CITY,
                     occupantProvince: prepaidRow.CMPP_PROV.slice(0, 2),
                     occupantPostalCode: prepaidRow.CMPP_POSTAL1 + " " + prepaidRow.CMPP_POSTAL2,
-                    occupantPhoneNumber: ""
+                    occupantPhoneNumber: "",
+                    occupantEmailAddress: ""
                 },
                 user
             );
@@ -964,7 +967,8 @@ function importFromPrepaidCSV() {
                         occupantCity: "",
                         occupantProvince: "",
                         occupantPostalCode: "",
-                        occupantPhoneNumber: ""
+                        occupantPhoneNumber: "",
+                        occupantEmailAddress: ""
                     },
                     user
                 );
@@ -1286,7 +1290,8 @@ function importFromWorkOrderCSV() {
                     occupantCity: workOrderRow.WO_CITY,
                     occupantProvince: workOrderRow.WO_PROV.slice(0, 2),
                     occupantPostalCode: workOrderRow.WO_POST1 + " " + workOrderRow.WO_POST2,
-                    occupantPhoneNumber: ""
+                    occupantPhoneNumber: "",
+                    occupantEmailAddress: ""
                 },
                 user
             );
diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts
index 34f29a90..e1e2c3ef 100644
--- a/types/recordTypes.d.ts
+++ b/types/recordTypes.d.ts
@@ -153,6 +153,7 @@ export interface LotOccupancyOccupant extends Record {
     occupantProvince?: string;
     occupantPostalCode?: string;
     occupantPhoneNumber?: string;
+    occupantEmailAddress?: string;
 }
 export interface LotOccupancyComment extends Record {
     lotOccupancyCommentId?: number;
diff --git a/types/recordTypes.ts b/types/recordTypes.ts
index 54934958..7924bfb2 100644
--- a/types/recordTypes.ts
+++ b/types/recordTypes.ts
@@ -200,7 +200,9 @@ export interface LotOccupancyOccupant extends Record {
     occupantCity?: string;
     occupantProvince?: string;
     occupantPostalCode?: string;
+
     occupantPhoneNumber?: string;
+    occupantEmailAddress?: string;
 }
 
 export interface LotOccupancyComment extends Record {
diff --git a/views/lotOccupancy-view.ejs b/views/lotOccupancy-view.ejs
index 92f64c0e..5b836661 100644
--- a/views/lotOccupancy-view.ejs
+++ b/views/lotOccupancy-view.ejs
@@ -156,7 +156,7 @@
                     <th><%= configFunctions.getProperty("aliases.occupant") %> Type</th>
                     <th><%= configFunctions.getProperty("aliases.occupant") %></th>
                     <th>Address</th>
-                    <th>Phone Number</th>
+                    <th>Other Contact</th>
                 </tr>
             </thead>
             <tbody>
@@ -169,7 +169,7 @@
                             <%= lotOccupancyOccupant.occupantAddress1 %><br />
                         <% } %>
                         <% if (lotOccupancyOccupant.occupantAddress2) { %>
-                          <%= lotOccupancyOccupant.occupantAddress2 %><br />
+                            <%= lotOccupancyOccupant.occupantAddress2 %><br />
                         <% } %>
                         <% if (lotOccupancyOccupant.occupantCity) { %>
                             <%= lotOccupancyOccupant.occupantCity %>, 
@@ -178,7 +178,10 @@
                         <%= lotOccupancyOccupant.occupantPostalCode %>
                     </td>
                     <td>
-                        <%= lotOccupancyOccupant.occupantPhoneNumber %>
+                        <% if (lotOccupancyOccupant.occupantPhoneNumber) { %>
+                            <%= lotOccupancyOccupant.occupantPhoneNumber %><br />
+                        <% } %>
+                        <%= lotOccupancyOccupant.occupantEmailAddress %><br />  
                     </td>
                 </tr>
                 <% } %>