dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6706
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-04-23 16:11:27 +0200
message:
  Added data set completeness in 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-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java	2012-04-23 14:11:27 +0000
@@ -56,6 +56,8 @@
     AGGREGATEDINDICATORVALUE,
     AGGREGATEDORGUNITDATAVALUE,
     AGGREGATEDORGUNITINDICATORVALUE,
+    AGGREGATEDDATASETCOMPLETENESS,
+    AGGREGATEDORGUNITDATASETCOMPLETENESS,
     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-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2012-04-23 14:11:27 +0000
@@ -80,6 +80,7 @@
             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" ) );
+            objectCounts.put( Objects.AGGREGATEDDATASETCOMPLETENESS, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregateddatasetcompleteness" ) );
         }
         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	2012-03-29 17:36:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-04-23 14:11:27 +0000
@@ -292,4 +292,5 @@
 batch_delete=Batch deletion
 deleting_lock_exceptions=Deleting lock exceptions
 error_at=Error at
-not_started=not started
\ No newline at end of file
+not_started=not started
+aggregated_data_set_completeness=Aggregated data set completeness
\ 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-12-25 16:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm	2012-04-23 14:11:27 +0000
@@ -71,6 +71,10 @@
         <td>$objects.getValue( "AGGREGATEDORGUNITINDICATORVALUE" )</td>
     </tr>
     <tr>
+        <td>$i18n.getString( "aggregated_data_set_completeness" )</td>
+        <td>$objects.getValue( "AGGREGATEDDATASETCOMPLETENESS" )</td>
+    </tr>
+    <tr>
     	<td colspan="2" style="height:15px"></td>
     </tr>
 </table>