Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / employee / admin_form_employee_data.tpl

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..85c42867b7793df3dc2a2a4452e5782175b05ae8 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,22 @@
                                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:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.PLEASE_SELECT}"
+                                       noSelectionOption="true"
+                                       itemDisabled="true"
+                                       />
+
+                               <f:selectItems
+                                       value="#{basicDataListController.allBasicData}"
+                                       var="basicData"
+                                       itemValue="#{basicData}"
+                                       itemLabel="#{beanHelper.renderBasicData(basicData)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_BRANCH_OFFICE}" />
@@ -39,9 +52,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 +72,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="#{contactListController.allContacts}"
+                                       var="contact"
+                                       itemValue="#{contact}"
+                                       itemLabel="#{beanHelper.renderContact(contact)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_USER_OWNER}" />
@@ -63,9 +92,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 +135,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 +155,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}" />