From: Roland Häder <roland@mxchange.org>
Date: Sat, 19 Aug 2017 17:55:02 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a79d8e38f2ebf0419f23976ea2e792640d0408e2;p=pizzaservice-war.git

Please cherry-pick:
- renamed template again, should be whole business "contact" and not just basic
  data

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 2101bb24..075a9377 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -109,12 +109,12 @@
 			<to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_business_basic_data</from-outcome>
-			<to-view-id>/admin/business_basic_data/admin_business_basic_data_list.xhtml</to-view-id>
+			<from-outcome>admin_list_business_contacts</from-outcome>
+			<to-view-id>/admin/business_contacts/admin_business_contacts_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_export_business_basic_data</from-outcome>
-			<to-view-id>/admin/business_basic_data/admin_business_basic_data_export.xhtml</to-view-id>
+			<from-outcome>admin_export_business_contacts</from-outcome>
+			<to-view-id>/admin/business_contacts/admin_business_contacts_export.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_user</from-outcome>
diff --git a/web/admin/business_basic_data/admin_business_basic_data_list.xhtml b/web/admin/business_basic_data/admin_business_basic_data_list.xhtml
deleted file mode 100644
index ab2de3f3..00000000
--- a/web/admin/business_basic_data/admin_business_basic_data_list.xhtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
-
-	<ui:define name="admin_title">
-		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<ui:fragment rendered="#{businessDataController.allBusinessContacts().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-				<ui:param name="message" value="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" />
-				<ui:param name="styleClass" value="errors" />
-			</ui:include>
-		</ui:fragment>
-
-		<h:dataTable id="table_list_business_contacts" var="businessContact" value="#{businessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_ID}" />
-				</f:facet>
-
-				<h:link outcome="admin_show_business_basic_data" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
-					<f:param name="businessDataId" value="#{businessContact.businessDataId}" />
-				</h:link>
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_OWNER_ID}" />
-				</f:facet>
-
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
-
-				<h:link outcome="admin_assign_business_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME}" />
-				</f:facet>
-
-				<h:outputText value="#{businessContact.companyName}" />
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_CONTACT_PERSON}" />
-				</f:facet>
-
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
-
-				<h:link outcome="admin_assign_business_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_CREATED}" />
-				</f:facet>
-
-				<h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
-					<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-				</h:outputText>
-			</h:column>
-		</h:dataTable>
-
-		<h:form id="form_admin_add_business_basic_data">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
-					<h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_TITLE}" />
-				</div>
-
-				<div class="para">
-					<h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_MINIMUM_DATA}" />
-				</div>
-
-				<ui:include src="/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl" />
-
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
-				</div>
-			</h:panelGroup>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/business_contacts/admin_business_contacts_list.xhtml b/web/admin/business_contacts/admin_business_contacts_list.xhtml
new file mode 100644
index 00000000..ab2de3f3
--- /dev/null
+++ b/web/admin/business_contacts/admin_business_contacts_list.xhtml
@@ -0,0 +1,93 @@
+<?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:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+	<ui:define name="admin_title">
+		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<ui:fragment rendered="#{businessDataController.allBusinessContacts().isEmpty()}">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
+				<ui:param name="message" value="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" />
+				<ui:param name="styleClass" value="errors" />
+			</ui:include>
+		</ui:fragment>
+
+		<h:dataTable id="table_list_business_contacts" var="businessContact" value="#{businessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_ID}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_business_basic_data" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
+					<f:param name="businessDataId" value="#{businessContact.businessDataId}" />
+				</h:link>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_OWNER_ID}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
+
+				<h:link outcome="admin_assign_business_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME}" />
+				</f:facet>
+
+				<h:outputText value="#{businessContact.companyName}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_CONTACT_PERSON}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
+
+				<h:link outcome="admin_assign_business_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_CREATED}" />
+				</f:facet>
+
+				<h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
+					<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+				</h:outputText>
+			</h:column>
+		</h:dataTable>
+
+		<h:form id="form_admin_add_business_basic_data">
+			<h:panelGroup styleClass="table_medium" layout="block">
+				<div class="table_header">
+					<h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_TITLE}" />
+				</div>
+
+				<div class="para">
+					<h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_MINIMUM_DATA}" />
+				</div>
+
+				<ui:include src="/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl" />
+
+				<div class="table_footer">
+					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
+				</div>
+			</h:panelGroup>
+		</h:form>
+	</ui:define>
+</ui:composition>