X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_export.xhtml;h=05b93c009c353d890568df1d29fc5023a396a6b4;hb=b4e72d06135e7957ba4c5d59bfa9ca93ab909cb3;hp=4938f98a3021181fe93d3ebe597601bc44eb135b;hpb=fe9bfcdf9bcd8958483f9dd4d87a0f3f02acdaa2;p=jjobs-war.git

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 4938f98a..05b93c00 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -17,7 +17,7 @@
 
 		<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:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{not userController.allUsers().isEmpty()}">
 					<p:column exportable="false">
 						<f:facet name="header">
 							<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
@@ -28,7 +28,7 @@
 						</h:link>
 					</p:column>
 
-					<ui:fragment rendered="#{userController.isUserNameRequired()}">
+					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
 						<p:column>
 							<f:facet name="header">
 								<h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />
@@ -91,7 +91,7 @@
 							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{user.userContact.contactHouseNumber}" />
+						<h:outputText value="#{user.userContact.contactHouseNumber}#{user.userContact.contactHouseNumberExtension}" />
 					</p:column>
 
 					<p:column>
@@ -138,10 +138,10 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactCellphoneNumber)}" />
+						<h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactMobileNumber)}" />
 					</p:column>
 
 					<p:column>
@@ -171,7 +171,7 @@
 					</p:column>
 				</p:dataTable>
 
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
 					</div>
@@ -182,10 +182,10 @@
 
 					<div class="table_footer">
 						<h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-							<p:dataExporter type="xls" target="table_export_users" fileName="admin_users" />
+							<p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
 						</h:commandButton>
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>