From: Roland Häder <roland@mxchange.org>
Date: Sat, 9 May 2020 22:57:39 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=70302095d04f769c33ebdfcc4f7f5a38417d2520;p=jfinancials-war.git

Please cherry-pick:
- fixed fooCreated to fooEntryCreated
- added fooEntryUpdated
- TODO: rename user<Created|Updated> to userEntry<Created|Updated>

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index f0e7e702..807e1628 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -282,10 +282,20 @@
 
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{department.departmentCreated}"
+					sortBy="#{department.departmentEntryCreated}"
 					filterable="false"
 					>
-					<h:outputText id="departmentCreated" value="#{department.departmentCreated}">
+					<h:outputText value="#{department.departmentEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{department.departmentEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{department.departmentEntryUpdated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index c0d3d150..f8f18a88 100644
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -218,10 +218,20 @@
 
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{headquarter.headquarterCreated}"
+					sortBy="#{headquarter.headquarterEntryCreated}"
 					filterable="false"
 					>
-					<h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
+					<h:outputText value="#{headquarter.headquarterEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{headquarter.headquarterEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{headquarter.headquarterEntryUpdated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>