From 05dc1b9c1aaf0e3288b47d5f7516f8f5813d25c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 13 May 2023 13:12:19 +0200
Subject: [PATCH] Please cherry-pick: - added i18n string for Switzerland -
added dynamic="true" when a very long list is expected
---
.../org/mxchange/localization/generic_de_DE.properties | 1 +
.../org/mxchange/localization/generic_en_US.properties | 1 +
.../tags/country/form_data/form_country_selector.tpl | 1 -
.../branch_office/admin_form_branch_office_data.tpl | 4 ++++
.../branch_office/admin_form_branch_opening_time.tpl | 7 ++++++-
.../business/department/admin_form_department_data.tpl | 5 +++++
.../admin/business/employee/admin_form_employee_data.tpl | 6 ++++++
.../business/headquarter/admin_form_headquarter_data.tpl | 2 ++
.../templates/admin/fax/admin_form_add_contact_fax.tpl | 5 ++++-
.../business/basic_data/admin_basic_data_list.xhtml | 9 ++++++---
.../branch_office/admin_branch_office_list.xhtml | 3 +++
.../business/department/admin_department_list.xhtml | 4 ++++
web/admin/business/employee/admin_employee_list.xhtml | 3 +++
.../business/headquarter/admin_headquarter_list.xhtml | 2 ++
.../mobile_provider/admin_mobile_provider_list.xhtml | 1 +
web/admin/user/admin_user_list.xhtml | 3 ++-
16 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index 47a68927..32ff8226 100644
--- a/src/java/org/mxchange/localization/generic_de_DE.properties
+++ b/src/java/org/mxchange/localization/generic_de_DE.properties
@@ -139,6 +139,7 @@ COUNTRY_NETHERLANDS=Niederlande
COUNTRY_PHILIPPINES=Philippinen
COUNTRY_POLAND=Polen
COUNTRY_SWEDEN=Schweden
+COUNTRY_SWITZERLAND=Schweiz
COUNTRY_TURKEY=T\u00fcrkei
COUNTRY_THAILAND=Thailand
COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties
index 55a974ff..4f57c2c8 100644
--- a/src/java/org/mxchange/localization/generic_en_US.properties
+++ b/src/java/org/mxchange/localization/generic_en_US.properties
@@ -139,6 +139,7 @@ COUNTRY_NETHERLANDS=Netherlands
COUNTRY_PHILIPPINES=Philippines
COUNTRY_POLAND=Poland
COUNTRY_SWEDEN=Sweden
+COUNTRY_SWITZERLAND=Switzerland
COUNTRY_THAILAND=Thailand
COUNTRY_TURKEY=Turkey
COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
diff --git a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
index cedefd2e..51b27a78 100644
--- a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
+++ b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
@@ -9,7 +9,6 @@
<p:selectOneMenu
id="#{id}"
value="#{value}"
- styleClass="#{empty styleClass ? 'select' : styleClass}"
filter="true"
filterMatchMode="contains"
rendered="#{empty rendered or rendered}"
diff --git a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
index 45efc8a7..6f2d5d2c 100644
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
@@ -24,6 +24,7 @@
value="#{adminBranchOfficeActionController.branchCompany}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
required="true"
requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
>
@@ -46,6 +47,7 @@
value="#{adminBranchOfficeActionController.branchContactEmployee}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="ContactConverter" />
@@ -69,6 +71,7 @@
value="#{adminBranchOfficeActionController.branchOwnerEmployee}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="ContactConverter" />
@@ -92,6 +95,7 @@
value="#{adminBranchOfficeActionController.branchUserOwner}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="UserConverter" />
diff --git a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
index 4af4b866..eed88037 100644
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
@@ -52,7 +52,12 @@
<f:converter converterId="DayOfTheWeekConverter" />
- <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+ <f:selectItem
+ itemValue="#{null}"
+ itemLabel="#{msg.PLEASE_SELECT}"
+ noSelectionOption="true"
+ itemDisabled="true"
+ />
<f:selectItems
value="#{dataController.dayOfTheWeek}"
diff --git a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
index af7eb067..42ecb867 100644
--- a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
@@ -31,6 +31,7 @@
value="#{adminDepartmentActionController.departmentCompany}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
required="true"
requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
>
@@ -53,6 +54,7 @@
value="#{adminDepartmentActionController.departmentBranchOffice}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="BranchOfficeConverter" />
@@ -76,6 +78,7 @@
value="#{adminDepartmentActionController.departmentHeadquarter}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="HeadquarterConverter" />
@@ -99,6 +102,7 @@
value="#{adminDepartmentActionController.departmentLead}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="ContactConverter" />
@@ -122,6 +126,7 @@
value="#{adminDepartmentActionController.departmentUserOwner}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="UserConverter" />
diff --git a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
index 21644cf7..8ebf92ef 100644
--- a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
@@ -24,6 +24,7 @@
value="#{adminEmployeeController.employeeBasicData}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
required="true"
requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
>
@@ -51,6 +52,7 @@
value="#{adminEmployeeController.employeeBranchOffice}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="BranchOfficeConverter" />
@@ -74,6 +76,7 @@
value="#{adminEmployeeController.employeePersonalData}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="ContactConverter" />
@@ -97,6 +100,7 @@
value="#{adminEmployeeController.employeeUserOwner}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="UserConverter" />
@@ -149,6 +153,7 @@
value="#{adminEmployeeController.employeeDepartment}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="DepartmentConverter" />
@@ -172,6 +177,7 @@
value="#{adminEmployeeController.employeeHeadquarter}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="HeadquarterConverter" />
diff --git a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
index 61ddb0b1..97923887 100644
--- a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
+++ b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
@@ -37,6 +37,7 @@
value="#{adminHeadquarterActionController.headquarterContactEmployee}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="ContactConverter" />
@@ -60,6 +61,7 @@
value="#{adminHeadquarterActionController.headquarterUserOwner}"
filter="true"
filterMatchMode="contains"
+ dynamic="true"
>
<f:converter converterId="UserConverter" />
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index c44235e5..fd30eb7d 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -31,7 +31,10 @@
</div>
<div class="table-right-medium">
- <p:selectOneMenu styleClass="select" id=" " value="#{adminPhoneController.faxNumber}">
+ <p:selectOneMenu
+ id="faxNumber"
+ value="#{adminPhoneController.faxNumber}"
+ >
<f:converter converterId="FaxNumberConverter" />
<f:selectItem
diff --git a/web/admin/business/basic_data/admin_basic_data_list.xhtml b/web/admin/business/basic_data/admin_basic_data_list.xhtml
index 441db7d3..3373ea2d 100644
--- a/web/admin/business/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/business/basic_data/admin_basic_data_list.xhtml
@@ -147,6 +147,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_EMPLOYEES}"
onchange="PF('basicDataList').filter()"
updateLabel="true"
@@ -192,6 +193,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_EMPLOYEES}"
onchange="PF('basicDataList').filter()"
updateLabel="true"
@@ -237,6 +239,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_USERS}"
onchange="PF('basicDataList').filter()"
updateLabel="true"
@@ -492,9 +495,9 @@
<p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_USER_OWNER}" />
<p:selectOneMenu
id="companyUserOwner"
- value="#{adminBasicCompanyDataController.companyUserOwner}"
filter="true"
filterMatchMode="contains"
+ value="#{adminBasicCompanyDataController.companyUserOwner}"
>
<f:converter converterId="UserConverter" />
@@ -515,9 +518,9 @@
<p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE}" />
<p:selectOneMenu
id="companyContactEmployee"
- value="#{adminBasicCompanyDataController.companyContactEmployee}"
filter="true"
filterMatchMode="contains"
+ value="#{adminBasicCompanyDataController.companyContactEmployee}"
>
<f:converter converterId="EmployeeConverter" />
@@ -538,9 +541,9 @@
<p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_FOUNDER}" />
<p:selectOneMenu
id="companyFounder"
- value="#{adminBasicCompanyDataController.companyFounder}"
filter="true"
filterMatchMode="contains"
+ value="#{adminBasicCompanyDataController.companyFounder}"
>
<f:converter converterId="EmployeeConverter" />
diff --git a/web/admin/business/branch_office/admin_branch_office_list.xhtml b/web/admin/business/branch_office/admin_branch_office_list.xhtml
index c28d1e6c..2cea9750 100644
--- a/web/admin/business/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/business/branch_office/admin_branch_office_list.xhtml
@@ -122,6 +122,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_COMPANIES}"
onchange="PF('branchOfficeList').filter()"
updateLabel="true"
@@ -157,6 +158,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_USERS}"
onchange="PF('branchOfficeList').filter()"
updateLabel="true"
@@ -228,6 +230,7 @@
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
+ dynamic="true"
filterMatchMode="contains"
label="#{msg.LABEL_EMPLOYEES}"
onchange="PF('branchOfficeList').filter()"
diff --git a/web/admin/business/department/admin_department_list.xhtml b/web/admin/business/department/admin_department_list.xhtml
index 036da9cc..52aff8a4 100644
--- a/web/admin/business/department/admin_department_list.xhtml
+++ b/web/admin/business/department/admin_department_list.xhtml
@@ -120,6 +120,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_COMPANIES}"
onchange="PF('departmentList').filter()"
updateLabel="true"
@@ -155,6 +156,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_BRANCH_OFFICES}"
onchange="PF('departmentList').filter()"
updateLabel="true"
@@ -200,6 +202,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_EMPLOYEES}"
onchange="PF('departmentList').filter()"
updateLabel="true"
@@ -245,6 +248,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_USERS}"
onchange="PF('departmentList').filter()"
updateLabel="true"
diff --git a/web/admin/business/employee/admin_employee_list.xhtml b/web/admin/business/employee/admin_employee_list.xhtml
index c6e460c5..63d223bd 100644
--- a/web/admin/business/employee/admin_employee_list.xhtml
+++ b/web/admin/business/employee/admin_employee_list.xhtml
@@ -121,6 +121,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_BRANCH_OFFICES}"
onchange="PF('employeeList').filter()"
updateLabel="true"
@@ -166,6 +167,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_USERS}"
onchange="PF('employeeList').filter()"
updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
@@ -210,6 +212,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_COMPANIES}"
onchange="PF('employeeList').filter()"
updateLabel="true"
diff --git a/web/admin/business/headquarter/admin_headquarter_list.xhtml b/web/admin/business/headquarter/admin_headquarter_list.xhtml
index 9bc2aa46..41d2b242 100644
--- a/web/admin/business/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/business/headquarter/admin_headquarter_list.xhtml
@@ -111,6 +111,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_USERS}"
onchange="PF('headquarterList').filter()"
updateLabel="true"
@@ -180,6 +181,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_EMPLOYEES}"
onchange="PF('headquarterList').filter()"
updateLabel="true"
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index dd3b0b16..bb348e45 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -130,6 +130,7 @@
<p:selectCheckboxMenu
filter="true"
filterMatchMode="contains"
+ dynamic="true"
label="#{msg.LABEL_COUNTRIES}"
onchange="PF('mobileProviderList').filter()"
updateLabel="true"
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index b807d457..e6e3a9a4 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -318,9 +318,10 @@
<p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
<p:selectOneMenu
id="userContact"
- value="#{adminUserController.contact}"
filter="true"
filterMatchMode="contains"
+ value="#{adminUserController.contact}"
+ title="#{msg.FILTER_BY_SINGLE_CONTACT_TITLE}"
>
<f:converter converterId="ContactConverter" />
--
2.39.5