=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-09-22 18:31:22 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2014-09-25 10:28:17 +0000 @@ -809,11 +809,14 @@ BaseAnalyticalObject.sortKeys( valueMap ); - for ( NameableObject series : chart.series() ) + List seriez = chart.series(); + List categories = chart.category(); + + for ( NameableObject series : seriez ) { double categoryIndex = 0; - - for ( NameableObject category : chart.category() ) + + for ( NameableObject category : categories ) { categoryIndex++; @@ -823,7 +826,7 @@ key = chart.isAnalyticsType( AnalyticsType.AGGREGATE ) ? key.replace( DataElementOperand.SEPARATOR, DIMENSION_SEP ) : key; - //TODO fix issue with keys including - + // TODO fix issue with keys including - // Sort key on components to remove significance of column order