<?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: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:f="http://xmlns.jcp.org/jsf/core"
- xmlns:p="http://primefaces.org/ui">
+<ui:composition
+ template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ 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:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:p="http://primefaces.org/ui"
+ >
<ui:define name="document_admin_title">
<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_DEPARTMENTS}" />
<ui:define name="content">
<h:form id="form-list-department">
<p:dataTable
- id="table-list-department"
+ id="departmentList"
var="department"
value="#{departmentController.allDepartments()}"
- tableStyleClass="table table-full"
paginator="true"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
filteredValue="#{departmentController.filteredDepartments}"
<h:outputText value="#{msg.ADMIN_LIST_DEPARTMENTS_HEADER}" />
<h:panelGroup>
- <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
- <p:columnToggler datasource="table-list-department" trigger="toggler" />
+ <p:commandButton
+ id="toggler"
+ type="button"
+ value="#{msg.SELECT_SHOWN_COLUMNS}"
+ styleClass="column-selector"
+ />
+
+ <p:columnToggler datasource="departmentList" trigger="toggler" />
</h:panelGroup>
</p:panelGrid>
</f:facet>
- <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{department.departmentId}" filterable="false">
+ <p:column headerText="#{msg.ID_HEADER}" sortBy="#{department.departmentId}" filterable="false">
<p:link outcome="admin_show_department" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{department.departmentId}">
<f:param name="departmentId" value="#{department.departmentId}" />
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_HEADER_I18N_KEY}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
+ <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{local[department.departmentI18nKey]}" filterBy="#{local[department.departmentI18nKey]}" filterMatchMode="contains">
<h:outputText value="#{local[department.departmentI18nKey]}" />
</p:column>
- <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+ <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
<f:facet name="filter">
<p:selectCheckboxMenu
filter="true"
title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
>
<f:converter converterId="BasicCompanyDataConverter" />
- <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+ <f:selectItems
+ value="#{basicDataListController.allBasicData}"
+ var="basicData"
+ itemValue="#{basicData}"
+ itemLabel="#{beanHelper.renderBasicData(basicData, true)}"
+ />
</p:selectCheckboxMenu>
</f:facet>
- <h:outputLink value="#{department.departmentCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty department.departmentCompany.companyWebsiteUrl}">
- <h:outputText value="#{department.departmentCompany.companyName}" />
- </h:outputLink>
-
- <h:outputText value="#{department.departmentCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
+ <p:link
+ outcome="admin_show_basic_data"
+ value="#{beanHelper.renderBasicData(department.departmentCompany, true)}"
+ title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+ >
+ <f:param name="basicDataId" value="#{department.departmentCompany.basicDataId}" />
+ </p:link>
</p:column>
<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
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="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+ <f:selectItems
+ value="#{branchOfficeListController.allBranchOffices()}"
+ var="branchOffice"
+ itemValue="#{branchOffice}"
+ itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+ />
</p:selectCheckboxMenu>
</f:facet>
- <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{department.departmentBranchOffice.branchId}" rendered="#{not empty department.departmentBranchOffice}">
+ <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}" rendered="#{not empty department.departmentBranchOffice}">
<f:param name="branchId" value="#{department.departmentBranchOffice.branchId}" />
</p:link>
title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
>
<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:selectCheckboxMenu>
</f:facet>
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner.userName}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+ <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
<f:facet name="filter">
<p:selectCheckboxMenu
filter="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}" />
+
+ <f:selectItems
+ value="#{userController.allUsers()}"
+ var="user"
+ itemValue="#{user}"
+ itemLabel="#{beanHelper.renderUser(user)}"
+ />
</p:selectCheckboxMenu>
</f:facet>
</p:link>
</p:column>
- <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{department.departmentCreated}" filterable="false">
- <h:outputText id="departmentCreated" value="#{department.departmentCreated.time}">
- <f:convertDateTime for="departmentCreated" type="both" timeStyle="short" dateStyle="short" />
+ <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{department.departmentCreated}" filterable="false">
+ <h:outputText id="departmentCreated" value="#{department.departmentCreated}">
+ <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
</h:outputText>
</p:column>
- <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
- <links:outputDepartmentAdminMiniLinks department="#{department}" />
+ <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+ <links:outputDepartmentAdminDropdownMenu department="#{department}" />
</p:column>
</p:dataTable>
</h:form>
<h:form>
- <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+ <p:panelGrid
+ columns="1"
+ layout="grid"
+ >
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_ADD_DEPARTMENT_TITLE}" />
</f:facet>
<f:facet name="footer">
<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_DEPARTMENT_DATA}"
action="#{adminDepartmentController.addDepartment()}"
- update=":master:form-list-department:table-list-department"
+ update=":master:form-list-department:departmentList"
/>
</p:panelGrid>
</f:facet>
projects / jjobs-war.git / blobdiff