X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fcontact%2Fadmin_contact_export.xhtml;h=db0b88321acd42042f3b4e538b6b985b496e33c7;hb=69ad5e85d12051a423df22b2bddac1d851e7eb52;hp=91b6c58c51d26ab0bba52c8f53e98aa01d690fbf;hpb=cee84cd0360fa3c82382d440902232f723b7d205;p=jjobs-war.git

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 91b6c58c..db0b8832 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -6,40 +6,48 @@
 	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">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}" />
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_export_contacts">
-				<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_big" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}" rendered="#{contactController.hasContacts()}">
+			<ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+
+			<h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
+				<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
 					<p:column exportable="false">
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
 						</f:facet>
 
-						<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_TITLE}" value="#{contact.contactId}">
+						<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
 							<f:param name="contactId" value="#{contact.contactId}" />
 						</h:link>
 					</p:column>
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
 						</f:facet>
 
-						<h:outputText value="#{msg[contact.contactGender.messageKey]}" />
+						<h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
 					</p:column>
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_TITLE}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactTitle}" />
@@ -47,7 +55,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactFirstName}" />
@@ -55,7 +63,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactFamilyName}" />
@@ -63,7 +71,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_STREET}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactStreet}" />
@@ -71,15 +79,15 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{contact.contactHouseNumber}" />
+						<h:outputText value="#{contact.contactHouseNumber}#{contact.contactHouseNumberExtension}" />
 					</p:column>
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactCountry.countryCode}" />
@@ -87,7 +95,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactZipCode}" />
@@ -95,7 +103,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_CITY}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactCity}" />
@@ -103,7 +111,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactEmailAddress}" />
@@ -111,15 +119,25 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_CELLPHONE_NUMBER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
+						</f:facet>
+
+						<h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
+							<f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+						</h:outputText>
+					</p:column>
+
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{adminContactController.generateCellphoneNumber(contact.contactCellphoneNumber)}" />
+						<h:outputText value="#{adminContactController.generateMobileNumber(contact.contactMobileNumber)}" />
 					</p:column>
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_LANDLINE_NUMBER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
 						</f:facet>
 
 						<h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactLandLineNumber)}" />
@@ -127,7 +145,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_FAX_NUMBER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
 						</f:facet>
 
 						<h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactFaxNumber)}" />
@@ -135,18 +153,18 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
 						</f:facet>
 
 						<h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-							<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+							<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
 						</h:outputText>
 					</p:column>
 				</p:dataTable>
 
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
-						#{msg.ADMIN_EXPORT_CONTACTS_TITLE}
+						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
 					</div>
 
 					<div class="para">
@@ -154,11 +172,11 @@
 					</div>
 
 					<div class="table_footer">
-						<h:commandButton styleClass="submit" type="submit" id="export_contacts" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_CSV}">
-							<p:dataExporter type="csv" target="table_export_contacts" fileName="all_contacts" />
+						<h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
+							<p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
 						</h:commandButton>
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>