dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3737
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-05-25 15:34:29 +0700
message:
  local vn - Fixed getter export report for export item
modified:
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/DeleteExportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/GetExportItemAction.java


--
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

=== modified file 'local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java	2011-05-25 08:34:29 +0000
@@ -3,9 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hisp.dhis.reportexcel.GenericExcelItem;
-import org.hisp.dhis.reportexcel.ReportExcel;
-
 /*
  * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
@@ -67,7 +64,7 @@
     // Getters and setters
     // -------------------------------------------------------------------------
 
-    public ReportExcel getExportReport()
+    public ReportExcel getReportExcel()
     {
         return reportExcel;
     }

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/DeleteExportItemAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/DeleteExportItemAction.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/DeleteExportItemAction.java	2011-05-25 08:34:29 +0000
@@ -70,7 +70,7 @@
     {
         ReportExcelItem exportReportItem = exportReportService.getExportItem( id );
 
-        ReportExcel exportReport = exportReportItem.getExportReport();
+        ReportExcel exportReport = exportReportItem.getReportExcel();
 
         exportReport.getReportExcelItems().remove( exportReportItem );
 

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/GetExportItemAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/GetExportItemAction.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/GetExportItemAction.java	2011-05-25 08:34:29 +0000
@@ -102,7 +102,7 @@
     {
         exportItem = exportReportService.getExportItem( id );
 
-        if ( !exportItem.getExportReport().getReportType().equals( ReportExcel.TYPE.CATEGORY ) )
+        if ( !exportItem.getReportExcel().getReportType().equals( ReportExcel.TYPE.CATEGORY ) )
         {
             textualFormula = expressionService.getExpressionDescription( exportItem.getExpression() );
         }