=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesPluginAction.java' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesPluginAction.java 2012-04-06 14:30:50 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedValuesPluginAction.java 2012-05-06 01:10:33 +0000 @@ -30,6 +30,7 @@ import static org.hisp.dhis.api.utils.ContextUtils.CONTENT_TYPE_JSON; import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers; +import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -227,7 +228,21 @@ { return periods; } - + + private Collection dataNames = new ArrayList(); + + public Collection getDataNames() + { + return dataNames; + } + + private Collection organisationUnitNames = new ArrayList(); + + public Collection getOrganisationUnitNames() + { + return organisationUnitNames; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -264,6 +279,11 @@ Set organisationUnits = organisationUnitService .getOrganisationUnitsByUid( organisationUnitIds ); + + for ( String id : organisationUnitIds ) + { + organisationUnitNames.add( organisationUnitService.getOrganisationUnit( id ).getName() ); + } if ( indicatorIds != null ) { @@ -280,6 +300,11 @@ value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit( value.getOrganisationUnitId() ).getName() ); } + + for ( String id : indicatorIds ) + { + dataNames.add( indicatorService.getIndicator( id ).getDisplayShortName() ); + } } if ( dataElementIds != null ) @@ -297,6 +322,11 @@ value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit( value.getOrganisationUnitId() ).getName() ); } + + for ( String id : dataElementIds ) + { + dataNames.add( dataElementService.getDataElement( id ).getDisplayShortName() ); + } } } === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html 2012-04-27 12:10:44 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html 2012-05-06 01:10:33 +0000 @@ -1,7 +1,7 @@ - - + +