Please cherry-pick:

- exposed branch office and employee number in list views
- added missing i18n string

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

diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index 826fbf2564e1c47f082655408cead9ebccae5b3e..3079d9a1ae720d70b4794a63b388303adbb307e5 100644 (file)
--- 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 543786d21b7f6070c17d001b7686e5f96dd70fc1..3f5af7e7df43c65c2eab49a4b5c9573c9f05d76e 100644 (file)
--- 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 013961e8cf4b97538b7384f0b3d5549be4bb9b9c..320bec0962a5e71f9e7699fd5ebac1e3304d7b49 100644 (file)
--- 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 a3293b123c9cc21a66bcae7d5b2a0bc4dbe1c6d0..4ff506b743fdb9f88c9a54c3dd75662259f68d3b 100644 (file)
--- 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