=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-04-06 11:19:24 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-04-21 16:43:24 +0000
@@ -104,6 +104,8 @@
public static final String AGGREGATION_OPERATOR_SUM = "sum";
public static final String AGGREGATION_OPERATOR_AVERAGE = "average";
public static final String AGGREGATION_OPERATOR_COUNT = "count";
+ public static final String AGGREGATION_OPERATOR_STDDEV = "stddev";
+ public static final String AGGREGATION_OPERATOR_VARIANCE = "variance";
/**
* The name to appear in forms.
=== modified file 'dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-04-01 10:21:31 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-04-21 16:43:24 +0000
@@ -430,6 +430,8 @@
sum=Sum
count=Count
average=Average
+stddev=Standard deviation
+variance=Variance
text=Text
string=String
int=Number
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm 2014-01-28 12:20:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm 2014-04-21 16:43:24 +0000
@@ -143,6 +143,8 @@
+
+