← Back to branch summary

~registry/dhis2-academy/trunk

« back to all changes in this revision

Viewing changes to local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportPeriodColumnListingAction.java

  • Committer: Abyot Asalefew Gizaw
  • Date: 2012-10-12 00:13:55 UTC
  • Revision ID: abyota@gmail.com-20121012001355-yehfghfqirdvqmd7
Updating the acadmy trunk with the main DHIS2 trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportPeriodColumnListingAction.java
122
122
 
123
123
                    for ( OrganisationUnit organisationUnit : organisationUnits )
124
124
                    {
125
 
 
126
125
                        if ( exportItem.getItemType().equalsIgnoreCase( ExportItem.TYPE.DATAELEMENT ) )
127
126
                        {
128
127
                            value += MathUtils.calculateExpression( ExpressionUtils.generateExpression( exportItem, p
135
134
                                .getStartdate(), p.getEnddate(), organisationUnit, dataElementService, categoryService,
136
135
                                aggregationService ) );
137
136
                        }
138
 
 
139
137
                    }
140
138
 
141
139
                    ExcelUtils.writeValueByPOI( exportItem.getRow(), p.getColumn(), String.valueOf( value ),