dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1716
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-03-31 11:48:57 +0700
message:
  Mirror fix.
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.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 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java	2010-03-30 10:28:18 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java	2010-03-31 04:48:57 +0000
@@ -650,7 +650,7 @@
 
                 if ( !(dataElement instanceof CalculatedDataElement) )
                 {
-                    replaceString = getValue( dataElement, optionCombo, organisationUnit ) + "";
+                    replaceString = getValue( dataElement, optionCombo, organisationUnit, startDate, endDate ) + "";
                  
                     matcher.appendReplacement( buffer, replaceString );
 
@@ -683,7 +683,7 @@
                         optionCombo = categoryService.getDataElementCategoryOptionCombo( Integer
                             .parseInt( optionComboIdString ) );
 
-                        double dataValue = getValue( element, optionCombo, organisationUnit );
+                        double dataValue = getValue( element, optionCombo, organisationUnit,startDate, endDate );
 
                         value += dataValue * factor;
 
@@ -704,7 +704,7 @@
     }
 
     private double getValue( DataElement dataElement, DataElementCategoryOptionCombo optionCombo,
-        OrganisationUnit organisationUnit )
+        OrganisationUnit organisationUnit,Date startDate, Date endDate )
     {
         double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo, startDate,
             endDate, organisationUnit );