Please cherry-pick:

- splitted f:selectItems' attributes into multiple lines having in each a
  separate attribute for easy adding

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

diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
index 08f09b27b81c63589d855b4df33e3b6d01d28481..9bffd37986864a313d72d7e493b4a91f1839b011 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
@@ -36,8 +36,15 @@
                                        requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
                                        >
                                        <f:converter converterId="MobileProviderConverter" />
+
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+
+                                       <f:selectItems
+                                               value="#{mobileProviderController.allMobileProviders()}"
+                                               var="mobileProvider"
+                                               itemValue="#{mobileProvider}"
+                                               itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})"
+                                               />
                                </p:selectOneMenu>
                        </h:panelGroup>
 

diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
index 622f045da5a0a16ca3a3bc210fdf08f1e786f171..c551f2899597d7eca5b92a48ad47e873359a4f71 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
@@ -37,8 +37,15 @@
                                        filter="true"
                                        filterMatchMode="contains"
                                        >
+
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{dataController.profileModes}" var="profileMode" itemValue="#{profileMode}" itemLabel="#{msg[profileMode.messageKey]}" />
+
+                                       <f:selectItems
+                                               value="#{dataController.profileModes}"
+                                               var="profileMode"
+                                               itemValue="#{profileMode}"
+                                               itemLabel="#{msg[profileMode.messageKey]}"
+                                               />
                                </p:selectOneMenu>
                        </p:panelGrid>
                </p:fieldset>

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 37dd1926ad61caad34d3089500d37ab709a432f1..b3369930ebdb16ee5868f43cce26787b8bf2d69d 100644 (file)
--- 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
@@ -17,7 +17,14 @@
                requiredMessage="#{requiredMessage}"
                >
                <f:converter converterId="CountryConverter" />
+
                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" rendered="#{empty allowNull or allowNull}" />
-               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
+
+               <f:selectItems
+                       value="#{countryController.allCountries()}"
+                       var="country"
+                       itemValue="#{country}"
+                       itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})"
+                       />
        </p:selectOneMenu>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
index b8a305350df1fbf0ddbc5b90075942437b9b3859..8731f8cca83248cdeda4fd52f6bf061f0c03e372 100644 (file)
--- a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
+++ b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
@@ -13,6 +13,12 @@
                requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}"
                rendered="#{empty rendered or rendered == true}"
                >
-               <f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
+
+               <f:selectItems
+                       value="#{genderController.selectableGenders}"
+                       var="personalTitle"
+                       itemValue="#{personalTitle}"
+                       itemLabel="#{msg[personalTitle.messageKey]}"
+                       />
        </p:selectOneRadio>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
index 4284af9ffb7fc3754007b5e69b23f55f0f4e498d..7f6432bc1fe3f880aee7cb6b280c4a8a7673937a 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
@@ -15,8 +15,15 @@
                        filter="true"
                        filterMatchMode="contains"
                        >
+
                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                       <f:selectItems value="#{dataController.profileModes}" var="profileMode" itemValue="#{profileMode}" itemLabel="#{msg[profileMode.messageKey]}" />
+
+                       <f:selectItems
+                               value="#{dataController.profileModes}"
+                               var="profileMode"
+                               itemValue="#{profileMode}"
+                               itemLabel="#{msg[profileMode.messageKey]}"
+                               />
                </p:selectOneMenu>
 
                <p:message for="personalTitle" />

diff --git a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
index 3f676b71be51638f14300bf58d317d20568b524e..e5992c7c61c9b44f826546d544a9a4dd5ea36434 100644 (file)
--- a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
+++ b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
@@ -55,9 +55,17 @@
                                        filter="true"
                                        filterMatchMode="contains"
                                        >
+
                                        <f:converter converterId="UserConverter" />
+
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
+
+                                       <f:selectItems
+                                               value="#{userController.allUsers()}"
+                                               var="companyUserOwner"
+                                               itemValue="#{companyUserOwner}"
+                                               itemLabel="#{beanHelper.renderContact(companyUserOwner.userContact)} (#{companyUserOwner.userName})"
+                                               />
                                </p:selectOneMenu>
 
                                <p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE}" />
@@ -67,9 +75,17 @@
                                        filter="true"
                                        filterMatchMode="contains"
                                        >
+
                                        <f:converter converterId="EmployeeConverter" />
+
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+                                       <f:selectItems
+                                               value="#{employeeController.allEmployees()}"
+                                               var="companyEmployee"
+                                               itemValue="#{companyEmployee}"
+                                               itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+                                               />
                                </p:selectOneMenu>
 
                                <p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_FOUNDER}" />
@@ -79,9 +95,17 @@
                                        filter="true"
                                        filterMatchMode="contains"
                                        >
+
                                        <f:converter converterId="EmployeeConverter" />
+
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+                                       <f:selectItems
+                                               value="#{employeeController.allEmployees()}"
+                                               var="companyEmployee"
+                                               itemValue="#{companyEmployee}"
+                                               itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+                                               />
                                </p:selectOneMenu>
 
                                <p:outputLabel for="companyHeadquarter" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_HEADQUARTER}" />
@@ -91,9 +115,17 @@
                                        filter="true"
                                        filterMatchMode="contains"
                                        >
+
                                        <f:converter converterId="HeadquarterConverter" />
+
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{headquarterController.allHeadquarter()}" var="headquarter" itemValue="#{headquarter}" itemLabel="#{beanHelper.renderHeadquarter(headquarter)}" />
+
+                                       <f:selectItems
+                                               value="#{headquarterController.allHeadquarter()}"
+                                               var="headquarter"
+                                               itemValue="#{headquarter}"
+                                               itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
+                                               />
                                </p:selectOneMenu>
 
                                <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_DATA_PHONE_NUMBER}" />

diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
index 087447128ced5921b79f35eac2634946adfc016a..90a88a8d4169406794aa4bf99166c49d80271532 100644 (file)
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -27,9 +27,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
                                >
+
                                <f:converter converterId="BasicCompanyDataConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+                               <f:selectItems
+                                       value="#{basicDataListController.allBasicData}"
+                                       var="basicData"
+                                       itemValue="#{basicData}"
+                                       itemLabel="#{beanHelper.renderBasicData(basicData)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
@@ -39,9 +47,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="EmployeeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+                               <f:selectItems
+                                       value="#{employeeController.allEmployees()}"
+                                       var="companyEmployee"
+                                       itemValue="#{companyEmployee}"
+                                       itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_OWNER}" />
@@ -51,9 +67,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="EmployeeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+                               <f:selectItems
+                                       value="#{employeeController.allEmployees()}"
+                                       var="companyEmployee"
+                                       itemValue="#{companyEmployee}"
+                                       itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
@@ -63,9 +87,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="UserConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
+
+                               <f:selectItems
+                                       value="#{userController.allUsers()}"
+                                       var="branchUserOwner"
+                                       itemValue="#{branchUserOwner}"
+                                       itemLabel="#{beanHelper.renderContact(branchUserOwner.userContact)} (#{branchUserOwner.userName})"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />

diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
index a88861b0b3c927913726c40d94e7649b07e699ae..6c54ce6cc0714bfb43521c024f3291582f69ae50 100644 (file)
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
@@ -28,9 +28,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:selectOneMenu
@@ -41,9 +49,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:calendar

diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
index a1b6e8b9b584678f1ae05019ca34f52501c37121..4274790236653b179e61de6a8f9f1be293ad3efe 100644 (file)
--- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
@@ -34,9 +34,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
                                >
+
                                <f:converter converterId="BasicCompanyDataConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+                               <f:selectItems
+                                       value="#{basicDataListController.allBasicData}"
+                                       var="basicData"
+                                       itemValue="#{basicData}"
+                                       itemLabel="#{beanHelper.renderBasicData(basicData)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="departmentBranchOffice" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_BRANCH_OFFICE}" />
@@ -47,8 +55,15 @@
                                filterMatchMode="contains"
                                >
                                <f:converter converterId="BranchOfficeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+                               <f:selectItems
+                                       value="#{branchOfficeListController.allBranchOffices()}"
+                                       var="branchOffice"
+                                       itemValue="#{branchOffice}"
+                                       itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="departmentHeadquarter" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_HEADQUARTER}" />
@@ -58,9 +73,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="HeadquarterConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{headquarterController.allHeadquarter()}" var="headquarter" itemValue="#{headquarter}" itemLabel="#{beanHelper.renderHeadquarter(headquarter)}" />
+
+                               <f:selectItems
+                                       value="#{headquarterController.allHeadquarter()}"
+                                       var="headquarter"
+                                       itemValue="#{headquarter}"
+                                       itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="departmentLead" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_LEAD_EMPLOYEE}" />
@@ -70,9 +93,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="EmployeeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+                               <f:selectItems
+                                       value="#{employeeController.allEmployees()}"
+                                       var="employee"
+                                       itemValue="#{employee}"
+                                       itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="departmentUserOwner" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_USER_OWNER}" />
@@ -82,9 +113,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="UserConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{userController.allUsers()}" var="departmentUserOwner" itemValue="#{departmentUserOwner}" itemLabel="#{departmentUserOwner.userContact.contactFirstName} #{departmentUserOwner.userContact.contactFamilyName} (#{departmentUserOwner.userName})" />
+
+                               <f:selectItems
+                                       value="#{userController.allUsers()}"
+                                       var="departmentUserOwner"
+                                       itemValue="#{departmentUserOwner}"
+                                       itemLabel="#{beanHelper.renderContact(departmentUserOwner.userContact)} (#{departmentUserOwner.userName})"
+                                       />
                        </p:selectOneMenu>
                </p:panelGrid>
        </p:fieldset>

diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
index 86034372057fd7eab24d65f4c9a1513527a8eb20..290b73ffe788490ca0f3613bb7f33b6b2e8d95d3 100644 (file)
--- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
@@ -27,9 +27,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
                                >
+
                                <f:converter converterId="BasicCompanyDataConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+                               <f:selectItems
+                                       value="#{basicDataListController.allBasicData}"
+                                       var="basicData"
+                                       itemValue="#{basicData}"
+                                       itemLabel="#{basicData.companyName}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_BRANCH_OFFICE}" />
@@ -39,9 +47,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="BranchOfficeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+                               <f:selectItems
+                                       value="#{branchOfficeListController.allBranchOffices()}"
+                                       var="branchOffice"
+                                       itemValue="#{branchOffice}"
+                                       itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeePersonalData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
@@ -51,9 +67,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="ContactConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{contactController.allContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{beanHelper.renderContact(contact)}" />
+
+                               <f:selectItems
+                                       value="#{contactController.allContacts()}"
+                                       var="contact"
+                                       itemValue="#{contact}"
+                                       itemLabel="#{beanHelper.renderContact(contact)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_USER_OWNER}" />
@@ -63,9 +87,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="UserConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{userController.allUsers()}" var="employeeUserOwner" itemValue="#{employeeUserOwner}" itemLabel="#{employeeUserOwner.userContact.contactFirstName} #{employeeUserOwner.userContact.contactFamilyName} (#{employeeUserOwner.userName})" />
+
+                               <f:selectItems
+                                       value="#{userController.allUsers()}"
+                                       var="employeeUserOwner"
+                                       itemValue="#{employeeUserOwner}"
+                                       itemLabel="#{beanHelper.renderContact(employeeUserOwner.userContact)} (#{employeeUserOwner.userName})"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
@@ -98,9 +130,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="DepartmentConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{departmentController.allDepartments()}" var="department" itemValue="#{department}" itemLabel="#{beanHelper.renderDepartment(department)}" />
+
+                               <f:selectItems
+                                       value="#{departmentController.allDepartments()}"
+                                       var="department"
+                                       itemValue="#{department}"
+                                       itemLabel="#{beanHelper.renderDepartment(department)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeHeadquarter" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER}" />
@@ -110,9 +150,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="HeadquarterConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{headquarterController.allHeadquarter()}" var="headquarter" itemValue="#{headquarter}" itemLabel="#{beanHelper.renderHeadquarter(headquarter)}" />
+
+                               <f:selectItems
+                                       value="#{headquarterController.allHeadquarter()}"
+                                       var="headquarter"
+                                       itemValue="#{headquarter}"
+                                       itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER}" />

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 4ae25536a91d76d4a739d4e713dc9b59ce2afff1..d96d9eb3156b0351e29afb5dca55f04be16e3dec 100644 (file)
--- 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
@@ -28,8 +28,15 @@
                                <div class="table-right-medium">
                                        <p:selectOneMenu styleClass="select" id=" " value="#{adminPhoneController.faxNumber}">
                                                <f:converter converterId="FaxNumberConverter" />
+
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+
+                                               <f:selectItems
+                                                       value="#{adminPhoneController.allNonLinkedFaxNumbers()}"
+                                                       var="faxNumber"
+                                                       itemValue="#{faxNumber}"
+                                                       itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}"
+                                                       />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>

diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
index 8a3091f18603dc2d44d1bcacf5bc83329312bef6..f5920661b89f02f4286ba4c3abe7d36dbd42665d 100644 (file)
--- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
+++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
@@ -38,9 +38,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="EmployeeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+                               <f:selectItems
+                                       value="#{employeeController.allEmployees()}"
+                                       var="companyEmployee"
+                                       itemValue="#{companyEmployee}"
+                                       itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="headquarterUserOwner" value="#{msg.ADMIN_ASSIGN_HEADQUARTER_USER_OWNER}" />
@@ -50,9 +58,17 @@
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="UserConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{userController.allUsers()}" var="headquarterUserOwner" itemValue="#{headquarterUserOwner}" itemLabel="#{headquarterUserOwner.userContact.contactFirstName} #{headquarterUserOwner.userContact.contactFamilyName} (#{headquarterUserOwner.userName})" />
+
+                               <f:selectItems
+                                       value="#{userController.allUsers()}"
+                                       var="headquarterUserOwner"
+                                       itemValue="#{headquarterUserOwner}"
+                                       itemLabel="#{beanHelper.renderContact(headquarterUserOwner.userContact)} (#{headquarterUserOwner.userName})"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="headquarterEmailAddress" value="#{msg.ADMIN_ENTER_HEADQUARTER_EMAIL_ADDRESS}" />

diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
index 2c688e8bfae215474a4e377872c85395e1a5c319..204795545cb39ede77525b37370b6c99fa73639f 100644 (file)
--- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
@@ -29,9 +29,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:selectOneMenu
@@ -42,9 +50,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:calendar

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 41ee57a033e5cd839c113e7259f1a620aa4201c5..7d8c62ce14add100e40206957be32387477fbbee 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -28,8 +28,15 @@
                                <div class="table-right-medium">
                                        <p:selectOneMenu styleClass="select" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
                                                <f:converter converterId="LandLineNumberConverter" />
+
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
+
+                                               <f:selectItems
+                                                       value="#{adminPhoneController.allNonLinkedLandLineNumbers()}"
+                                                       var="landlineNumber"
+                                                       itemValue="#{landlineNumber}"
+                                                       itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}"
+                                                       />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index a473efa4ce7781eb09bd575218ed31f1bce8cb27..19cf28052ebcd44a2cb1a20e41f983adc31b9b49 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -28,8 +28,15 @@
                                <div class="table-right-medium">
                                        <p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
                                                <f:converter converterId="MobileNumberConverter" />
+
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}" />
+
+                                               <f:selectItems
+                                                       value="#{adminPhoneController.allNonLinkedMobileNumbers()}"
+                                                       var="mobileNumber"
+                                                       itemValue="#{mobileNumber}"
+                                                       itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}"
+                                                       />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>

diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
index 021879819c1b2e20a3f9a416a0f22f9e8df5e1aa..767ee3e03131b90038d489da01a015c91f3cc0f8 100644 (file)
--- a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
@@ -29,9 +29,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:selectOneMenu
@@ -42,9 +50,17 @@
                                required="true"
                                requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
                                >
+
                                <f:converter converterId="DayOfTheWeekConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                               <f:selectItems
+                                       value="#{dataController.dayOfTheWeek}"
+                                       var="dayOfWeek"
+                                       itemValue="#{dayOfWeek}"
+                                       itemLabel="#{dayOfWeek.toString()}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:calendar

diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
index 20ad983620ec121076cdf6e944c80addbf11b8c5..c7d57c759e6ffd25c79916bf953f73612842bc67 100644 (file)
--- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -12,8 +12,15 @@
                        <p:outputPanel styleClass="ui-g-12 ui-md-6">
                                <p:selectOneMenu value="#{localizationController.localeCode}">
                                        <p:ajax update="master" />
+
                                        <f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
+
+                                       <f:selectItems
+                                               value="#{localizationController.supportedLocales}"
+                                               var="locale"
+                                               itemValue="#{locale}"
+                                               itemLabel="#{msg[locale.toString().toUpperCase()]}"
+                                               />
                                </p:selectOneMenu>
                        </p:outputPanel>
 

diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index 3908532f5e5e35a2a2d7cac8a45ba58462ac020b..34cd3dec05aa5d2bc3b0c6cf93395ddcc786b183 100644 (file)
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -104,7 +104,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="EmployeeConverter" />
-                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+                                                       <f:selectItems
+                                                               value="#{employeeController.allEmployees()}"
+                                                               var="employee"
+                                                               itemValue="#{employee}"
+                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -128,7 +134,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="EmployeeConverter" />
-                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+                                                       <f:selectItems
+                                                               value="#{employeeController.allEmployees()}"
+                                                               var="employee"
+                                                               itemValue="#{employee}"
+                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -152,7 +164,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
                                                        <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+                                                       <f:selectItems
+                                                               value="#{userController.allUsers()}"
+                                                               var="user"
+                                                               itemValue="#{user}"
+                                                               itemLabel="#{beanHelper.renderUser(user)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 3a9cdff5163880fb4cf8179594730ea779739b1d..69dcd3eb8b988f101006fd12f4acbecfb8a53881 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -97,7 +97,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+                                                       <f:selectItems
+                                                               value="#{basicDataListController.allBasicData}"
+                                                               var="basicData"
+                                                               itemValue="#{basicData}"
+                                                               itemLabel="#{beanHelper.renderBasicData(basicData)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -117,7 +123,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
                                                        <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+                                                       <f:selectItems
+                                                               value="#{userController.allUsers()}"
+                                                               var="user"
+                                                               itemValue="#{user}"
+                                                               itemLabel="#{beanHelper.renderUser(user)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -151,7 +163,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="EmployeeConverter" />
-                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+                                                       <f:selectItems
+                                                               value="#{employeeController.allEmployees()}"
+                                                               var="employee"
+                                                               itemValue="#{employee}"
+                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 06c608831402c8ef04a173f4fa618d6b0212f36e..c3ef33fd56caf1ea6fa027d817686cee874f406b 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -74,7 +74,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+                                                       <f:selectItems
+                                                               value="#{basicDataListController.allBasicData}"
+                                                               var="basicData"
+                                                               itemValue="#{basicData}"
+                                                               itemLabel="#{beanHelper.renderBasicData(basicData)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -96,7 +102,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="BranchOfficeConverter" />
-                                                       <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+                                                       <f:selectItems
+                                                               value="#{branchOfficeListController.allBranchOffices()}"
+                                                               var="branchOffice"
+                                                               itemValue="#{branchOffice}"
+                                                               itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -120,7 +132,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="EmployeeConverter" />
-                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+                                                       <f:selectItems
+                                                               value="#{employeeController.allEmployees()}"
+                                                               var="employee"
+                                                               itemValue="#{employee}"
+                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -144,7 +162,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
                                                        <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+                                                       <f:selectItems
+                                                               value="#{userController.allUsers()}"
+                                                               var="user"
+                                                               itemValue="#{user}"
+                                                               itemLabel="#{beanHelper.renderUser(user)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 8dac5c9715acecc67ea43da1780d149dfdaca1e4..04898a2cadf3a7bb11e2756a7f73609d0d690554 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -70,7 +70,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="BranchOfficeConverter" />
-                                                       <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+                                                       <f:selectItems
+                                                               value="#{branchOfficeListController.allBranchOffices()}"
+                                                               var="branchOffice"
+                                                               itemValue="#{branchOffice}"
+                                                               itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -93,7 +99,13 @@
                                                        updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
                                                        <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+                                                       <f:selectItems
+                                                               value="#{userController.allUsers()}"
+                                                               var="user"
+                                                               itemValue="#{user}"
+                                                               itemLabel="#{beanHelper.renderUser(user)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -117,7 +129,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+                                                       <f:selectItems
+                                                               value="#{basicDataListController.allBasicData}"
+                                                               var="basicData"
+                                                               itemValue="#{basicData}"
+                                                               itemLabel="#{beanHelper.renderBasicData(basicData)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index b728eb5538a3587e00b0cc9513cff665b059d5fb..c8ec34569a3ca2dc075970862d3ec9b84f036572 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -70,7 +70,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
                                                        <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+                                                       <f:selectItems
+                                                               value="#{userController.allUsers()}"
+                                                               var="user"
+                                                               itemValue="#{user}"
+                                                               itemLabel="#{beanHelper.renderUser(user)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -104,7 +110,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="EmployeeConverter" />
-                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+                                                       <f:selectItems
+                                                               value="#{employeeController.allEmployees()}"
+                                                               var="employee"
+                                                               itemValue="#{employee}"
+                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 

diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml
index a7128e1daaf53d7d3ea623f7b251b01517a0eaf1..055c4ee73532674daa04ded132770af4118f19da 100644 (file)
--- a/web/admin/opening_time/admin_opening_time_list.xhtml
+++ b/web/admin/opening_time/admin_opening_time_list.xhtml
@@ -68,7 +68,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE}"
                                                        >
                                                        <f:converter converterId="DayOfTheWeekConverter" />
-                                                       <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                                                       <f:selectItems
+                                                               value="#{dataController.dayOfTheWeek}"
+                                                               var="dayOfWeek"
+                                                               itemValue="#{dayOfWeek}"
+                                                               itemLabel="#{dayOfWeek.toString()}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -84,7 +90,13 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE}"
                                                        >
                                                        <f:converter converterId="DayOfTheWeekConverter" />
-                                                       <f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+                                                       <f:selectItems
+                                                               value="#{dataController.dayOfTheWeek}"
+                                                               var="dayOfWeek"
+                                                               itemValue="#{dayOfWeek}"
+                                                               itemLabel="#{dayOfWeek.toString()}"
+                                                               />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index d4652d6d40985b031e1034cfdaea064ab6201e7d..f5a1b057d1f7bf7afd6993d1b8ab58a620f9dc61 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -176,7 +176,13 @@
                                                        filterMatchMode="contains"
                                                        >
                                                        <f:converter converterId="ContactConverter" />
-                                                       <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+
+                                                       <f:selectItems
+                                                               value="#{contactController.selectableContacts()}"
+                                                               var="contact"
+                                                               itemValue="#{contact}"
+                                                               itemLabel="#{beanHelper.renderContact(contact)}"
+                                                               />
                                                </p:selectOneMenu>
                                        </p:panelGrid>
                                </p:fieldset>