X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fheadquarter%2Fadmin_headquarter_list.xhtml;h=297a5c74503426530cc262b9327b32173e2fdca5;hb=7f47d8c52a333a812c65df514a613bc6a8559de8;hp=2efe6c1543d7a053e9a545bbcdd343aab7996bb5;hpb=9efd30e58f39e5f3a1fc1fee041411f5ea7f968e;p=jjobs-war.git

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index 2efe6c15..297a5c74 100644
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -1,11 +1,13 @@
 <?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: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_HEADQUARTER}" />
@@ -16,43 +18,96 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form-list-Headquarter">
+		<h:form id="form-list-headquarters">
 			<p:dataTable
 				id="headquarterList"
 				var="headquarter"
-				value="#{headquarterController.allHeadquarter()}"
-				tableStyleClass="table table-full"
+				value="#{headquarterListController.allHeadquarters}"
 				paginator="true"
 				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-				filteredValue="#{headquarterController.filteredHeadquarter}"
+				filteredValue="#{headquarterListController.filteredHeadquarters}"
 				rows="10"
+				rowKey="#{headquarter.headquarterId}"
 				reflow="true"
 				resizableColumns="true"
 				rowsPerPageTemplate="5,10,20,50,100"
 				sortMode="multiple"
-				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER}"
-				emptyMessage="#{msg.ADMIN_EMPTY_LIST_HEADQUARTER}"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICES}"
 				widgetVar="headquarterList"
+				selectionMode="single"
+				selection="#{headquarterListController.selectedHeadquarter}"
+				skipChildren="true"
 				>
 
 				<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">
-						<h:outputText value="#{msg.ADMIN_LIST_HEADQUARTER_HEADER}" />
+					<p:panelGrid
+						columns="3"
+						layout="grid"
+						columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+						>
+						<p:spacer />
+
+						<p:panelGrid
+							columns="2"
+							columnClasses="ui-grid-4,ui-grid-8"
+							layout="grid"
+							styleClass="ui-noborder"
+							>
+							<p:outputLabel
+								for="globalFilter"
+								value="#{msg.SEARCH_ALL_FIELDS}"
+								style="float: right"
+								/>
+
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('departmentList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
+						</p:panelGrid>
+
+						<p:outputPanel>
+							<p:spacer height="4" />
+
+							<p:commandButton
+								id="toggler"
+								type="button"
+								value="#{msg.SELECT_SHOWN_COLUMNS}"
+								styleClass="column-selector"
+								/>
 
-						<h:panelGroup>
-							<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
 							<p:columnToggler datasource="headquarterList" trigger="toggler" />
-						</h:panelGroup>
+						</p:outputPanel>
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{headquarter.headquarterId}" filterable="false">
-					<p:link outcome="admin_show_headquarter" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}" value="#{headquarter.headquarterId}">
+				<p:ajax
+					event="rowSelect"
+					update="form-list-headquarters:headquarter-details"
+					oncomplete="PF('headquarterDialog').show()"
+					/>
+
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{headquarter.headquarterId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_headquarter"
+						value="#{headquarter.headquarterId}"
+						title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}"
+						>
 						<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{headquarter.headquarterUserOwner}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{headquarter.headquarterUserOwner}"
+					filterBy="#{headquarter.headquarterUserOwner}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -63,31 +118,65 @@
 							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="#{userListController.allUsers}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_OWNER_USER_TITLE}" value="#{headquarter.headquarterUserOwner.userId}" rendered="#{not empty headquarter.headquarterUserOwner}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{headquarter.headquarterUserOwner.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_OWNER_USER_TITLE}"
+						rendered="#{not empty headquarter.headquarterUserOwner}"
+						>
 						<f:param name="userId" value="#{headquarter.headquarterUserOwner.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_headquarter_owner" title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty headquarter.headquarterUserOwner}">
+					<p:link
+						outcome="admin_assign_headquarter_owner"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_OWNER_USER_TITLE}"
+						rendered="#{empty headquarter.headquarterUserOwner}"
+						>
 						<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{headquarter.headquarterEmailAddress}" filterBy="#{headquarter.headquarterEmailAddress}" filterMatchMode="contains">
-					<p:link href="mailto:#{headquarter.headquarterEmailAddress}" value="#{headquarter.headquarterEmailAddress}" rendered="#{not empty headquarter.headquarterEmailAddress}" />
+				<p:column
+					headerText="#{msg.DATA_EMAIL_ADDRESS}"
+					sortBy="#{headquarter.headquarterEmailAddress}"
+					filterBy="#{headquarter.headquarterEmailAddress}"
+					filterMatchMode="contains"
+					>
+					<p:link
+						href="mailto:#{headquarter.headquarterEmailAddress}"
+						value="#{headquarter.headquarterEmailAddress}"
+						rendered="#{not empty headquarter.headquarterEmailAddress}"
+						/>
 
 					<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty headquarter.headquarterEmailAddress}" />
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_ADDRESS}" sortBy="#{headquarter.headquarterCity}" filterBy="#{headquarter.headquarterCity}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.DATA_ADDRESS}"
+					sortBy="#{headquarter.headquarterCity}"
+					filterBy="#{headquarter.headquarterCity}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{beanHelper.renderHeadquarter(headquarter)}" title="#{beanHelper.renderHeadquarter(headquarter)}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{headquarter.headquarterContactEmployee}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+					sortBy="#{headquarter.headquarterContactEmployee}"
+					filterBy="#{headquarter.headquarterContactEmployee}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -98,34 +187,112 @@
 							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="#{employeeListController.allEmployees}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee, false)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}" value="#{headquarter.headquarterContactEmployee.employeeId}" rendered="#{not empty headquarter.headquarterContactEmployee}">
+					<p:link
+						outcome="admin_show_employee"
+						value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee, false)}"
+						title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}"
+						rendered="#{not empty headquarter.headquarterContactEmployee}"
+						>
 						<f:param name="employeeId" value="#{headquarter.headquarterContactEmployee.employeeId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_headquarter_employee" title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty headquarter.headquarterContactEmployee}">
+					<p:link
+						outcome="admin_assign_headquarter_employee"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}"
+						rendered="#{empty headquarter.headquarterContactEmployee}"
+						>
 						<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
-					<h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated.time}">
-						<f:convertDateTime for="headquarterCreated" type="both" timeStyle="short" dateStyle="short" />
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{headquarter.headquarterCreated}"
+					filterable="false"
+					>
+					<h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
+						<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:outputHeadquarterAdminMiniLinks headquarter="#{headquarter}" />
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
+					<p:menuButton value="#{msg.OPTIONS}">
+						<p:menuitem
+							outcome="admin_show_headquarter"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}"
+							>
+							<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_headquarter"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{msg.ADMIN_LINK_EDIT_HEADQUARTER_TITLE}"
+							>
+							<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_delete_headquarter">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{msg.ADMIN_LINK_DELETE_HEADQUARTER_TITLE}"
+								/>
+							<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+						</p:menuitem>
+					</p:menuButton>
 				</p:column>
 			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{msg.ADMIN_SINGLE_HEADQUARTER_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="headquarterDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="headquarter-details">
+					<p:panelGrid columns="2" rendered="#{not empty headquarterListController.selectedHeadquarter}">
+						<f:facet name="header">
+							<h:outputFormat value="#{msg.ADMIN_HEADQUARTER_DETAILS_HEADER}">
+								<f:param value="#{headquarterListController.selectedHeadquarter.headquarterCompanyName}" />
+								<f:param value="#{headquarterListController.selectedHeadquarter.headquarterId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.HEADQUARTER_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{headquarterListController.selectedHeadquarter.headquarterId}" />
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
 		</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_HEADQUARTER_TITLE}" />
 				</f:facet>
@@ -145,11 +312,10 @@
 							/>
 
 						<p:commandButton
-							styleClass="submit"
 							type="submit"
 							value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}"
 							action="#{adminHeadquarterController.addHeadquarter()}"
-							update=":master:form-list-Headquarter:headquarterList"
+							update="form-list-headquarters:headquarterList"
 							/>
 					</p:panelGrid>
 				</f:facet>
@@ -162,7 +328,6 @@
 					id="headquarterOpeningTimeList"
 					var="openingTime"
 					value="#{adminHeadquarterController.headquarterOpeningTimes}"
-					tableStyleClass="table table-full"
 					rows="10"
 					reflow="true"
 					summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER_OPENING_TIMES}"
@@ -174,22 +339,30 @@
 						<h:outputText value="#{msg.ADMIN_LIST_HEADQUARTER_OPENING_TIMES_HEADER}" />
 					</f:facet>
 
-					<p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+					<p:column
+						headerText="#{msg.ADMIN_START_WEEK_DAY}"
+						>
 						<h:outputText value="#{openingTime.openingStartDay.toString()}" />
 					</p:column>
 
-					<p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+					<p:column
+						headerText="#{msg.ADMIN_END_WEEK_DAY}"
+						>
 						<h:outputText value="#{openingTime.openingEndDay.toString()}" />
 					</p:column>
 
-					<p:column headerText="#{msg.ADMIN_START_TIME}">
-						<h:outputText value="#{openingTime.openingStartTime.time}">
+					<p:column
+						headerText="#{msg.ADMIN_START_TIME}"
+						>
+						<h:outputText value="#{openingTime.openingStartTime}">
 							<f:convertDateTime type="time" timeStyle="short" />
 						</h:outputText>
 					</p:column>
 
-					<p:column headerText="#{msg.ADMIN_END_TIME}">
-						<h:outputText value="#{openingTime.openingEndTime.time}">
+					<p:column
+						headerText="#{msg.ADMIN_END_TIME}"
+						>
+						<h:outputText value="#{openingTime.openingEndTime}">
 							<f:convertDateTime type="time" timeStyle="short" />
 						</h:outputText>
 					</p:column>
@@ -197,8 +370,11 @@
 			</p:fieldset>
 		</h:form>
 
-		<h:form id="form-admin-add-headquarter-opening-time">
-			<p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+		<h:form>
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE}" />
 				</f:facet>
@@ -212,17 +388,15 @@
 				<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_HEADQUARTER_OPENING_TIME}"
 							action="#{adminHeadquarterController.addOpeningTime()}"
-							update=":master:form-list-headquarter-opening-time:headquarterOpeningTimeList"
+							update="form-list-headquarter-opening-time:headquarterOpeningTimeList"
 							/>
 					</p:panelGrid>
 				</f:facet>