dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5589
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-12-25 17:49:34 +0100
message:
  Added org unit data mart to data statistics
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java
  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/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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	2011-07-13 11:32:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java	2011-12-25 16:49:34 +0000
@@ -54,6 +54,8 @@
     DATAVALUE,
     AGGREGATEDDATAVALUE,
     AGGREGATEDINDICATORVALUE,
+    AGGREGATEDORGUNITDATAVALUE,
+    AGGREGATEDORGUNITINDICATORVALUE,
     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	2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2011-12-25 16:49:34 +0000
@@ -78,6 +78,8 @@
         {
             objectCounts.put( Objects.AGGREGATEDDATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregateddatavalue" ) );
             objectCounts.put( Objects.AGGREGATEDINDICATORVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedindicatorvalue" ) );
+            objectCounts.put( Objects.AGGREGATEDORGUNITDATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedorgunitdatavalue" ) );
+            objectCounts.put( Objects.AGGREGATEDORGUNITINDICATORVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedorgunitindicatorvalue" ) );
         }
         catch ( BadSqlGrammarException ex )
         {

=== 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	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2011-12-25 16:49:34 +0000
@@ -374,4 +374,6 @@
 never=Never
 last_12_months_daily=Last 12 months daily
 last_6_months_daily_6_to_12_months_weekly=Last 6 months daily + 6 to 12 months weekly
-organisation_unit_group_set_aggregation_level=Organisation unit group set aggregation level
\ No newline at end of file
+organisation_unit_group_set_aggregation_level=Organisation unit group set aggregation level
+aggregated_org_unit_data_values = Aggregated org unit data values
+aggregated_org_unit_indicator_values = Aggregated org unit indicator values
\ No newline at end of file

=== 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	2011-09-11 10:39:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm	2011-12-25 16:49:34 +0000
@@ -63,6 +63,14 @@
         <td>$objects.getValue( "AGGREGATEDINDICATORVALUE" )</td>
     </tr>
     <tr>
+        <td>$i18n.getString( "aggregated_org_unit_data_values" )</td>
+        <td>$objects.getValue( "AGGREGATEDORGUNITDATAVALUE" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "aggregated_org_unit_indicator_values" )</td>
+        <td>$objects.getValue( "AGGREGATEDORGUNITINDICATORVALUE" )</td>
+    </tr>
+    <tr>
     	<td colspan="2" style="height:15px"></td>
     </tr>
 </table>