From 429c49e2790d1f949007b11c658ff6f3f3e2a9a3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 10 May 2020 00:57:39 +0200
Subject: [PATCH] Please cherry-pick: - fixed fooCreated to fooEntryCreated -
 added fooEntryUpdated - TODO: rename user<Created|Updated> to
 userEntry<Created|Updated>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/admin/department/admin_department_list.xhtml   | 14 ++++++++++++--
 web/admin/headquarter/admin_headquarter_list.xhtml | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

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>
-- 
2.39.5