From 859f053b7a6a36158e1e243467612ab537c87d0a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 25 Jun 2018 23:10:01 +0200
Subject: [PATCH] Please cherry-pick: - exposed branch office and employee
 number in list views - added missing i18n string
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/java/org/mxchange/localization/generic_de_DE.properties | 1 +
 src/java/org/mxchange/localization/generic_en_US.properties | 1 +
 web/admin/branch_office/admin_branch_office_list.xhtml      | 5 +++++
 web/admin/employee/admin_employee_list.xhtml                | 5 +++++
 4 files changed, 12 insertions(+)

diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index 826fbf25..3079d9a1 100644
--- a/src/java/org/mxchange/localization/generic_de_DE.properties
+++ b/src/java/org/mxchange/localization/generic_de_DE.properties
@@ -1218,3 +1218,4 @@ COUNTRY_OF_BRANCH_OFFICE_TITLE=Land der Filiale
 #@TODO Please fix German umlauts!
 ADMIN_OPENING_TIMES_TAB_TITLE=Oeffnungszeiten
 TAX_NUMBER_HEADER=Steuernummer:
+EMPLOYEE_NUMBER_HEADER=Mitarbeiternummer:
diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties
index 543786d2..3f5af7e7 100644
--- a/src/java/org/mxchange/localization/generic_en_US.properties
+++ b/src/java/org/mxchange/localization/generic_en_US.properties
@@ -1104,3 +1104,4 @@ COUNTRY_HEADER=Country:
 COUNTRY_OF_BRANCH_OFFICE_TITLE=Country of branch office
 ADMIN_OPENING_TIMES_TAB_TITLE=Opening times
 TAX_NUMBER_HEADER=Tax number:
+EMPLOYEE_NUMBER_HEADER=Employee number:
diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 013961e8..320bec09 100644
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -86,6 +86,11 @@
 					</p:link>
 				</p:column>
 
+				<p:column headerText="#{msg.BRANCH_OFFICE_NUMBER_HEADER}" sortBy="#{branchOffice.branchNumber}" filterBy="#{branchOffice.branchNumber}" filterMatchMode="contains">
+					<h:outputText value="#{branchOffice.branchNumber}" rendered="#{not empty branchOffice.branchNumber}" />
+					<h:outputText value="-" rendered="#{empty branchOffice.branchNumber}" />
+				</p:column>
+
 				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index a3293b12..4ff506b7 100644
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -59,6 +59,11 @@
 					</p:link>
 				</p:column>
 
+				<p:column headerText="#{msg.EMPLOYEE_NUMBER_HEADER}" sortBy="#{employee.employeeNumber}" filterBy="#{employee.employeeNumber}" filterMatchMode="contains">
+					<h:outputText value="#{employee.employeeNumber}" rendered="#{not empty employee.employeeNumber}" />
+					<h:outputText value="-" rendered="#{empty employee.employeeNumber}" />
+				</p:column>
+
 				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{employee.employeeBranchOffice}" filterBy="#{employee.employeeBranchOffice}" filterMatchMode="in">
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
-- 
2.39.5