=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportExcelCategoryAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportExcelCategoryAction.java 2009-10-03 05:55:31 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportExcelCategoryAction.java 2009-10-08 03:43:00 +0000 @@ -26,8 +26,6 @@ */ package org.hisp.dhis.reportexcel.export.advance.action; -import java.io.BufferedInputStream; -import java.io.FileInputStream; import java.util.Collection; import java.util.Set; === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportExcelOrganisationGroupListingAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportExcelOrganisationGroupListingAction.java 2009-10-03 05:55:31 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GenerateAdvancedReportExcelOrganisationGroupListingAction.java 2009-10-08 03:43:00 +0000 @@ -27,8 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.io.BufferedInputStream; -import java.io.FileInputStream; import java.util.Collection; import java.util.Set; @@ -97,9 +95,9 @@ OrganisationUnitGroup organisationUnitGroup = organisationUnitGroupService .getOrganisationUnitGroup( organisationGroupId.intValue() ); - ReportExcelOganiztionGroupListing reportExcel = (ReportExcelOganiztionGroupListing) reportService.getReportExcel( selectionManager - .getSelectedReportExcelId() ); - + ReportExcelOganiztionGroupListing reportExcel = (ReportExcelOganiztionGroupListing) reportService + .getReportExcel( selectionManager.getSelectedReportExcelId() ); + this.installReadTemplateFile( reportExcel, period, organisationUnitGroup ); for ( Integer sheetNo : reportService.getSheets( selectionManager.getSelectedReportExcelId() ) ) === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GetOrganisationUnitGroupListAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GetOrganisationUnitGroupListAction.java 2009-10-02 02:58:42 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/advance/action/GetOrganisationUnitGroupListAction.java 2009-10-08 03:43:00 +0000 @@ -39,7 +39,8 @@ /** * @author Torgeir Lorange Ostby - * @version $Id: GetOrganisationUnitGroupListAction.java 1898 2006-09-22 12:06:56Z torgeilo $ + * @version $Id: GetOrganisationUnitGroupListAction.java 1898 2006-09-22 + * 12:06:56Z torgeilo $ */ public class GetOrganisationUnitGroupListAction extends ActionSupport @@ -48,6 +49,11 @@ // Dependencies // ------------------------------------------------------------------------- + /** + * + */ + private static final long serialVersionUID = 1L; + private OrganisationUnitGroupService organisationUnitGroupService; public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )