X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fdepartment%2Fadmin_department_list.xhtml;h=612e2966a6141d0069c1e0a26d2b0365e830824d;hb=b96f7dfe61fdbc2e9a258b6ee40d7aa55872ac03;hp=dfe8a9671b68246bf92afd5dcaffa405ee13c660;hpb=a5fa49d3fcd29c6595fe2c854ea608e10f173b07;p=jjobs-war.git

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index dfe8a967..612e2966 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -1,7 +1,7 @@
 <?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"
@@ -37,7 +37,7 @@
 				>
 
 				<f:facet name="header">
-					<p:panelGrid columns="2" columnClasses="ui-grid-col-10, ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+					<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_DEPARTMENTS_HEADER}" />
 
 						<h:panelGroup>
@@ -47,17 +47,17 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{department.departmentId}" filterable="false">
+				<p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" 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_DEPARTMENT_NAME}" sortBy="#{department.departmentName}" filterBy="#{department.departmentName}" filterMatchMode="contains">
-					<h:outputText value="#{department.departmentName}" />
+				<p:column headerText="#{msg.ADMIN_HEADER_I18N_KEY}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
+					<h:outputText value="#{local[department.departmentI18nKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany.companyName}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+				<p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -68,15 +68,15 @@
 							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="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
 						</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:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" />
 					</h:outputLink>
 
-					<h:outputText value="#{department.departmentCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
+					<h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
 				</p:column>
 
 				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
@@ -85,7 +85,7 @@
 							filter="true"
 							filterMatchMode="contains"
 							label="#{msg.LABEL_BRANCH_OFFICES}"
-							onchange="PF('employeeList').filter()"
+							onchange="PF('departmentList').filter()"
 							updateLabel="true"
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
@@ -95,11 +95,11 @@
 						</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>
 
-					<p:link outcome="admin_assign_department_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentBranchOffice}">
+					<p:link outcome="admin_assign_department_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentBranchOffice}">
 						<f:param name="departmentId" value="#{department.departmentId}" />
 					</p:link>
 				</p:column>
@@ -114,9 +114,9 @@
 							updateLabel="true"
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
-							<f:converter converterId="CompanyEmployeeConverter" />
+							<f:converter converterId="EmployeeConverter" />
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" 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>
 
@@ -129,7 +129,7 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner.userName}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+				<p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -154,13 +154,13 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{department.departmentCreated}" filterable="false">
+				<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" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+				<p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
 					<links:outputDepartmentAdminMiniLinks department="#{department}" />
 				</p:column>
 			</p:dataTable>