=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java 2009-10-07 10:20:08 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelFlowAction.java 2009-10-09 08:16:09 +0000 @@ -35,6 +35,7 @@ /** * @author Tran Thanh Tri + * @author Dang Duy Hieu * @version $Id$ */ public class GenerateReportExcelFlowAction @@ -58,9 +59,11 @@ private Integer reportId; private Integer periodId; - + private Integer sheetId; + private Integer orgunitGroupId; + // ------------------------------------------- // Getter & Setter // ------------------------------------------- @@ -99,7 +102,17 @@ { this.sheetId = sheetId; } - + + public Integer getOrgunitGroupId() + { + return orgunitGroupId; + } + + public void setOrgunitGroupId( Integer orgunitGroupId ) + { + this.orgunitGroupId = orgunitGroupId; + } + public String execute() throws Exception { @@ -113,4 +126,5 @@ return reportExcel.getReportType(); } + } === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js 2009-10-09 08:02:34 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js 2009-10-09 08:16:09 +0000 @@ -16,8 +16,6 @@ url = "previewReportExcel.action?" + url; } - alert(url); - globalReportId = reportId; globalPeriodId = periodId;