X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fcontact%2Fadmin_contact_export.xhtml;h=5421c06fee519935b7703b8cea6f03f768f9eb7c;hb=33723c0aeab29db3c92467bbed024a995f454f74;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..5421c06f 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html
 	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -18,10 +17,10 @@
 
 		<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()}">
+				<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="#{not contactController.allContacts().isEmpty()}">
 					<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}">
@@ -31,7 +30,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_GENDER}" />
 						</f:facet>
 
 						<h:outputText value="#{msg[contact.contactGender.messageKey]}" />
@@ -39,7 +38,7 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_CONTACT_TITLE}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_TITLE}" />
 						</f:facet>
 
 						<h:outputText value="#{contact.contactTitle}" />
@@ -47,7 +46,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 +54,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 +62,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 +70,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 +86,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 +94,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 +102,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,7 +110,17 @@
 
 					<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)}" />
@@ -119,7 +128,7 @@
 
 					<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 +136,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 +144,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 +163,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>
