=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2014-04-19 10:51:12 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2014-04-21 16:49:12 +0000 @@ -32,6 +32,9 @@ import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT; import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT_DISAGGREGATION; import static org.hisp.dhis.analytics.AggregationType.SUM; +import static org.hisp.dhis.analytics.AggregationType.COUNT; +import static org.hisp.dhis.analytics.AggregationType.STDDEV; +import static org.hisp.dhis.analytics.AggregationType.VARIANCE; import static org.hisp.dhis.analytics.DataQueryParams.LEVEL_PREFIX; import static org.hisp.dhis.analytics.DataQueryParams.MAX_DIM_OPT_PERM; import static org.hisp.dhis.common.DimensionalObject.CATEGORYOPTIONCOMBO_DIM_ID; @@ -42,6 +45,9 @@ import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID; import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_AVERAGE; import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_SUM; +import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_COUNT; +import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_STDDEV; +import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_VARIANCE; import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_BOOL; import java.util.ArrayList; @@ -672,6 +678,18 @@ } } } + else if ( AGGREGATION_OPERATOR_COUNT.equals( aggregationOperator ) ) + { + aggregationType = COUNT; + } + else if ( AGGREGATION_OPERATOR_STDDEV.equals( aggregationOperator ) ) + { + aggregationType = STDDEV; + } + else if ( AGGREGATION_OPERATOR_VARIANCE.equals( aggregationOperator ) ) + { + aggregationType = VARIANCE; + } return aggregationType; }