]> git.mxchange.org Git - jjobs-war.git/blobdiff - web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
Please cherry-pick:
[jjobs-war.git] / web / WEB-INF / templates / admin / employee / admin_form_employee_data.tpl
index 78dfa304cffdc0eb883ba90654c5d213992793f0..85c42867b7793df3dc2a2a4452e5782175b05ae8 100644 (file)
@@ -1,29 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <!--
-       @TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
-                       <p:outputLabel for="employeeCompany" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
+                       <p:outputLabel for="employeeBasicData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
                        <p:selectOneMenu
-                               id="employeeCompany"
-                               value="#{adminEmployeeController.employeeCompany}"
+                               id="employeeBasicData"
+                               value="#{adminEmployeeController.employeeBasicData}"
                                filter="true"
                                filterMatchMode="contains"
                                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="#{basicCompanyDataController.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}" />
                                filter="true"
                                filterMatchMode="contains"
                                >
+
                                <f:converter converterId="BranchOfficeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{branchOfficeController.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="employeePersonalContact" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
+                       <p:outputLabel for="employeePersonalData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
                        <p:selectOneMenu
-                               id="employeePersonalContact"
-                               value="#{adminEmployeeController.employeePersonalContact}"
+                               id="employeePersonalData"
+                               value="#{adminEmployeeController.employeePersonalData}"
                                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}" />
                                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}" />
-                       <p:inputText styleClass="input" id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                               <f:validator validatorId="EmailAddressValidator" />
-                               <f:attribute name="allowEmptyValue" value="true" />
+                       <p:inputText id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <validator:employeeEmailAddressValidator allowEmptyRequiredData="true" />
                        </p:inputText>
 
                        <p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_STAFF_NUMBER}" />
-                       <p:inputText styleClass="input" id="employeeStaffNumber" size="2" maxlength="10" value="#{adminEmployeeController.employeeStaffNumber}" />
+                       <p:inputText id="employeeStaffNumber" size="2" maxlength="10" value="#{adminEmployeeController.employeeNumber}" />
                </p:panelGrid>
        </p:fieldset>
 
        @TODO title="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND_TITLE}"
        -->
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
-                       <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
+                       <p:inputText id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
 
                        <p:outputLabel for="employeeDepartment" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_DEPARTMENT}" />
                        <p:selectOneMenu
                                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="employeeHeadquarters" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_HEADQUARTERS}" />
+                       <p:outputLabel for="employeeHeadquarter" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER}" />
                        <p:selectOneMenu
-                               id="employeeHeadquarters"
-                               value="#{adminEmployeeController.employeeHeadquarters}"
+                               id="employeeHeadquarter"
+                               value="#{adminEmployeeController.employeeHeadquarter}"
                                filter="true"
                                filterMatchMode="contains"
                                >
-                               <f:converter converterId="CompanyHeadquartersConverter" />
+
+                               <f:converter converterId="HeadquarterConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{companyHeadquartersController.allHeadquarterss()}" var="headquarters" itemValue="#{headquarters}" itemLabel="#{beanHelper.renderHeadquarters(headquarters)}" />
+
+                               <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}" />