]> git.mxchange.org Git - jjobs-war.git/blobdiff - web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
Please cherry-pick:
[jjobs-war.git] / web / WEB-INF / templates / admin / branch_office / admin_form_branch_office_data.tpl
index 55036f4330ebc379224d1568eb892e7b4fc705c7..6b4e9f96126288aba08c8a8f86c8ce96d3e279c3 100644 (file)
@@ -1,29 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       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">
-
-       <!--
-       @TODO: title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}"
-       -->
-       <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_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="branchCompany" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_COMPANY}" />
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND}">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
+                       <p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BASIC_DATA_BRANCH_OFFICE}" />
                        <p:selectOneMenu
                                id="branchCompany"
                                value="#{adminBranchOfficeController.branchCompany}"
                                filter="true"
                                filterMatchMode="contains"
                                required="true"
-                               requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
+                               requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
                                >
+
                                <f:converter converterId="BasicCompanyDataConverter" />
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" 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, true)}"
+                                       />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
                                filter="true"
                                filterMatchMode="contains"
                                >
-                               <f:converter converterId="CompanyEmployeeConverter" />
+
+                               <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)}"
+                                       />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="branchOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_OWNER}" />
+                       <p:selectOneMenu
+                               id="branchOwner"
+                               value="#{adminBranchOfficeController.branchOwner}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               >
+
+                               <f:converter converterId="EmployeeConverter" />
+
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+
+                               <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}" />
                                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}" />
-                       <p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                               <f:validator validatorId="EmailAddressValidator" />
-                               <f:attribute name="allowEmptyValue" value="true" />
+                       <p:inputText
+                               id="branchEmailAddress"
+                               size="40"
+                               maxlength="255"
+                               value="#{adminBranchOfficeController.branchEmailAddress}"
+                               validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+                               >
+                               <validator:branchOfficeEmailAddressValidator allowEmptyRequiredData="true" />
                        </p:inputText>
 
-                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
-                       <widgets:inputLandLineNumberPanelGrid targetController="#{adminBranchOfficeController}" />
+                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_LAND_LINE_NUMBER}" />
+                       <core:inputLandLineNumberPanelGrid targetController="#{adminBranchOfficeController}" />
 
                        <p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
-                       <widgets:inputFaxNumberPanelGrid targetController="#{adminBranchOfficeController}" />
+                       <core:inputFaxNumberPanelGrid targetController="#{adminBranchOfficeController}" />
 
                        <p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
-                       <p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
+                       <p:inputText id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
                </p:panelGrid>
        </p:fieldset>
 
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-                       <p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
+                       <p:inputText id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
 
                        <p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-                       <p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-                               <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
+                       <p:inputText id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
+                       <p:outputLabel for="branchLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
+                       <p:inputText id="branchLastHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                               <f:validateLongRange minimum="1" maximum="500" />
+                       </p:inputText>
+
+                       <p:outputLabel for="branchHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
+                       <p:inputText id="branchHouseNumberExtension" size="1" maxlength="255" value="#{adminBranchOfficeController.branchHouseNumberExtension}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" />
+
                        <p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-                       <p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
+                       <p:inputText id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
+                               <f:validateLongRange minimum="-5" maximum="200" />
                        </p:inputText>
 
                        <p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-                       <p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-                               <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
+                       <p:inputText id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-                       <p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
-                               <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
+                       <p:inputText id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+                               <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>
 
                        <p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-                       <p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
+                       <p:inputText id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
 
                        <p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-                       <widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
+                       <core:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COUNTRY_REQUIRED}" />
                </p:panelGrid>
        </p:fieldset>
 </ui:composition>