steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add email address to occupants

deepsource-autofix-76c6eb20
Dan Gowans 2022-10-12 10:41:48 -04:00
parent 78a624f64d
commit d0daba5121
20 changed files with 127 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helpers/initializer.database.js
View File

@ -187,6 +187,7 @@ export const initializeDatabase = () => {
" occupantProvince varchar(2)," +
" occupantPostalCode varchar(7)," +
" occupantPhoneNumber varchar(30)," +
" occupantEmailAddress varchar(200)," +
" lotOccupantTypeId integer not null," +
recordColumns +
"," +

1
helpers/initializer.database.ts
View File

@ -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 +
"," +

1
helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts vendored
View File

@ -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;

6
helpers/lotOccupancyDB/addLotOccupancyOccupant.js
View File

@ -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;
};

6
helpers/lotOccupancyDB/addLotOccupancyOccupant.ts
View File

@ -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,

3
helpers/lotOccupancyDB/getLotOccupancyOccupants.js
View File

@ -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" +

3
helpers/lotOccupancyDB/getLotOccupancyOccupants.ts
View File

@ -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" +

1
helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts vendored
View File

@ -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;

3
helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
View File

@ -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;
};

3
helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
View File

@ -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,

16
public-typescript/lotOccupancyEdit.js
View File

@ -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">' +

23
public-typescript/lotOccupancyEdit.ts
View File

@ -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">' +

33
public/html/lotOccupancy-addOccupant.html
View File

@ -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">

33
public/html/lotOccupancy-editOccupant.html
View File

@ -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">

2
public/javascripts/lotOccupancyEdit.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
temp/legacy.importFromCSV.js
View File

@ -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);

15
temp/legacy.importFromCSV.ts
View File

@ -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
);

1
types/recordTypes.d.ts vendored
View File

@ -153,6 +153,7 @@ export interface LotOccupancyOccupant extends Record {
occupantProvince?: string;
occupantPostalCode?: string;
occupantPhoneNumber?: string;
occupantEmailAddress?: string;
}
export interface LotOccupancyComment extends Record {
lotOccupancyCommentId?: number;

2
types/recordTypes.ts
View File

@ -200,7 +200,9 @@ export interface LotOccupancyOccupant extends Record {
occupantCity?: string;
occupantProvince?: string;
occupantPostalCode?: string;
occupantPhoneNumber?: string;
occupantEmailAddress?: string;
}
export interface LotOccupancyComment extends Record {

9
views/lotOccupancy-view.ejs
View File

@ -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>
<% } %>