Please cherry-pick:

[jjobs-war.git] / web / admin / headquarter / admin_headquarter_list.xhtml

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index c0268868076c634e8d5ee0f155c1e9ccec77e775..c19e0f27cc5a37fff97d2aa67cb63effce9f5b40 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -2,7 +2,6 @@
 <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"
@@ -186,28 +185,28 @@
                                                        updateLabel="true"
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
-                                                       <f:converter converterId="EmployeeConverter" />
+                                                       <f:converter converterId="ContactConverter" />
 
                                                        <f:selectItems
-                                                               value="#{employeeListController.allEmployees}"
-                                                               var="employee"
-                                                               itemValue="#{employee}"
-                                                               itemLabel="#{beanHelper.renderEmployee(employee)}"
+                                                               value="#{contactListController.allContacts}"
+                                                               var="contact"
+                                                               itemValue="#{contact}"
+                                                               itemLabel="#{beanHelper.renderContact(contact)}"
                                                                />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                        <p:link
-                                               outcome="admin_show_employee"
-                                               value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee)}"
+                                               outcome="admin_show_contact"
+                                               value="#{beanHelper.renderContact(headquarter.headquarterContactEmployee)}"
                                                title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}"
                                                rendered="#{not empty headquarter.headquarterContactEmployee}"
                                                >
-                                               <f:param name="employeeId" value="#{headquarter.headquarterContactEmployee.employeeId}" />
+                                               <f:param name="contactId" value="#{headquarter.headquarterContactEmployee.contactId}" />
                                        </p:link>
 
                                        <p:link
-                                               outcome="admin_assign_headquarter_employee"
+                                               outcome="admin_assign_headquarter_contact"
                                                value="#{msg.ADMIN_LINK_ASSIGN}"
                                                title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}"
                                                rendered="#{empty headquarter.headquarterContactEmployee}"
@@ -218,10 +217,20 @@
 
                                <p:column
                                        headerText="#{msg.ENTRY_CREATED_HEADER}"
-                                       sortBy="#{headquarter.headquarterCreated}"
+                                       sortBy="#{headquarter.headquarterEntryCreated}"
                                        filterable="false"
                                        >
-                                       <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
+                                       <h:outputText value="#{headquarter.headquarterEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{headquarter.headquarterEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{headquarter.headquarterEntryUpdated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
@@ -314,7 +323,7 @@
                                                <p:commandButton
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}"
-                                                       action="#{adminHeadquarterController.addHeadquarter()}"
+                                                       action="#{adminHeadquarterActionController.addHeadquarter()}"
                                                        update="form-list-headquarters:headquarterList"
                                                        />
                                        </p:panelGrid>
@@ -327,7 +336,7 @@
                                <p:dataTable
                                        id="headquarterOpeningTimeList"
                                        var="openingTime"
-                                       value="#{adminHeadquarterController.headquarterOpeningTimes}"
+                                       value="#{adminHeadquarterActionController.headquarterOpeningTimes}"
                                        rows="10"
                                        reflow="true"
                                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER_OPENING_TIMES}"
@@ -395,7 +404,7 @@
                                                <p:commandButton
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}"
-                                                       action="#{adminHeadquarterController.addOpeningTime()}"
+                                                       action="#{adminHeadquarterActionController.addOpeningTime()}"
                                                        update="form-list-headquarter-opening-time:headquarterOpeningTimeList"
                                                        />
                                        </p:panelGrid>