From bbc61c25f624a17296866ad28d1fb7d1291737f9 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 9 Mar 2023 15:43:59 -0500 Subject: [PATCH] more consistent panel headings --- views/lotOccupancy-edit.ejs | 291 ++++++++++++++++++------------------ views/lotOccupancy-view.ejs | 212 +++++++++++++------------- 2 files changed, 251 insertions(+), 252 deletions(-) diff --git a/views/lotOccupancy-edit.ejs b/views/lotOccupancy-edit.ejs index f8c6759c..df789b5c 100644 --- a/views/lotOccupancy-edit.ejs +++ b/views/lotOccupancy-edit.ejs @@ -309,120 +309,119 @@ <% if (isCreate) { %>
-

<%= configFunctions.getProperty("aliases.occupant") %>

-
-
-
-
<% } %>
@@ -434,7 +433,7 @@
-

+

<%= configFunctions.getProperty("aliases.occupants") %>

@@ -459,53 +458,53 @@
-
-
-
-
-

Comments

-
-
-
-
- -
-
-
-
-
+
+
+
+
+

Comments

+
+
+
+
+ +
+
+
+
+
<% - const workOrderOpenDateAlias = configFunctions.getProperty("aliases.workOrderOpenDate"); - const workOrderCloseDateAlias = configFunctions.getProperty("aliases.workOrderCloseDate"); + const workOrderOpenDateAlias = configFunctions.getProperty("aliases.workOrderOpenDate"); + const workOrderCloseDateAlias = configFunctions.getProperty("aliases.workOrderCloseDate"); %>
-
-
-

Work Orders

+
+
+

Work Orders

+
+
+
+
-
-
- -
-
-
+
+
<% if (lotOccupancy.workOrders.length === 0) { %> -
-

- There are no work orders associated with this record. -

-
+
+

+ There are no work orders associated with this record. +

+
<% } else { %> @@ -556,7 +555,7 @@
-

Fees

+

Fees

@@ -578,7 +577,7 @@
-

Transactions

+

Transactions

diff --git a/views/lotOccupancy-view.ejs b/views/lotOccupancy-view.ejs index 6db5ecc9..ba94ff62 100644 --- a/views/lotOccupancy-view.ejs +++ b/views/lotOccupancy-view.ejs @@ -148,7 +148,7 @@
-

<%= configFunctions.getProperty("aliases.occupants") %>

+

<%= configFunctions.getProperty("aliases.occupants") %>

@@ -171,51 +171,51 @@
<% } else { %>
- + + + + + + + + + + <% for (const lotOccupancyOccupant of lotOccupancy.lotOccupancyOccupants) { %> - - - - - - - - <% for (const lotOccupancyOccupant of lotOccupancy.lotOccupancyOccupants) { %> - - + + + - - - - - <% } %> - + + + <% } %> +
<%= configFunctions.getProperty("aliases.occupant") %>AddressOther ContactComment
<%= configFunctions.getProperty("aliases.occupant") %>AddressOther ContactComment
- <%= lotOccupancyOccupant.occupantName %> <%= lotOccupancyOccupant.occupantFamilyName %>
- - - <%= lotOccupancyOccupant.lotOccupantType %> +
+ <%= lotOccupancyOccupant.occupantName %> <%= lotOccupancyOccupant.occupantFamilyName %>
+ + + <%= lotOccupancyOccupant.lotOccupantType %> + +
+ <% if (lotOccupancyOccupant.occupantAddress1) { %> + <%= lotOccupancyOccupant.occupantAddress1 %>
+ <% } %> + <% if (lotOccupancyOccupant.occupantAddress2) { %> + <%= lotOccupancyOccupant.occupantAddress2 %>
+ <% } %> + <% if (lotOccupancyOccupant.occupantCity) { %> + <%= lotOccupancyOccupant.occupantCity %>, + <% } %> + <%= lotOccupancyOccupant.occupantProvince %>
+ <%= lotOccupancyOccupant.occupantPostalCode %> +
+ <% if (lotOccupancyOccupant.occupantPhoneNumber) { %> + <%= lotOccupancyOccupant.occupantPhoneNumber %>
+ <% } %> + <%= lotOccupancyOccupant.occupantEmailAddress %> +
+ + <%= lotOccupancyOccupant.occupantComment %> - - <% if (lotOccupancyOccupant.occupantAddress1) { %> - <%= lotOccupancyOccupant.occupantAddress1 %>
- <% } %> - <% if (lotOccupancyOccupant.occupantAddress2) { %> - <%= lotOccupancyOccupant.occupantAddress2 %>
- <% } %> - <% if (lotOccupancyOccupant.occupantCity) { %> - <%= lotOccupancyOccupant.occupantCity %>, - <% } %> - <%= lotOccupancyOccupant.occupantProvince %>
- <%= lotOccupancyOccupant.occupantPostalCode %> -
- <% if (lotOccupancyOccupant.occupantPhoneNumber) { %> - <%= lotOccupancyOccupant.occupantPhoneNumber %>
- <% } %> - <%= lotOccupancyOccupant.occupantEmailAddress %> -
- - <%= lotOccupancyOccupant.occupantComment %> - -
<% } %>
@@ -223,30 +223,30 @@ <% if (lotOccupancy.lotOccupancyComments.length > 0) { %>
-

Comments

-
- - - - - - - - - - <% for (const lotOccupancyComment of lotOccupancy.lotOccupancyComments) { %> - - - - - - <% } %> - -
CommentorComment DateComment
<%= lotOccupancyComment.recordCreate_userName %> - <%= lotOccupancyComment.lotOccupancyCommentDateString %> - <%= (lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : lotOccupancyComment.lotOccupancyCommentTimeString) %> - <%= lotOccupancyComment.lotOccupancyComment %>
-
+

Comments

+
+ + + + + + + + + + <% for (const lotOccupancyComment of lotOccupancy.lotOccupancyComments) { %> + + + + + + <% } %> + +
CommentorComment DateComment
<%= lotOccupancyComment.recordCreate_userName %> + <%= lotOccupancyComment.lotOccupancyCommentDateString %> + <%= (lotOccupancyComment.lotOccupancyCommentTime === 0 ? "" : lotOccupancyComment.lotOccupancyCommentTimeString) %> + <%= lotOccupancyComment.lotOccupancyComment %>
+
<% } %> @@ -258,44 +258,44 @@

Work Orders

- - - - - - - - - - <% for (const workOrder of lotOccupancy.workOrders) { %> - - - - - - <% } %> - -
Work Order NumberDescriptionDate
- - <%= workOrder.workOrderNumber %> - - - <%= workOrder.workOrderType %>
- <%= workOrder.workOrderDescription %> -
- - - <%= workOrder.workOrderOpenDateString %> -
- - - <% if (workOrder.workOrderCloseDate) { %> - <%= workOrder.workOrderCloseDateString %> - <% } else { %> - (No <%= workOrderCloseDateAlias %>) - <% } %> - -
+ + + + + + + + + + <% for (const workOrder of lotOccupancy.workOrders) { %> + + + + + + <% } %> + +
Work Order NumberDescriptionDate
+ + <%= workOrder.workOrderNumber %> + + + <%= workOrder.workOrderType %>
+ <%= workOrder.workOrderDescription %> +
+ + + <%= workOrder.workOrderOpenDateString %> +
+ + + <% if (workOrder.workOrderCloseDate) { %> + <%= workOrder.workOrderCloseDateString %> + <% } else { %> + (No <%= workOrderCloseDateAlias %>) + <% } %> + +
<% } %>