dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25412
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12604: Removed pdf export in user
------------------------------------------------------------
revno: 12604
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-10-13 18:19:17 +0200
message:
Removed pdf export in user
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java 1970-01-01 00:00:00 +0000
@@ -1,206 +0,0 @@
-package org.hisp.dhis.user.action.pdf;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.common.ServiceProvider;
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.i18n.I18nFormat;
-import org.hisp.dhis.importexport.ExportParams;
-import org.hisp.dhis.importexport.ExportService;
-import org.hisp.dhis.system.filter.UserCredentialsCanUpdateFilter;
-import org.hisp.dhis.system.util.FilterUtils;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.UserCredentials;
-import org.hisp.dhis.user.UserService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class ExportToPdfAction
- implements Action
-{
- private static final Log log = LogFactory.getLog( ExportToPdfAction.class );
-
- private static final String EXPORT_FORMAT_PDF = "PDF";
-
- private static final String TYPE_USER = "alluser";
-
- private static final String FILENAME_USER = "Users.zip";
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private UserService userService;
-
- public void setUserService( UserService userService )
- {
- this.userService = userService;
- }
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- private ServiceProvider<ExportService> serviceProvider;
-
- public void setServiceProvider( ServiceProvider<ExportService> serviceProvider )
- {
- this.serviceProvider = serviceProvider;
- }
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- private I18nFormat format;
-
- public void setFormat( I18nFormat format )
- {
- this.format = format;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private InputStream inputStream;
-
- public InputStream getInputStream()
- {
- return inputStream;
- }
-
- private String fileName;
-
- public String getFileName()
- {
- return fileName;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private String curKey;
-
- public void setCurKey( String curKey )
- {
- this.curKey = curKey;
- }
-
- private Integer months;
-
- public void setMonths( Integer months )
- {
- this.months = months;
- }
-
- private String type;
-
- public void setType( String type )
- {
- this.type = type;
- }
-
- private List<UserCredentials> userCredentialsList = null;
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- if ( type != null )
- {
- ExportParams params = new ExportParams();
-
- if ( type.equals( TYPE_USER ) )
- {
- if ( isNotBlank( curKey ) ) // Filter on key only if set
- {
- userCredentialsList = new ArrayList<UserCredentials>( userService.searchUsersByName( curKey ) );
- }
- else if ( months != null && months != 0 )
- {
- userCredentialsList = new ArrayList<UserCredentials>( userService.getInactiveUsers( months ) );
- }
- else
- {
- userCredentialsList = new ArrayList<UserCredentials>( userService.getAllUserCredentials() );
- }
-
- FilterUtils.filter( userCredentialsList, new UserCredentialsCanUpdateFilter( currentUserService
- .getCurrentUser() ) );
-
- if ( (userCredentialsList != null) && !userCredentialsList.isEmpty() )
- {
- params.setUserObjects( userCredentialsList );
- }
- else
- {
- params.setUserObjects( null );
- }
-
- fileName = FILENAME_USER;
-
- log.info( "Exporting to PDF for object type: " + TYPE_USER );
- }
-
- params.setIncludeDataValues( false );
- params.setI18n( i18n );
- params.setFormat( format );
-
- ExportService exportService = serviceProvider.provide( EXPORT_FORMAT_PDF );
-
- inputStream = exportService.exportData( params );
- }
-
- return SUCCESS;
- }
-
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml 2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml 2013-10-13 16:19:17 +0000
@@ -68,15 +68,6 @@
</bean>
<bean id="org.hisp.dhis.user.action.DisableUserAction" class="org.hisp.dhis.user.action.DisableUserAction" scope="prototype" />
-
- <!-- PDF -->
-
- <bean id="org.hisp.dhis.user.action.pdf.ExportToPdfAction" class="org.hisp.dhis.user.action.pdf.ExportToPdfAction"
- scope="prototype">
- <property name="serviceProvider" ref="exportServiceProvider" />
- <property name="userService" ref="org.hisp.dhis.user.UserService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
<!-- Role -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2013-10-13 16:19:17 +0000
@@ -83,17 +83,6 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- PDF -->
-
- <action name="exportToPdf" class="org.hisp.dhis.user.action.pdf.ExportToPdfAction">
- <result name="success" type="stream">
- <param name="contentType">application/zip</param>
- <param name="inputName">inputStream</param>
- <param name="contentDisposition">filename="${fileName}"</param>
- <param name="bufferSize">10240</param>
- </result>
- </action>
-
<!-- Role -->
<action name="allRole" class="org.hisp.dhis.user.action.GetRoleListAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2013-06-29 14:16:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2013-10-13 16:19:17 +0000
@@ -34,7 +34,6 @@
</select>
</td>
<td colspan="3" style="text-align:right">
- <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPDF( 'alluser' );" style="width:80px"/>
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddUserForm.action'"/>
</td>
</tr>
