X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fbusiness_contacts%2Fadmin_business_contacts_list.xhtml;h=0af74d7078c2ba300697776b39fca1a54f570d0b;hb=e76c97e1e3504ace84f670f217eeaa493366ffeb;hp=e63fc10d602e72d44c8618d05a54750a15ff8a76;hpb=8804ce096028f160185edb4ed56b08026b571ba7;p=pizzaservice-war.git

diff --git a/web/admin/business_contacts/admin_business_contacts_list.xhtml b/web/admin/business_contacts/admin_business_contacts_list.xhtml
index e63fc10d..0af74d70 100644
--- a/web/admin/business_contacts/admin_business_contacts_list.xhtml
+++ b/web/admin/business_contacts/admin_business_contacts_list.xhtml
@@ -15,16 +15,16 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" styleClass="errors" rendered="#{businessDataController.allBusinessContacts().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{companyDataController.allCompanyBasicData().isEmpty()}" />
 
-		<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:dataTable id="table_list_business_contacts" var="companyData" value="#{companyDataController.allCompanyBasicData()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not companyDataController.allCompanyBasicData().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 outcome="admin_show_business_basic_data" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{companyData.basicDataId}">
+					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
 				</h:link>
 			</h:column>
 
@@ -33,9 +33,13 @@
 					<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_show_user" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE}" value="#{companyData.companyUserOwner.userId}" rendered="#{not empty companyData.companyUserOwner}">
+					<f:param name="userId" value="#{companyData.companyUserOwner.userId}" />
+				</h:link>
 
-				<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:link outcome="admin_assign_business_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty companyData.companyUserOwner}">
+					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				</h:link>
 			</h:column>
 
 			<h:column>
@@ -43,7 +47,11 @@
 					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME}" />
 				</f:facet>
 
-				<h:outputText value="#{businessContact.companyName}" />
+				<h:outputLink value="#{companyData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty companyData.companyWebsiteUrl}">
+					<h:outputText value="#{companyData.companyName}" />
+				</h:outputLink>
+
+				<h:outputText value="#{companyData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty companyData.companyWebsiteUrl}" />
 			</h:column>
 
 			<h:column>
@@ -51,9 +59,27 @@
 					<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.companyContactEmployee.employeeId}" rendered="#{not empty businessContact.companyContactEmployee}" />
+				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{companyData.companyContactEmployee.employeeId}" rendered="#{not empty companyData.companyContactEmployee}">
+					<f:param name="employeeId" value="#{companyData.companyContactEmployee.employeeId}" />
+				</h:link>
+
+				<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 companyData.companyContactEmployee}">
+					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				</h:link>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{companyData.companyFounder.employeeId}" rendered="#{not empty companyData.companyFounder}">
+					<f:param name="employeeId" value="#{companyData.companyFounder.employeeId}" />
+				</h:link>
 
-				<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.companyContactEmployee}" />
+				<h:link outcome="admin_assign_business_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty companyData.companyFounder}">
+					<f:param name="basicDataId" value="#{companyData.basicDataId}" />
+				</h:link>
 			</h:column>
 
 			<h:column>
@@ -61,15 +87,15 @@
 					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_CREATED}" />
 				</f:facet>
 
-				<h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
+				<h:outputText id="contactCreated" value="#{companyData.companyCreated.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:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_TITLE}" />
 				</div>
 
@@ -79,9 +105,9 @@
 
 				<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 class="table-footer">
+					<h:commandButton styleClass="reset divider-right" 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="#{adminCompanyDataController.addBusinessBasicData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>