Please cherry-pick:

[jjobs-war.git] / web / admin / employee / admin_employee_list.xhtml

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index d8317bbb0312b8e555056f09a0c1496e2742eaac..7d3ea7d79e7d8b54c69e98ab8229f2f4a84cc55b 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-company-employees">
                        <p:dataTable
-                               id="table-list-company-employees"
+                               id="employeeList"
                                var="employee"
                                value="#{employeeController.allEmployees()}"
                                filteredValue="#{employeeController.filteredEmployees}"
@@ -42,12 +42,12 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-company-employees" trigger="toggler" />
+                                                       <p:columnToggler datasource="employeeList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{employee.employeeId}" filterable="false">
+                               <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>
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner}" 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"
@@ -102,7 +102,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" 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"
@@ -113,7 +113,7 @@
                                                        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="#{basicData.companyName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -130,13 +130,13 @@
                                        <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty employee.employeeEmailAddress}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{employee.employeeCreated}" filterable="false">
+                               <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_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputEmployeeAdminMiniLinks employee="#{employee}" />
                                </p:column>
                        </p:dataTable>
@@ -167,7 +167,7 @@
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}"
                                                        action="#{adminEmployeeController.addEmployee()}"
-                                                       update=":master:form-list-company-employees:table-list-company-employees"
+                                                       update=":master:form-list-company-employees:employeeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>