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

linting and polishing

deepsource-autofix-76c6eb20
Dan Gowans 2022-08-24 15:42:37 -04:00
parent 0080976feb
commit aa3701e18d
18 changed files with 213 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
helpers/lotOccupancyDB/updateLotOccupancyComment.ts
View File

@ -5,10 +5,7 @@ import {
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import { import {
dateStringToInteger, dateStringToInteger
dateToInteger,
dateToTimeInteger,
timeStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js"; } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

43
public-typescript/lotOccupancyEdit.js
View File

@ -226,6 +226,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
} }
}); });
}); });
document.querySelector(".is-lot-view-button").addEventListener("click", () => {
const lotId = document.querySelector("#lotOccupancy--lotId").value;
if (lotId) {
window.open(urlPrefix + "/lots/" + lotId);
}
else {
bulmaJS.alert({
message: "No " + exports.aliases.lot.toLowerCase() + " selected.",
contextualColorName: "info"
});
}
});
document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change", () => { document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change", () => {
document.querySelector("#lotOccupancy--occupancyEndDateString").min = document.querySelector("#lotOccupancy--occupancyEndDateString").min =
document.querySelector("#lotOccupancy--occupancyStartDateString").value; document.querySelector("#lotOccupancy--occupancyStartDateString").value;
@ -347,7 +359,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
"<th>" + exports.aliases.occupant + "</th>" + "<th>" + exports.aliases.occupant + "</th>" +
"<th>Address</th>" + "<th>Address</th>" +
"<th>Phone Number</th>" + "<th>Phone Number</th>" +
"<th></th>" + "<th class=\"is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>" + "</tr></thead>" +
"<tbody></tbody>"; "<tbody></tbody>";
for (const lotOccupancyOccupant of lotOccupancyOccupants) { for (const lotOccupancyOccupant of lotOccupancyOccupants) {
@ -358,11 +370,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
("<td>" + ("<td>" +
cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />" + cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />" +
(lotOccupancyOccupant.occupantAddress2 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress2) + "<br />" : "") + (lotOccupancyOccupant.occupantAddress2 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress2) + "<br />" : "") +
cityssm.escapeHTML(lotOccupancyOccupant.occupantCity) + ", " + cityssm.escapeHTML(lotOccupancyOccupant.occupantProvince) + "<br />" + (lotOccupancyOccupant.occupantCity ? cityssm.escapeHTML(lotOccupancyOccupant.occupantCity) + ", " : "") + cityssm.escapeHTML(lotOccupancyOccupant.occupantProvince) + "<br />" +
cityssm.escapeHTML(lotOccupancyOccupant.occupantPostalCode) + cityssm.escapeHTML(lotOccupancyOccupant.occupantPostalCode) +
"</td>") + "</td>") +
("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) + "</td>") + ("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) + "</td>") +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<div class=\"buttons are-small is-justify-content-end\">" + "<div class=\"buttons are-small is-justify-content-end\">" +
("<button class=\"button is-primary button--edit\" type=\"button\">" + ("<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 class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
@ -518,7 +530,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
"<th>Commentor</th>" + "<th>Commentor</th>" +
"<th>Comment Date</th>" + "<th>Comment Date</th>" +
"<th>Comment</th>" + "<th>Comment</th>" +
"<th><span class=\"is-sr-only\">Options</span></th>" + "<th class=\"is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>" + "</tr></thead>" +
"<tbody></tbody>"; "<tbody></tbody>";
for (const lotOccupancyComment of lotOccupancyComments) { for (const lotOccupancyComment of lotOccupancyComments) {
@ -530,7 +542,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
(lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : " " + lotOccupancyComment.lotOccupancyCommentTimeString) + (lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : " " + lotOccupancyComment.lotOccupancyCommentTimeString) +
"</td>" + "</td>" +
"<td>" + cityssm.escapeHTML(lotOccupancyComment.lotOccupancyComment) + "</td>" + "<td>" + cityssm.escapeHTML(lotOccupancyComment.lotOccupancyComment) + "</td>" +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<div class=\"buttons are-small is-justify-content-end\">" + "<div class=\"buttons are-small is-justify-content-end\">" +
("<button class=\"button is-primary button--edit\" type=\"button\">" + ("<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 class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
@ -632,6 +644,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
lotOccupancyFeesContainerElement.innerHTML = "<div class=\"message is-info\">" + lotOccupancyFeesContainerElement.innerHTML = "<div class=\"message is-info\">" +
"<p class=\"message-body\">There are no fees associated with this record.</p>" + "<p class=\"message-body\">There are no fees associated with this record.</p>" +
"</div>"; "</div>";
renderLotOccupancyTransactions();
return; return;
} }
lotOccupancyFeesContainerElement.innerHTML = "<table class=\"table is-fullwidth is-striped is-hoverable\">" + lotOccupancyFeesContainerElement.innerHTML = "<table class=\"table is-fullwidth is-striped is-hoverable\">" +
@ -642,13 +655,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
"<th class=\"has-width-1\"><span class=\"is-sr-only\">Quantity</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\"><span class=\"is-sr-only\">equals</span></th>" +
"<th class=\"has-width-1 has-text-right\">Total</th>" + "<th class=\"has-width-1 has-text-right\">Total</th>" +
"<th class=\"has-width-1\"><span class=\"is-sr-only\">Options</span></th>" + "<th class=\"has-width-1 is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>") + "</tr></thead>") +
"<tbody></tbody>" + "<tbody></tbody>" +
("<tfoot>" + ("<tfoot>" +
"<tr><th colspan=\"5\">Subtotal</th><td class=\"has-text-weight-bold has-text-right\" id=\"lotOccupancyFees--feeAmountTotal\"></td><td></td></tr>" + "<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></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></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>") + "</tfoot>") +
"</table>"; "</table>";
let feeAmountTotal = 0; let feeAmountTotal = 0;
@ -667,7 +680,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
"<td class=\"has-text-right\">" + lotOccupancyFee.quantity + "</td>" + "<td class=\"has-text-right\">" + lotOccupancyFee.quantity + "</td>" +
"<td>=</td>") + "<td>=</td>") +
"<td class=\"has-text-right\">$" + (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity).toFixed(2) + "</td>" + "<td class=\"has-text-right\">$" + (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity).toFixed(2) + "</td>" +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Fee\" type=\"button\">" + "<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Fee\" type=\"button\">" +
"<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" + "<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" +
"</button>" + "</button>" +
@ -756,8 +769,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
const categoryContainerElement = document.createElement("div"); const categoryContainerElement = document.createElement("div");
categoryContainerElement.className = "container--feeCategory"; categoryContainerElement.className = "container--feeCategory";
categoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString(); categoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString();
categoryContainerElement.innerHTML = "<h4 class=\"title is-5\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h4>" + categoryContainerElement.innerHTML = "<h4 class=\"title is-5 mt-2\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h4>" +
"<div class=\"panel\"></div>"; "<div class=\"panel mb-5\"></div>";
let hasFees = false; let hasFees = false;
for (const fee of feeCategory.fees) { for (const fee of feeCategory.fees) {
if (lotOccupancyFeesContainerElement.querySelector(".container--lotOccupancyFee[data-fee-id='" + fee.feeId + "']")) { if (lotOccupancyFeesContainerElement.querySelector(".container--lotOccupancyFee[data-fee-id='" + fee.feeId + "']")) {
@ -864,13 +877,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
"<th class=\"has-width-1\">Date</th>" + "<th class=\"has-width-1\">Date</th>" +
"<th>" + cityssm.escapeHTML(exports.aliases.externalReceiptNumber) + "</th>" + "<th>" + cityssm.escapeHTML(exports.aliases.externalReceiptNumber) + "</th>" +
"<th class=\"has-text-right has-width-1\">Amount</th>" + "<th class=\"has-text-right has-width-1\">Amount</th>" +
"<th class=\"has-width-1\"><span class=\"is-sr-only\">Options</span></th>" + "<th class=\"has-width-1 is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>" + "</tr></thead>" +
"<tbody></tbody>" + "<tbody></tbody>" +
("<tfoot><tr>" + ("<tfoot><tr>" +
"<th colspan=\"2\">Transaction Total</th>" + "<th colspan=\"2\">Transaction Total</th>" +
"<td class=\"has-text-weight-bold has-text-right\" id=\"lotOccupancyTransactions--grandTotal\"></td>" + "<td class=\"has-text-weight-bold has-text-right\" id=\"lotOccupancyTransactions--grandTotal\"></td>" +
"<td></td>" + "<td class=\"is-hidden-print\"></td>" +
"</tr></tfoot>") + "</tr></tfoot>") +
"</table>"; "</table>";
let transactionGrandTotal = 0; let transactionGrandTotal = 0;
@ -885,7 +898,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
"<small>" + cityssm.escapeHTML(lotOccupancyTransaction.transactionNote) + "</small>" + "<small>" + cityssm.escapeHTML(lotOccupancyTransaction.transactionNote) + "</small>" +
"</td>") + "</td>") +
("<td class=\"has-text-right\">$" + lotOccupancyTransaction.transactionAmount.toFixed(2) + "</td>") + ("<td class=\"has-text-right\">$" + lotOccupancyTransaction.transactionAmount.toFixed(2) + "</td>") +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Transaction\" type=\"button\">" + "<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Transaction\" type=\"button\">" +
"<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" + "<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" +
"</button>" + "</button>" +

80
public-typescript/lotOccupancyEdit.ts
View File

@ -336,6 +336,20 @@ declare const bulmaJS: BulmaJS;
}); });
}); });
document.querySelector(".is-lot-view-button").addEventListener("click", () => {
const lotId = (document.querySelector("#lotOccupancy--lotId") as HTMLInputElement).value;
if (lotId) {
window.open(urlPrefix + "/lots/" + lotId);
} else {
bulmaJS.alert({
message: "No " + exports.aliases.lot.toLowerCase() + " selected.",
contextualColorName: "info"
});
}
});
// Start Date // Start Date
document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change", () => { document.querySelector("#lotOccupancy--occupancyStartDateString").addEventListener("change", () => {
@ -504,7 +518,7 @@ declare const bulmaJS: BulmaJS;
"<th>" + exports.aliases.occupant + "</th>" + "<th>" + exports.aliases.occupant + "</th>" +
"<th>Address</th>" + "<th>Address</th>" +
"<th>Phone Number</th>" + "<th>Phone Number</th>" +
"<th></th>" + "<th class=\"is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>" + "</tr></thead>" +
"<tbody></tbody>"; "<tbody></tbody>";
@ -518,11 +532,11 @@ declare const bulmaJS: BulmaJS;
("<td>" + ("<td>" +
cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />" + cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress1) + "<br />" +
(lotOccupancyOccupant.occupantAddress2 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress2) + "<br />" : "") + (lotOccupancyOccupant.occupantAddress2 ? cityssm.escapeHTML(lotOccupancyOccupant.occupantAddress2) + "<br />" : "") +
cityssm.escapeHTML(lotOccupancyOccupant.occupantCity) + ", " + cityssm.escapeHTML(lotOccupancyOccupant.occupantProvince) + "<br />" + (lotOccupancyOccupant.occupantCity ? cityssm.escapeHTML(lotOccupancyOccupant.occupantCity) + ", " : "") + cityssm.escapeHTML(lotOccupancyOccupant.occupantProvince) + "<br />" +
cityssm.escapeHTML(lotOccupancyOccupant.occupantPostalCode) + cityssm.escapeHTML(lotOccupancyOccupant.occupantPostalCode) +
"</td>") + "</td>") +
("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) + "</td>") + ("<td>" + cityssm.escapeHTML(lotOccupancyOccupant.occupantPhoneNumber) + "</td>") +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<div class=\"buttons are-small is-justify-content-end\">" + "<div class=\"buttons are-small is-justify-content-end\">" +
("<button class=\"button is-primary button--edit\" type=\"button\">" + ("<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 class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
@ -737,7 +751,7 @@ declare const bulmaJS: BulmaJS;
"<th>Commentor</th>" + "<th>Commentor</th>" +
"<th>Comment Date</th>" + "<th>Comment Date</th>" +
"<th>Comment</th>" + "<th>Comment</th>" +
"<th><span class=\"is-sr-only\">Options</span></th>" + "<th class=\"is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>" + "</tr></thead>" +
"<tbody></tbody>"; "<tbody></tbody>";
@ -752,7 +766,7 @@ declare const bulmaJS: BulmaJS;
(lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : " " + lotOccupancyComment.lotOccupancyCommentTimeString) + (lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : " " + lotOccupancyComment.lotOccupancyCommentTimeString) +
"</td>" + "</td>" +
"<td>" + cityssm.escapeHTML(lotOccupancyComment.lotOccupancyComment) + "</td>" + "<td>" + cityssm.escapeHTML(lotOccupancyComment.lotOccupancyComment) + "</td>" +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<div class=\"buttons are-small is-justify-content-end\">" + "<div class=\"buttons are-small is-justify-content-end\">" +
("<button class=\"button is-primary button--edit\" type=\"button\">" + ("<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 class=\"icon is-small\"><i class=\"fas fa-pencil-alt\" aria-hidden=\"true\"></i></span>" +
@ -897,6 +911,8 @@ declare const bulmaJS: BulmaJS;
"<p class=\"message-body\">There are no fees associated with this record.</p>" + "<p class=\"message-body\">There are no fees associated with this record.</p>" +
"</div>"; "</div>";
renderLotOccupancyTransactions();
return; return;
} }
@ -908,13 +924,13 @@ declare const bulmaJS: BulmaJS;
"<th class=\"has-width-1\"><span class=\"is-sr-only\">Quantity</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\"><span class=\"is-sr-only\">equals</span></th>" +
"<th class=\"has-width-1 has-text-right\">Total</th>" + "<th class=\"has-width-1 has-text-right\">Total</th>" +
"<th class=\"has-width-1\"><span class=\"is-sr-only\">Options</span></th>" + "<th class=\"has-width-1 is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>") + "</tr></thead>") +
"<tbody></tbody>" + "<tbody></tbody>" +
("<tfoot>" + ("<tfoot>" +
"<tr><th colspan=\"5\">Subtotal</th><td class=\"has-text-weight-bold has-text-right\" id=\"lotOccupancyFees--feeAmountTotal\"></td><td></td></tr>" + "<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></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></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>") + "</tfoot>") +
"</table>"; "</table>";
@ -937,7 +953,7 @@ declare const bulmaJS: BulmaJS;
"<td class=\"has-text-right\">" + lotOccupancyFee.quantity + "</td>" + "<td class=\"has-text-right\">" + lotOccupancyFee.quantity + "</td>" +
"<td>=</td>") + "<td>=</td>") +
"<td class=\"has-text-right\">$" + (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity).toFixed(2) + "</td>" + "<td class=\"has-text-right\">$" + (lotOccupancyFee.feeAmount * lotOccupancyFee.quantity).toFixed(2) + "</td>" +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Fee\" type=\"button\">" + "<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Fee\" type=\"button\">" +
"<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" + "<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" +
"</button>" + "</button>" +
@ -1057,8 +1073,8 @@ declare const bulmaJS: BulmaJS;
const categoryContainerElement = document.createElement("div"); const categoryContainerElement = document.createElement("div");
categoryContainerElement.className = "container--feeCategory"; categoryContainerElement.className = "container--feeCategory";
categoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString(); categoryContainerElement.dataset.feeCategoryId = feeCategory.feeCategoryId.toString();
categoryContainerElement.innerHTML = "<h4 class=\"title is-5\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h4>" + categoryContainerElement.innerHTML = "<h4 class=\"title is-5 mt-2\">" + cityssm.escapeHTML(feeCategory.feeCategory) + "</h4>" +
"<div class=\"panel\"></div>"; "<div class=\"panel mb-5\"></div>";
let hasFees = false; let hasFees = false;
@ -1204,14 +1220,14 @@ declare const bulmaJS: BulmaJS;
"<th class=\"has-width-1\">Date</th>" + "<th class=\"has-width-1\">Date</th>" +
"<th>" + cityssm.escapeHTML(exports.aliases.externalReceiptNumber) + "</th>" + "<th>" + cityssm.escapeHTML(exports.aliases.externalReceiptNumber) + "</th>" +
"<th class=\"has-text-right has-width-1\">Amount</th>" + "<th class=\"has-text-right has-width-1\">Amount</th>" +
"<th class=\"has-width-1\"><span class=\"is-sr-only\">Options</span></th>" + "<th class=\"has-width-1 is-hidden-print\"><span class=\"is-sr-only\">Options</span></th>" +
"</tr></thead>" + "</tr></thead>" +
"<tbody></tbody>" + "<tbody></tbody>" +
("<tfoot><tr>" + ("<tfoot><tr>" +
"<th colspan=\"2\">Transaction Total</th>" + "<th colspan=\"2\">Transaction Total</th>" +
"<td class=\"has-text-weight-bold has-text-right\" id=\"lotOccupancyTransactions--grandTotal\"></td>" + "<td class=\"has-text-weight-bold has-text-right\" id=\"lotOccupancyTransactions--grandTotal\"></td>" +
"<td></td>" + "<td class=\"is-hidden-print\"></td>" +
"</tr></tfoot>") + "</tr></tfoot>") +
"</table>"; "</table>";
let transactionGrandTotal = 0; let transactionGrandTotal = 0;
@ -1230,11 +1246,11 @@ declare const bulmaJS: BulmaJS;
"<small>" + cityssm.escapeHTML(lotOccupancyTransaction.transactionNote) + "</small>" + "<small>" + cityssm.escapeHTML(lotOccupancyTransaction.transactionNote) + "</small>" +
"</td>") + "</td>") +
("<td class=\"has-text-right\">$" + lotOccupancyTransaction.transactionAmount.toFixed(2) + "</td>") + ("<td class=\"has-text-right\">$" + lotOccupancyTransaction.transactionAmount.toFixed(2) + "</td>") +
("<td>" + ("<td class=\"is-hidden-print\">" +
"<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Transaction\" type=\"button\">" + "<button class=\"button is-small is-danger is-light\" data-tooltip=\"Delete Transaction\" type=\"button\">" +
"<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" + "<i class=\"fas fa-trash\" aria-hidden=\"true\"></i>" +
"</button>" + "</button>" +
"</td>"); "</td>");
tableRowElement.querySelector("button").addEventListener("click", deleteLotOccupancyTransaction); tableRowElement.querySelector("button").addEventListener("click", deleteLotOccupancyTransaction);
@ -1246,16 +1262,16 @@ declare const bulmaJS: BulmaJS;
const feeGrandTotal = getFeeGrandTotal(); const feeGrandTotal = getFeeGrandTotal();
if (feeGrandTotal > transactionGrandTotal) { if (feeGrandTotal > transactionGrandTotal) {
lotOccupancyTransactionsContainerElement.insertAdjacentHTML("afterbegin", lotOccupancyTransactionsContainerElement.insertAdjacentHTML("afterbegin",
"<div class=\"message is-warning\">" + "<div class=\"message is-warning\">" +
"<div class=\"message-body\">" + "<div class=\"message-body\">" +
"<div class=\"level\">" + "<div class=\"level\">" +
"<div class=\"level-left\"><div class=\"level-item\">Outstanding Balance</div></div>" + "<div class=\"level-left\"><div class=\"level-item\">Outstanding Balance</div></div>" +
"<div class=\"level-right\"><div class=\"level-item\">$" + (feeGrandTotal - transactionGrandTotal).toFixed(2) + "</div></div>" + "<div class=\"level-right\"><div class=\"level-item\">$" + (feeGrandTotal - transactionGrandTotal).toFixed(2) + "</div></div>" +
"</div>" + "</div>" +
"</div>" + "</div>" +
"</div>"); "</div>");
} }
}; };

2
public/html/adminFees-addFee.html
View File

@ -20,7 +20,7 @@
<div class="field"> <div class="field">
<label class="label" for="feeAdd--feeName">Fee Name</label> <label class="label" for="feeAdd--feeName">Fee Name</label>
<div class="control"> <div class="control">
<input class="input" id="feeAdd--feeName" name="feeName" maxlength="100" required /> <input class="input" id="feeAdd--feeName" name="feeName" maxlength="100" autocomplete="off" required />
</div> </div>
</div> </div>
<div class="field"> <div class="field">

2
public/html/adminFees-addFeeCategory.html
View File

@ -12,7 +12,7 @@
<div class="field"> <div class="field">
<label class="label" for="feeCategoryAdd--feeCategory">New Fee Category</label> <label class="label" for="feeCategoryAdd--feeCategory">New Fee Category</label>
<div class="control"> <div class="control">
<input class="input" id="feeCategoryAdd--feeCategory" name="feeCategory" maxlength="100" required /> <input class="input" id="feeCategoryAdd--feeCategory" name="feeCategory" maxlength="100" autocomplete="off" required />
</div> </div>
</div> </div>
</form> </form>

2
public/html/adminFees-editFee.html
View File

@ -21,7 +21,7 @@
<div class="field"> <div class="field">
<label class="label" for="feeEdit--feeName">Fee Name</label> <label class="label" for="feeEdit--feeName">Fee Name</label>
<div class="control"> <div class="control">
<input class="input" id="feeEdit--feeName" name="feeName" maxlength="100" required /> <input class="input" id="feeEdit--feeName" name="feeName" maxlength="100" autocomplete="off" required />
</div> </div>
</div> </div>
<div class="field"> <div class="field">

2
public/html/adminFees-editFeeCategory.html
View File

@ -13,7 +13,7 @@
<div class="field"> <div class="field">
<label class="label" for="feeCategoryEdit--feeCategory">Fee Category</label> <label class="label" for="feeCategoryEdit--feeCategory">Fee Category</label>
<div class="control"> <div class="control">
<input class="input" id="feeCategoryEdit--feeCategory" name="feeCategory" maxlength="100" required /> <input class="input" id="feeCategoryEdit--feeCategory" name="feeCategory" maxlength="100" autocomplete="off" required />
</div> </div>
</div> </div>
</form> </form>

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

@ -23,18 +23,18 @@
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantAdd--occupantName"><span class="alias" data-alias="Occupant"></span> Name</label> <label class="label" for="lotOccupancyOccupantAdd--occupantName"><span class="alias" data-alias="Occupant"></span> Name</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantAdd--occupantName" name="occupantName" maxlength="200" required /> <input class="input" id="lotOccupancyOccupantAdd--occupantName" name="occupantName" maxlength="200" autocomplete="off" required />
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantAdd--occupantAddress1">Address</label> <label class="label" for="lotOccupancyOccupantAdd--occupantAddress1">Address</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantAdd--occupantAddress1" name="occupantAddress1" maxlength="50" placeholder="Line 1" /> <input class="input" id="lotOccupancyOccupantAdd--occupantAddress1" name="occupantAddress1" maxlength="50" placeholder="Line 1" autocomplete="off" />
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantAdd--occupantAddress2" name="occupantAddress2" maxlength="50" placeholder="Line 2" aria-label="Address Line 2" /> <input class="input" id="lotOccupancyOccupantAdd--occupantAddress2" name="occupantAddress2" maxlength="50" placeholder="Line 2" autocomplete="off" aria-label="Address Line 2" />
</div> </div>
</div> </div>
<div class="columns"> <div class="columns">
@ -58,7 +58,7 @@
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantAdd--occupantPostalCode">Postal Code</label> <label class="label" for="lotOccupancyOccupantAdd--occupantPostalCode">Postal Code</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantAdd--occupantPostalCode" name="occupantPostalCode" maxlength="7" /> <input class="input" id="lotOccupancyOccupantAdd--occupantPostalCode" name="occupantPostalCode" maxlength="7" autocomplete="off" />
</div> </div>
</div> </div>
</div> </div>
@ -66,7 +66,7 @@
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantAdd--occupantPhoneNumber">Phone Number</label> <label class="label" for="lotOccupancyOccupantAdd--occupantPhoneNumber">Phone Number</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantAdd--occupantPhoneNumber" name="occupantPhoneNumber" maxlength="30" /> <input class="input" id="lotOccupancyOccupantAdd--occupantPhoneNumber" name="occupantPhoneNumber" maxlength="30" autocomplete="off" />
</div> </div>
</div> </div>
</form> </form>

2
public/html/lotOccupancy-addTransaction.html
View File

@ -25,7 +25,7 @@
<span class="alias" data-alias="ExternalReceiptNumber"></span> <span class="alias" data-alias="ExternalReceiptNumber"></span>
</label> </label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyTransactionAdd--externalReceiptNumber" name="externalReceiptNumber" maxlength="100" /> <input class="input" id="lotOccupancyTransactionAdd--externalReceiptNumber" name="externalReceiptNumber" maxlength="100" autocomplete="off" />
</div> </div>
</div> </div>
<div class="field"> <div class="field">

2
public/html/lotOccupancy-editComment.html
View File

@ -3,7 +3,7 @@
<div class="modal-card"> <div class="modal-card">
<header class="modal-card-head"> <header class="modal-card-head">
<h3 class="modal-card-title"> <h3 class="modal-card-title">
Add Comment Edit Comment
</h3> </h3>
<button class="delete is-close-modal-button" aria-label="close" type="button"></button> <button class="delete is-close-modal-button" aria-label="close" type="button"></button>
</header> </header>

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

@ -22,18 +22,18 @@
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantEdit--occupantName"><span class="alias" data-alias="Occupant"></span> Name</label> <label class="label" for="lotOccupancyOccupantEdit--occupantName"><span class="alias" data-alias="Occupant"></span> Name</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantEdit--occupantName" name="occupantName" maxlength="200" required /> <input class="input" id="lotOccupancyOccupantEdit--occupantName" name="occupantName" maxlength="200" autocomplete="off" required />
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantEdit--occupantAddress1">Address</label> <label class="label" for="lotOccupancyOccupantEdit--occupantAddress1">Address</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantEdit--occupantAddress1" name="occupantAddress1" maxlength="50" placeholder="Line 1" /> <input class="input" id="lotOccupancyOccupantEdit--occupantAddress1" name="occupantAddress1" maxlength="50" placeholder="Line 1" autocomplete="off" />
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantEdit--occupantAddress2" name="occupantAddress2" maxlength="50" placeholder="Line 2" aria-label="Address Line 2" /> <input class="input" id="lotOccupancyOccupantEdit--occupantAddress2" name="occupantAddress2" maxlength="50" placeholder="Line 2" aria-label="Address Line 2" autocomplete="off" />
</div> </div>
</div> </div>
<div class="columns"> <div class="columns">
@ -57,7 +57,7 @@
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantEdit--occupantPostalCode">Postal Code</label> <label class="label" for="lotOccupancyOccupantEdit--occupantPostalCode">Postal Code</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantEdit--occupantPostalCode" name="occupantPostalCode" maxlength="7" /> <input class="input" id="lotOccupancyOccupantEdit--occupantPostalCode" name="occupantPostalCode" maxlength="7" autocomplete="off" />
</div> </div>
</div> </div>
</div> </div>
@ -65,7 +65,7 @@
<div class="field"> <div class="field">
<label class="label" for="lotOccupancyOccupantEdit--occupantPhoneNumber">Phone Number</label> <label class="label" for="lotOccupancyOccupantEdit--occupantPhoneNumber">Phone Number</label>
<div class="control"> <div class="control">
<input class="input" id="lotOccupancyOccupantEdit--occupantPhoneNumber" name="occupantPhoneNumber" maxlength="30" /> <input class="input" id="lotOccupancyOccupantEdit--occupantPhoneNumber" name="occupantPhoneNumber" maxlength="30" autocomplete="off" />
</div> </div>
</div> </div>
</form> </form>

2
public/html/lotOccupancy-setFeeQuantity.html
View File

@ -12,7 +12,7 @@
<label class="label" for="lotOccupancyFeeQuantity--quantity">Quantity</label> <label class="label" for="lotOccupancyFeeQuantity--quantity">Quantity</label>
<div class="field has-addons"> <div class="field has-addons">
<div class="control is-expanded"> <div class="control is-expanded">
<input class="input" id="lotOccupancyFeeQuantity--quantity" name="quantity" type="number" value="1" min="0.1" max="999.9" step="0.1" required /> <input class="input" id="lotOccupancyFeeQuantity--quantity" name="quantity" type="number" value="1" min="0.1" max="999.9" step="0.1" required onwheel="return false" />
</div> </div>
<div class="control"> <div class="control">
<span class="button is-static" id="lotOccupancyFeeQuantity--quantityUnit"></span> <span class="button is-static" id="lotOccupancyFeeQuantity--quantityUnit"></span>

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

File diff suppressed because one or more lines are too long

158
views/lot-search.ejs
View File

@ -1,92 +1,106 @@
<%- include('_header'); -%> <%- include('_header'); -%>
<nav class="breadcrumb"> <nav class="breadcrumb">
<ul> <ul>
<li><a href="<%= urlPrefix %>/dashboard">Home</a></li> <li><a href="<%= urlPrefix %>/dashboard">Home</a></li>
<li class="is-active"><a href="#" aria-current="page"> <li class="is-active">
<span class="icon is-small"><i class="fas fa-vector-square" aria-hidden="true"></i></span> <a href="#" aria-current="page">
<span><%= configFunctions.getProperty("aliases.lots") %></span> <span class="icon is-small"><i class="fas fa-vector-square" aria-hidden="true"></i></span>
</a></li> <span><%= configFunctions.getProperty("aliases.lots") %></span>
</ul> </a>
</li>
</ul>
</nav> </nav>
<h1 class="title is-1"> <h1 class="title is-1">
Find a <%= configFunctions.getProperty("aliases.lot") %> Find a <%= configFunctions.getProperty("aliases.lot") %>
</h1> </h1>
<% if (user.userProperties.canUpdate) { %> <% if (user.userProperties.canUpdate) { %>
<div class="fixed-container is-fixed-bottom-right mx-4 my-4 has-text-right is-hidden-print"> <div class="fixed-container is-fixed-bottom-right mx-4 my-4 has-text-right is-hidden-print">
<a class="button is-circle is-primary has-tooltip-left" data-tooltip="Create a New <%= configFunctions.getProperty("aliases.lot") %>" href="<%= urlPrefix %>/lots/new"> <a class="button is-circle is-primary has-tooltip-left" data-tooltip="Create a New <%= configFunctions.getProperty("aliases.lot") %>" href="<%= urlPrefix %>/lots/new">
<i class="fas fa-plus" aria-hidden="true"></i> <i class="fas fa-plus" aria-hidden="true"></i>
<span class="sr-only">Create a New <%= configFunctions.getProperty("aliases.lot") %></span> <span class="sr-only">Create a New <%= configFunctions.getProperty("aliases.lot") %></span>
</a> </a>
</div> </div>
<% } %> <% } %>
<div class="box"> <div class="box">
<form id="form--searchFilters"> <form id="form--searchFilters">
<input id="searchFilter--limit" name="limit" type="hidden" value="100" /> <input id="searchFilter--limit" name="limit" type="hidden" value="100" />
<input id="searchFilter--offset" name="offset" type="hidden" value="0" /> <input id="searchFilter--offset" name="offset" type="hidden" value="0" />
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<div class="field"> <div class="field">
<label class="label" for="searchFilter--lotName"><%= configFunctions.getProperty("aliases.lot") %></label> <label class="label" for="searchFilter--lotName"><%= configFunctions.getProperty("aliases.lot") %></label>
<div class="control"> <div class="control has-icons-left">
<input class="input" id="searchFilter--lotName" name="lotName" /> <input class="input" id="searchFilter--lotName" name="lotName" />
</div> <span class="icon is-small is-left">
</div> <i class="fas fa-search" aria-hidden="true"></i>
</div> </span>
<div class="column">
<div class="field">
<label class="label" for="searchFilter--lotTypeId"><%= configFunctions.getProperty("aliases.lot") %> Type</label>
<div class="control">
<div class="select is-fullwidth">
<select id="searchFilter--lotTypeId" name="lotTypeId">
<option value="">(All <%= configFunctions.getProperty("aliases.lot") %> Types)</option>
<% for (const lotType of lotTypes) { %>
<option value="<%= lotType.lotTypeId %>"><%= lotType.lotType || "(No Name)" %></option>
<% } %>
</select>
</div> </div>
</div>
</div>
</div>
</div>
<div class="columns">
<div class="column">
<div class="field">
<label class="label" for="searchFilter--mapId"><%= configFunctions.getProperty("aliases.map") %></label>
<div class="control">
<div class="select is-fullwidth">
<select id="searchFilter--mapId" name="mapId">
<option value="">(All <%= configFunctions.getProperty("aliases.maps") %>)</option>
<% for (const map of maps) { %>
<option value="<%= map.mapId %>" <%= (map.mapId.toString() === mapId) ? " selected" : "" %>>
<%= map.mapName || "(No Name)" %>
</option>
<% } %>
</select>
</div> </div>
</div>
</div> </div>
</div> <div class="column">
<div class="column"> <div class="field">
<div class="field"> <label class="label" for="searchFilter--lotTypeId"><%= configFunctions.getProperty("aliases.lot") %> Type</label>
<label class="label" for="searchFilter--lotStatusId">Status</label> <div class="control has-icons-left">
<div class="control"> <div class="select is-fullwidth">
<div class="select is-fullwidth"> <select id="searchFilter--lotTypeId" name="lotTypeId">
<select id="searchFilter--lotStatusId" name="lotStatusId"> <option value="">(All <%= configFunctions.getProperty("aliases.lot") %> Types)</option>
<option value="">(All Statuses)</option> <% for (const lotType of lotTypes) { %>
<% for (const lotStatus of lotStatuses) { %> <option value="<%= lotType.lotTypeId %>"><%= lotType.lotType || "(No Name)" %></option>
<option value="<%= lotStatus.lotStatusId %>"><%= lotStatus.lotStatus %></option> <% } %>
<% } %> </select>
</select> </div>
<span class="icon is-small is-left">
<i class="fas fa-search" aria-hidden="true"></i>
</span>
</div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> <div class="columns">
</form> <div class="column">
<div class="field">
<label class="label" for="searchFilter--mapId"><%= configFunctions.getProperty("aliases.map") %></label>
<div class="control has-icons-left">
<div class="select is-fullwidth">
<select id="searchFilter--mapId" name="mapId">
<option value="">(All <%= configFunctions.getProperty("aliases.maps") %>)</option>
<% for (const map of maps) { %>
<option value="<%= map.mapId %>" <%= (map.mapId.toString() === mapId) ? " selected" : "" %>>
<%= map.mapName || "(No Name)" %>
</option>
<% } %>
</select>
</div>
<span class="icon is-small is-left">
<i class="fas fa-search" aria-hidden="true"></i>
</span>
</div>
</div>
</div>
<div class="column">
<div class="field">
<label class="label" for="searchFilter--lotStatusId">Status</label>
<div class="control has-icons-left">
<div class="select is-fullwidth">
<select id="searchFilter--lotStatusId" name="lotStatusId">
<option value="">(All Statuses)</option>
<% for (const lotStatus of lotStatuses) { %>
<option value="<%= lotStatus.lotStatusId %>"><%= lotStatus.lotStatus %></option>
<% } %>
</select>
</div>
<span class="icon is-small is-left">
<i class="fas fa-search" aria-hidden="true"></i>
</span>
</div>
</div>
</div>
</div>
</form>
</div> </div>
<div id="container--searchResults"></div> <div id="container--searchResults"></div>

24
views/lotOccupancy-edit.ejs
View File

@ -48,7 +48,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item is-justify-content-right"> <div class="level-item is-justify-content-right">
<a class="button is-link" href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>/print" target="_blank"> <a class="button is-link is-hidden-print" href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>/print" target="_blank">
<span class="icon is-small"><i class="fas fa-print" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-print" aria-hidden="true"></i></span>
<span>Print</span> <span>Print</span>
</a> </a>
@ -96,14 +96,13 @@
</select> </select>
</div> </div>
</div> </div>
<div class="control"> <div class="control is-hidden-print">
<button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock <%= configFunctions.getProperty("aliases.occupancy") %> Type Field"> <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock <%= configFunctions.getProperty("aliases.occupancy") %> Type Field">
<i class="fas fa-unlock" aria-hidden="true"></i> <i class="fas fa-unlock" aria-hidden="true"></i>
</button> </button>
</div> </div>
</div> </div>
</div>
<div class="column">
<input id="lotOccupancy--lotId" name="lotId" type="hidden" value="<%= lotOccupancy.lotId %>" /> <input id="lotOccupancy--lotId" name="lotId" type="hidden" value="<%= lotOccupancy.lotId %>" />
<label class="label" for="lotOccupancy--lotName"> <label class="label" for="lotOccupancy--lotName">
<%= configFunctions.getProperty("aliases.lot") %> <%= configFunctions.getProperty("aliases.lot") %>
@ -114,11 +113,16 @@
<%= (configFunctions.getProperty("settings.lotOccupancy.lotIdIsRequired") ? " required" : "") %> <%= (configFunctions.getProperty("settings.lotOccupancy.lotIdIsRequired") ? " required" : "") %>
<%= (isCreate ? "" : " disabled") %> /> <%= (isCreate ? "" : " disabled") %> />
</div> </div>
<div class="control"> <div class="control is-hidden-print">
<button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock <%= configFunctions.getProperty("aliases.lot") %></button> Field"> <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock <%= configFunctions.getProperty("aliases.lot") %></button> Field">
<i class="fas fa-unlock" aria-hidden="true"></i> <i class="fas fa-unlock" aria-hidden="true"></i>
</button> </button>
</div> </div>
<div class="control is-hidden-print">
<button class="button is-lot-view-button" data-tooltip="Open <%= configFunctions.getProperty("aliases.lot") %>" type="button" aria-label="Open <%= configFunctions.getProperty("aliases.lot") %>">
<i class="fas fa-external-link-alt" aria-hidden="true"></i>
</button>
</div>
</div> </div>
</div> </div>
<div class="column"> <div class="column">
@ -181,7 +185,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="panel-block is-justify-content-right"> <div class="panel-block is-justify-content-right is-hidden-print">
<button class="button is-primary" type="submit"> <button class="button is-primary" type="submit">
<span class="icon is-small"><i class="fas fa-save" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-save" aria-hidden="true"></i></span>
<span> <span>
@ -229,7 +233,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item"> <div class="level-item">
<button class="button is-small is-success" id="button--addOccupant" type="button"> <button class="button is-small is-success is-hidden-print" id="button--addOccupant" type="button">
<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
<span>Add <%= configFunctions.getProperty("aliases.occupant") %></span> <span>Add <%= configFunctions.getProperty("aliases.occupant") %></span>
</button> </button>
@ -250,7 +254,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item"> <div class="level-item">
<button class="button is-small is-success" id="button--addComment" type="button"> <button class="button is-small is-success is-hidden-print" id="button--addComment" type="button">
<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
<span>Add Comment</span> <span>Add Comment</span>
</button> </button>
@ -273,7 +277,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item"> <div class="level-item">
<button class="button is-small is-success" id="button--addFee" type="button"> <button class="button is-small is-success is-hidden-print" id="button--addFee" type="button">
<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
<span>Add Fee</span> <span>Add Fee</span>
</button> </button>
@ -295,7 +299,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item"> <div class="level-item">
<button class="button is-small is-success" id="button--addTransaction" type="button"> <button class="button is-small is-success is-hidden-print" id="button--addTransaction" type="button">
<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
<span>Add Transaction</span> <span>Add Transaction</span>
</button> </button>

7
views/lotOccupancy-print.ejs
View File

@ -80,9 +80,12 @@
<td> <td>
<%= lotOccupancyOccupant.occupantAddress1 %><br /> <%= lotOccupancyOccupant.occupantAddress1 %><br />
<% if (lotOccupancyOccupant.occupantAddress2 && lotOccupancyOccupant.occupantAddress2 !== "") { %> <% if (lotOccupancyOccupant.occupantAddress2 && lotOccupancyOccupant.occupantAddress2 !== "") { %>
<%= lotOccupancyOccupant.occupantAddress2 %><br /> <%= lotOccupancyOccupant.occupantAddress2 %><br />
<% } %> <% } %>
<%= lotOccupancyOccupant.occupantCity %>, <%= lotOccupancyOccupant.occupantProvince %><br /> <% if (lotOccupancyOccupant.occupantCity) { %>
<%= lotOccupancyOccupant.occupantCity %>,
<% } %>
<%= lotOccupancyOccupant.occupantProvince %><br />
<%= lotOccupancyOccupant.occupantPostalCode %> <%= lotOccupancyOccupant.occupantPostalCode %>
</td> </td>
<td> <td>

9
views/lotOccupancy-view.ejs
View File

@ -33,7 +33,7 @@
</div> </div>
<div class="level-right"> <div class="level-right">
<div class="level-item is-justify-content-right"> <div class="level-item is-justify-content-right">
<a class="button is-link" href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>/print" target="_blank"> <a class="button is-link is-hidden-print" href="<%= urlPrefix %>/lotOccupancies/<%= lotOccupancy.lotOccupancyId %>/print" target="_blank">
<span class="icon is-small"><i class="fas fa-print" aria-hidden="true"></i></span> <span class="icon is-small"><i class="fas fa-print" aria-hidden="true"></i></span>
<span>Print</span> <span>Print</span>
</a> </a>
@ -132,10 +132,13 @@
<td><%= lotOccupancyOccupant.occupantName %></td> <td><%= lotOccupancyOccupant.occupantName %></td>
<td> <td>
<%= lotOccupancyOccupant.occupantAddress1 %><br /> <%= lotOccupancyOccupant.occupantAddress1 %><br />
<% if (lotOccupancyOccupant.occupantAddress2 && lotOccupancyOccupant.occupantAddress2 !== "") { %> <% if (lotOccupancyOccupant.occupantAddress2) { %>
<%= lotOccupancyOccupant.occupantAddress2 %><br /> <%= lotOccupancyOccupant.occupantAddress2 %><br />
<% } %> <% } %>
<%= lotOccupancyOccupant.occupantCity %>, <%= lotOccupancyOccupant.occupantProvince %><br /> <% if (lotOccupancyOccupant.occupantCity) { %>
<%= lotOccupancyOccupant.occupantCity %>,
<% } %>
<%= lotOccupancyOccupant.occupantProvince %><br />
<%= lotOccupancyOccupant.occupantPostalCode %> <%= lotOccupancyOccupant.occupantPostalCode %>
</td> </td>
<td> <td>

14
views/map-edit.ejs
View File

@ -18,9 +18,9 @@
<li class="is-active"> <li class="is-active">
<a href="#" aria-current="page"> <a href="#" aria-current="page">
<% if (isCreate) { %> <% if (isCreate) { %>
Create a New <%= configFunctions.getProperty("aliases.map") %> Create a New <%= configFunctions.getProperty("aliases.map") %>
<% } else { %> <% } else { %>
Update Update
<% } %> <% } %>
</a> </a>
</li> </li>
@ -31,7 +31,7 @@
<% if (isCreate) { %> <% if (isCreate) { %>
Create a New <%= configFunctions.getProperty("aliases.map") %> Create a New <%= configFunctions.getProperty("aliases.map") %>
<% } else { %> <% } else { %>
Update a <%= configFunctions.getProperty("aliases.map") %> Update <%= configFunctions.getProperty("aliases.map") %>
<% } %> <% } %>
</h1> </h1>
@ -157,10 +157,10 @@
</div> </div>
</div> </div>
<div class="fixed-container is-fixed-bottom-right mx-4 my-4 has-text-right is-hidden-print"> <div class="has-text-right is-hidden-print">
<button class="button is-circle is-primary has-tooltip-left" data-tooltip="Update <%= configFunctions.getProperty("aliases.map") %>" type="submit"> <button class="button is-primary" type="submit">
<i class="fas fa-save" aria-hidden="true"></i> <span class="icon is-small"><i class="fas fa-save" aria-hidden="true"></i></span>
<span class="sr-only">Update <%= configFunctions.getProperty("aliases.map") %></span> <span>Update <%= configFunctions.getProperty("aliases.map") %></span>
</button> </button>
</div> </div>
</form> </form>