=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml' --- dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml 2009-09-26 09:41:54 +0000 +++ dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml 2009-09-28 04:50:48 +0000 @@ -24,11 +24,7 @@ org.hisp.dhis dhis-service-core - - - org.hisp.dhis - dhis-options - + org.hisp.dhis dhis-support-system === removed file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java' --- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java 2009-09-17 07:12:56 +0000 +++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java 1970-01-01 00:00:00 +0000 @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2004-2007, 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. - */ -package org.hisp.dhis.reportexcel; - -import java.io.File; -import java.util.List; - -import org.hisp.dhis.external.location.LocationManager; -import org.hisp.dhis.external.location.LocationManagerException; -import org.hisp.dhis.options.SystemSettingManager; -import org.hisp.dhis.organisationunit.OrganisationUnit; - -/** - * @author Tran Thanh Tri - * @version $Id$ - */ - -public class DefaultReportLocationManager - implements ReportLocationManager -{ - private File REPORT; - - private File REPORT_TEMP; - - // ------------------------------------------- - // Dependency - // ------------------------------------------- - - private LocationManager locationManager; - - private SystemSettingManager systemSettingManager; - - // ------------------------------------------- - // Setter - // ------------------------------------------- - - public void setLocationManager( LocationManager locationManager ) - { - this.locationManager = locationManager; - } - - public void setSystemSettingManager( SystemSettingManager systemSettingManager ) - { - this.systemSettingManager = systemSettingManager; - } - - // ------------------------------------------- - // Init - // ------------------------------------------- - - void init() - { - try - { - REPORT = new File( locationManager.getExternalDirectory(), REPORT_DIR ); - REPORT.mkdir(); - REPORT_TEMP = new File( REPORT, REPORT_TEMP_DIR ); - REPORT_TEMP.mkdir(); - - } - catch ( LocationManagerException e ) - { - e.printStackTrace(); - } - - } - - // ------------------------------------------- - // Impletemented - // ------------------------------------------- - - public List getListFileInOrganisationDirectory( OrganisationUnit arg0 ) - { - return null; - } - - public File getOrganisationDirectory( OrganisationUnit organisationUnit ) - { - File dir = new File( REPORT, String.valueOf( organisationUnit.getId() ) ); - if ( !dir.exists() ) - { - dir.mkdir(); - } - return dir; - - } - - public File getReportExcelDirectory() - { - return this.REPORT; - } - - public File getReportExcelTempDirectory() - { - return this.REPORT_TEMP; - } - - public File getReportExcelTemplateDirectory() - { - return new File( (String) systemSettingManager - .getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY ) ); - } - -} === modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-09-26 09:41:54 +0000 +++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-09-28 04:50:48 +0000 @@ -14,14 +14,6 @@ - - - - - - - - + === modified file 'dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml' --- dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml 2009-09-27 21:17:09 +0000 +++ dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml 2009-09-28 04:50:48 +0000 @@ -30,6 +30,10 @@ org.hisp.dhis + dhis-service-excel-reporting + + + org.hisp.dhis dhis-service-organisationunit === added file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java 2009-09-28 04:50:48 +0000 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2004-2007, 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. + */ +package org.hisp.dhis.reportexcel; + +import java.io.File; +import java.util.List; + +import org.hisp.dhis.external.location.LocationManager; +import org.hisp.dhis.external.location.LocationManagerException; +import org.hisp.dhis.options.SystemSettingManager; +import org.hisp.dhis.organisationunit.OrganisationUnit; + +/** + * @author Tran Thanh Tri + * @version $Id$ + */ + +public class DefaultReportLocationManager + implements ReportLocationManager +{ + private File REPORT; + + private File REPORT_TEMP; + + // ------------------------------------------- + // Dependency + // ------------------------------------------- + + private LocationManager locationManager; + + private SystemSettingManager systemSettingManager; + + // ------------------------------------------- + // Setter + // ------------------------------------------- + + public void setLocationManager( LocationManager locationManager ) + { + this.locationManager = locationManager; + } + + public void setSystemSettingManager( SystemSettingManager systemSettingManager ) + { + this.systemSettingManager = systemSettingManager; + } + + // ------------------------------------------- + // Init + // ------------------------------------------- + + void init() + { + try + { + REPORT = new File( locationManager.getExternalDirectory(), REPORT_DIR ); + REPORT.mkdir(); + REPORT_TEMP = new File( REPORT, REPORT_TEMP_DIR ); + REPORT_TEMP.mkdir(); + + } + catch ( LocationManagerException e ) + { + e.printStackTrace(); + } + + } + + // ------------------------------------------- + // Impletemented + // ------------------------------------------- + + public List getListFileInOrganisationDirectory( OrganisationUnit arg0 ) + { + return null; + } + + public File getOrganisationDirectory( OrganisationUnit organisationUnit ) + { + File dir = new File( REPORT, String.valueOf( organisationUnit.getId() ) ); + if ( !dir.exists() ) + { + dir.mkdir(); + } + return dir; + + } + + public File getReportExcelDirectory() + { + return this.REPORT; + } + + public File getReportExcelTempDirectory() + { + return this.REPORT_TEMP; + } + + public File getReportExcelTemplateDirectory() + { + return new File( (String) systemSettingManager + .getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY ) ); + } + +} === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-09-25 07:57:43 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-09-28 04:50:48 +0000 @@ -8,6 +8,14 @@ class="org.hisp.dhis.reportexcel.export.action.SelectionManager" scope="singleton"> + + + + + + +