=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2015-05-28 15:04:54 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java 2015-06-13 16:16:08 +0000 @@ -94,12 +94,6 @@ private boolean coordinatesOnly; // ------------------------------------------------------------------------- - // Transient properties - // ------------------------------------------------------------------------- - - private transient boolean aggregate; - - // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -140,7 +134,6 @@ params.coordinatesOnly = this.coordinatesOnly; params.periodType = this.periodType; - params.aggregate = this.aggregate; return params; } @@ -548,14 +541,4 @@ { this.coordinatesOnly = coordinatesOnly; } - - public boolean isAggregate() - { - return aggregate; - } - - public void setAggregate( boolean aggregate ) - { - this.aggregate = aggregate; - } } === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2015-06-13 15:31:21 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2015-06-13 16:16:08 +0000 @@ -384,7 +384,6 @@ params.setLimit( limit ); params.setOutputType( MoreObjects.firstNonNull( outputType, EventOutputType.EVENT ) ); params.setCollapseDataDimensions( collapseDataDimensions ); - params.setAggregate( true ); return params; } @@ -491,7 +490,6 @@ params.setDisplayProperty( displayProperty ); params.setPage( page ); params.setPageSize( pageSize ); - params.setAggregate( false ); return params; }