From 444fc5857c1005fa56e7876d590c40ff3a47483f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= 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 72bfcb41..d0020383 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 55164467..391067a1 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 @@ @@ -46,6 +47,7 @@ value="#{adminBranchOfficeActionController.branchContactEmployee}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -69,6 +71,7 @@ value="#{adminBranchOfficeActionController.branchOwnerEmployee}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -92,6 +95,7 @@ value="#{adminBranchOfficeActionController.branchUserOwner}" filter="true" filterMatchMode="contains" + dynamic="true" > 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 @@ - + @@ -53,6 +54,7 @@ value="#{adminDepartmentActionController.departmentBranchOffice}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -76,6 +78,7 @@ value="#{adminDepartmentActionController.departmentHeadquarter}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -99,6 +102,7 @@ value="#{adminDepartmentActionController.departmentLead}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -122,6 +126,7 @@ value="#{adminDepartmentActionController.departmentUserOwner}" filter="true" filterMatchMode="contains" + dynamic="true" > 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" > @@ -74,6 +76,7 @@ value="#{adminEmployeeController.employeePersonalData}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -97,6 +100,7 @@ value="#{adminEmployeeController.employeeUserOwner}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -149,6 +153,7 @@ value="#{adminEmployeeController.employeeDepartment}" filter="true" filterMatchMode="contains" + dynamic="true" > @@ -172,6 +177,7 @@ value="#{adminEmployeeController.employeeHeadquarter}" filter="true" filterMatchMode="contains" + dynamic="true" > 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" > @@ -60,6 +61,7 @@ value="#{adminHeadquarterActionController.headquarterUserOwner}" filter="true" filterMatchMode="contains" + dynamic="true" > 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 @@
- + @@ -515,9 +518,9 @@ @@ -538,9 +541,9 @@ 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 @@ -- 2.39.5