<?xml version="1.0" encoding="UTF-8" ?>
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+ xmlns:core="http://mxchange.org/jsf/core/widgets"
xmlns:links="http://mxchange.org/jsf/core/links"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:p="http://primefaces.org/ui">
<ui:define name="document_admin_title">
- <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE}" />
+ <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_EMPLOYEE}" />
</ui:define>
<ui:define name="content_header">
- <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_COMPANY_EMPLOYEE}" />
+ <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_EMPLOYEE}" />
</ui:define>
<ui:define name="content">
<h:form id="form-list-company-employees">
<p:dataTable
- id="table-list-company-employees"
+ id="employeeList"
var="employee"
- value="#{companyEmployeeController.allCompanyEmployees()}"
+ value="#{employeeController.allEmployees()}"
+ filteredValue="#{employeeController.filteredEmployees}"
tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
- filteredValue="#{companyEmployeeController.filteredEmployees}"
rows="10"
reflow="true"
resizableColumns="true"
rowsPerPageTemplate="5,10,20,50,100"
sortMode="multiple"
- summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COMPANY_EMPLOYEES}"
- emptyMessage="#{msg.ADMIN_COMPANY_EMPLOYEES_LIST_EMPTY}"
+ summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_EMPLOYEES}"
+ emptyMessage="#{msg.ADMIN_EMPTY_LIST_EMPLOYEES}"
widgetVar="employeeList"
>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_COMPANY_EMPLOYEES_HEADER}" />
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
- <p:columnToggler datasource="table-list-company-employees" trigger="toggler" />
+ <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+ <h:outputText value="#{msg.ADMIN_LIST_EMPLOYEES_HEADER}" />
+
+ <h:panelGroup>
+ <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+ <p:columnToggler datasource="employeeList" trigger="toggler" />
+ </h:panelGroup>
+ </p:panelGrid>
</f:facet>
- <p:column headerText="#{msg.ADMIN_ASSIGNED_COMPANY_EMPLOYEE}" sortBy="#{employee.employeeBranchOffice}" filterBy="#{employee.employeeBranchOffice}" filterMatchMode="in">
+ <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{employee.employeeId}" filterable="false">
+ <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}" value="#{employee.employeeId}">
+ <f:param name="employeeId" value="#{employee.employeeId}" />
+ </p:link>
+ </p:column>
+
+ <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{employee.employeeBranchOffice}" filterBy="#{employee.employeeBranchOffice}" filterMatchMode="in">
<f:facet name="filter">
- <p:selectCheckboxMenu filter="true" filterMatchMode="contains" label="#{msg.LABEL_USERS}" onchange="PF('employeeTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE}">
+ <p:selectCheckboxMenu
+ filter="true"
+ filterMatchMode="contains"
+ label="#{msg.LABEL_BRANCH_OFFICES}"
+ onchange="PF('employeeList').filter()"
+ updateLabel="true"
+ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
+ >
<f:converter converterId="BranchOfficeConverter" />
- <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="employeeOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+ <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_COMPANY_EMPLOYEES_COMPANY_EMPLOYEE_TITLE}" value="#{employee.employeeBranchOffice.branchId}" rendered="#{not empty employee.employeeBranchOffice}">
- <f:param name="userId" value="#{employee.employeeBranchOffice.branchId}" />
+ <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}" rendered="#{not empty employee.employeeBranchOffice}">
+ <f:param name="branchId" value="#{employee.employeeBranchOffice.branchId}" />
</p:link>
- <p:link outcome="admin_assign_employee_owner" title="#{msg.ADMIN_LINK_ASSIGN_COMPANY_EMPLOYEES_COMPANY_EMPLOYEE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeBranchOffice}">
+ <p:link outcome="admin_assign_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeBranchOffice}">
<f:param name="employeeId" value="#{employee.employeeId}" />
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner.userName}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
+ <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{employee.employeeUserOwner}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
<f:facet name="filter">
- <p:selectCheckboxMenu filter="true" filterMatchMode="contains" label="#{msg.LABEL_USERS}" onchange="PF('employeeTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}">
+ <p:selectCheckboxMenu
+ filter="true"
+ filterMatchMode="contains"
+ label="#{msg.LABEL_USERS}"
+ onchange="PF('employeeList').filter()"
+ updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+ >
<f:converter converterId="UserConverter" />
- <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_COMPANY_EMPLOYEES_OWNER_USER_TITLE}" value="#{employee.employeeUserOwner.userId}" rendered="#{not empty employee.employeeUserOwner}">
+ <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEES_OWNER_USER_TITLE}" value="#{employee.employeeUserOwner.userId}" rendered="#{not empty employee.employeeUserOwner}">
<f:param name="userId" value="#{employee.employeeUserOwner.userId}" />
</p:link>
- <p:link outcome="admin_assign_employee_owner" title="#{msg.ADMIN_LINK_ASSIGN_COMPANY_EMPLOYEES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeUserOwner}">
+ <p:link outcome="admin_assign_user_owner" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeUserOwner}">
<f:param name="employeeId" value="#{employee.employeeId}" />
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{employee.employeeCompany.companyName}" filterBy="#{employee.employeeCompany}" filterMatchMode="in">
+ <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" filterMatchMode="in">
<f:facet name="filter">
- <p:selectCheckboxMenu filter="true" filterMatchMode="contains" label="#{msg.LABEL_COMPANIES}" onchange="PF('employeeTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}">
+ <p:selectCheckboxMenu
+ filter="true"
+ filterMatchMode="contains"
+ label="#{msg.LABEL_COMPANIES}"
+ onchange="PF('employeeList').filter()"
+ updateLabel="true"
+ title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+ >
<f:converter converterId="BasicCompanyDataConverter" />
- <f:selectItems value="#{basicCompanyDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+ <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
</p:selectCheckboxMenu>
</f:facet>
- <h:outputLink value="#{employee.employeeCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty employee.employeeCompany.companyWebsiteUrl}">
- <h:outputText value="#{employee.employeeCompany.companyName}" />
+ <h:outputLink value="#{employee.employeeBasicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty employee.employeeBasicData.companyWebsiteUrl}">
+ <h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" />
</h:outputLink>
- <h:outputText value="#{employee.employeeCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty employee.employeeCompany.companyWebsiteUrl}" />
+ <h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty employee.employeeBasicData.companyWebsiteUrl}" />
</p:column>
<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{employee.employeeEmailAddress}" filterBy="#{employee.employeeEmailAddress}" filterMatchMode="contains">
- <h:outputLink value="mailto:#{employee.employeeEmailAddress}" rendered="#{not empty employee.employeeEmailAddress}" />
+ <p:link href="mailto:#{employee.employeeEmailAddress}" value="#{employee.employeeEmailAddress}" rendered="#{not empty employee.employeeEmailAddress}" />
<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty employee.employeeEmailAddress}" />
</p:column>
- <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{employee.employeeCreated}">
+ <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{employee.employeeCreated}" filterable="false">
<h:outputText id="employeeCreated" value="#{employee.employeeCreated.time}">
<f:convertDateTime for="employeeCreated" type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
- <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false">
- <links:outputCompanyEmployeeAdminMiniLinks employee="#{employee}" />
+ <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+ <links:outputEmployeeAdminMiniLinks employee="#{employee}" />
</p:column>
</p:dataTable>
</h:form>
<h:form>
<p:panelGrid layout="grid" columns="1" styleClass="table table-full">
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_ADD_COMPANY_EMPLOYEE_TITLE}" />
+ <h:outputText value="#{msg.ADMIN_ADD_EMPLOYEE_TITLE}" />
</f:facet>
- <h:outputText value="#{msg.ADMIN_ADD_COMPANY_EMPLOYEE_MINIMUM_DATA}" />
+ <h:outputText value="#{msg.ADMIN_ADD_EMPLOYEE_MINIMUM_DATA}" />
<h:column>
<ui:include src="/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl" />
</h:column>
<f:facet name="footer">
- <p:commandButton
- styleClass="reset divider-right"
- type="reset"
- value="#{msg.BUTTON_RESET_FORM}"
- />
- <p:commandButton
- styleClass="submit"
- type="submit"
- value="#{msg.BUTTON_ADMIN_ADD_COMPANY_EMPLOYEE}"
- action="#{adminCompanyEmployeeController.addCompanyEmployee()}"
- update=":master:form-list-company-employees:table-list-company-employees"
- />
+ <p:panelGrid columns="2" layout="grid">
+ <p:commandButton
+ styleClass="reset"
+ type="reset"
+ value="#{msg.BUTTON_RESET_FORM}"
+ />
+
+ <p:commandButton
+ styleClass="submit"
+ type="submit"
+ value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}"
+ action="#{adminEmployeeController.addEmployee()}"
+ update=":master:form-list-company-employees:employeeList"
+ />
+ </p:panelGrid>
</f:facet>
</p:panelGrid>
</h:form>
projects / jjobs-war.git / blobdiff