Continued a bit:

- added user data export (currently with contact data)
- user name is only shown/exported when enabled as requirement in project

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 81e62719e3f72c0e70750d8f779801d1cfbdc1dc..c81a6cbbff1ce3750e8c0688e92c5bae9e3e6014 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,70 +2,71 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="privacy.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="user/index.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/login_other_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/login_start_sharing_addressbook.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="index.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="*" x="650" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="guest/user/login_error.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/login_list_sharing_addressbooks.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="privacy.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/index.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="user/index.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="user/login_other_addressbooks.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="user/login_start_sharing_addressbook.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="*" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_export.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="exception.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="user/login_list_sharing_addressbooks.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="guest/user/register_page2.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="terms.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="logout.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="imprint.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="user/login_shared_addressbooks.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="terms.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/login_shared_addressbooks.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="1650" y="750" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 1d45e2cb6e6c6ad23adfcd046c648b6f47f02b2f..badc84db55cf43cd15614ccc870cb4ce8893bacc 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -580,3 +580,12 @@ GUEST_CONTACT_DATA_CITY_REQUIRED=Bitte geben Sie Ihren Wohnort ein.
 GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Bitte geben Sie Ihr Geburtsdatum ein.
 FIELD_GENDER_REQUIRED=Bitte w\u00e4hlen Sie eine Anrede aus.
 ADMIN_PERSONAL_DATA_TITLE=Titel:
+LINK_ADMIN_EXPORT_USER=Benutzerdaten exportieren
+LINK_ADMIN_EXPORT_USER_TITLE=Exportiert alle Benutzerdaten (und Kontaktdaten).
+PAGE_TITLE_ADMIN_EXPORT_USER=Benutzerdaten exportieren
+CONTENT_TITLE_ADMIN_EXPORT_USER=Benutzerdaten exportieren:
+ADMIN_EXPORT_USER_ID=Benutzer-Id
+ADMIN_EXPORT_USER_ACCOUNT_STATUS=Accountstatus
+ADMIN_EXPORT_USERS_TITLE=Export der Benutzerdaten starten:
+ADMIN_EXPORT_USERS_TIMEOUT_WARNING=Bei sehr gro\u00dfen Datenmengen kann es eventuell zu Zeit\u00fcberschreitungen kommen. Daher sollten Sie besser seitenweise exportieren.
+BUTTON_ADMIN_EXPORT_USERS_XLS=Benutzerdaten als Excel-Datei

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index dc922c608aad6964a06fde07c67bea11ad579110..54a4c14ff0b8911cba345f6084c9ae827ab08d0e 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -578,3 +578,12 @@ GUEST_CONTACT_DATA_CITY_REQUIRED=Please enter your city.
 GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Please enter your birthday.
 FIELD_GENDER_REQUIRED=Please select a salutation.
 ADMIN_PERSONAL_DATA_TITLE=Title:
+LINK_ADMIN_EXPORT_USER=Export user data
+LINK_ADMIN_EXPORT_USER_TITLE=Exports all user and contact data.
+PAGE_TITLE_ADMIN_EXPORT_USER=Export user data
+CONTENT_TITLE_ADMIN_EXPORT_USER=Export user data:
+ADMIN_EXPORT_USER_ID=User id
+ADMIN_EXPORT_USER_ACCOUNT_STATUS=Account status
+ADMIN_EXPORT_USERS_TITLE=Start export of user data:
+ADMIN_EXPORT_USERS_TIMEOUT_WARNING=Big data amount may lead to timeouts. You should then try to export each page separately.
+BUTTON_ADMIN_EXPORT_USERS_XLS=User data as Excel file

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index bae43f53c4d5e83496731e63097ea6c6ddafba5b..8bde2fa7738815306cb80d68f6da8ef0d91d8c5e 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -87,6 +87,10 @@
                        <from-outcome>admin_list_mobile_provider</from-outcome>
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_export_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_export.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/user/login.xhtml</from-view-id>
@@ -391,6 +395,20 @@
                        <to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/contact/admin_contact_export.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_export.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <!--
        <factory>
                <exception-handler-factory>

diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 561a516bae591ddfc2cfc94968531467770e3380..da659c550f3317ce1bda4d9076aeeb1d10445842 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -20,6 +20,7 @@
 
                        <ul>
                                <li><h:link title="#{msg.LINK_ADMIN_LIST_USER_TITLE}" outcome="admin_list_user" value="#{msg.LINK_ADMIN_LIST_USER}" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" /></li>
                        </ul>
 
                        <div class="menu_header">

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
new file mode 100644 (file)
index 0000000..0d44f62
--- /dev/null
+++ b/web/admin/user/admin_user_export.xhtml
@@ -0,0 +1,192 @@
+<!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}"
+       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"
+
+       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_USER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:form id="form_export_users">
+                               <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_big" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{userController.hasUsers()}">
+                                       <p:column exportable="false">
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
+                                               </f:facet>
+
+                                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                                       <f:param name="userId" value="#{user.userId}" />
+                                               </h:link>
+                                       </p:column>
+
+                                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                                               <p:column>
+                                                       <f:facet name="header">
+                                                               <h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />
+                                                       </f:facet>
+
+                                                       <h:outputText value="#{user.userName}" />
+                                               </p:column>
+                                       </ui:fragment>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_ACCOUNT_STATUS}" />
+                                               </f:facet>
+
+                                               <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_GENDER}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_TITLE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactTitle}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactFirstName}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactFamilyName}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactStreet}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactHouseNumber}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactCountry.countryCode}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactZipCode}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactCity}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{user.userContact.contactEmailAddress}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
+                                               </f:facet>
+
+                                               <h:outputText id="contactBirthday" value="#{user.userContact.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_CELLPHONE_NUMBER}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactCellphoneNumber)}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactFaxNumber)}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
+                                               </f:facet>
+
+                                               <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
+                                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                               </h:outputText>
+                                       </p:column>
+                               </p:dataTable>
+
+                               <div class="table_medium">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
+                                       </div>
+
+                                       <div class="para">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
+                                       </div>
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
+                                                       <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+                                               </h:commandButton>
+                                       </div>
+                               </div>
+                       </h:form>
+               </ui:define>
+       </ui:composition>
+</html>

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 1476295a4d8dc2daecd47d114f0167aa419d7cf5..7a8950d8ca2feb3acc728c3edc632104e93bcb7e 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -36,11 +36,13 @@
                                        <h:outputText id="userId" styleClass="data_field" value="#{beanHelper.user.userId}" />
                                </h:column>
 
-                               <h:column>
-                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
+                               <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                                       <h:column>
+                                               <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
 
-                                       <h:outputText id="userName" styleClass="data_field" value="#{beanHelper.user.userName}" />
-                               </h:column>
+                                               <h:outputText id="userName" styleClass="data_field" value="#{beanHelper.user.userName}" />
+                                       </h:column>
+                               </ui:fragment>
 
                                <h:column>
                                        <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />