=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java	2009-10-07 18:53:11 +0000
@@ -44,6 +44,8 @@
     VALIDATIONRULE,
     PERIOD,
     DATAVALUE,
+    AGGREGATEDDATAVALUE,
+    AGGREGATEDINDICATORVALUE,
     USER,
     REPORTTABLE,
     REPORT,

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2009-10-07 18:53:11 +0000
@@ -71,6 +71,8 @@
         objectCounts.put( Objects.VALIDATIONRULE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM validationrule" ) );
         objectCounts.put( Objects.PERIOD, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM period" ) );
         objectCounts.put( Objects.DATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM datavalue" ) );
+        objectCounts.put( Objects.AGGREGATEDDATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregateddatavalue" ) );
+        objectCounts.put( Objects.AGGREGATEDINDICATORVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedindicatorvalue" ) );
         
         return objectCounts;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2009-09-28 22:49:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2009-10-07 18:53:11 +0000
@@ -6,11 +6,11 @@
 data_locking                                                        = Data Locking												
 locked_datasets														= Locked Data Sets
 unlocked_datasets													= Unlocked Data Sets
-organisation_units_lock            = Organization Units [ Black = Unassigned ][ Orange = Assigned,Unlocked ][ Green = Assigned,Locked ]
+organisation_units_lock            									= Organization Units [ Black = Unassigned ][ Orange = Assigned,Unlocked ][ Green = Assigned,Locked ]
 save																= Save
 cancel                                                              = Cancel
-noaction                        = Please Sellect Only Assigned or Locked Organisation Unit.
-loading														= Loading, please wait...
+noaction                        									= Please Sellect Only Assigned or Locked Organisation Unit.
+loading																= Loading, please wait...
 data_administration													= Data Administration
 period_type															= Period Type
 available_periods                                                   = Available Periods
@@ -126,3 +126,5 @@
 values																= values
 data_element														= Data element
 validation_rules_without_groups										= Validation rules without groups
+aggregated_data_values												= Aggregated data values
+aggregated_indicator_values											= Aggregated indicator values

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm	2009-10-07 18:53:11 +0000
@@ -51,6 +51,14 @@
         <td>$objects.getValue( "DATAVALUE" )</td>
     </tr>
     <tr>
+        <td>$i18n.getString( "aggregated_data_values" )</td>
+        <td>$objects.getValue( "AGGREGATEDDATAVALUE" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "aggregated_indicator_values" )</td>
+        <td>$objects.getValue( "AGGREGATEDINDICATORVALUE" )</td>
+    </tr>
+    <tr>
     	<td colspan="2" style="height:15px"></td>
     </tr>
 </table>