dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18946
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-04-20 11:40:54 +0200
message:
  Added events 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-services/dhis-service-core/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.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	2015-03-19 15:03:55 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java	2015-04-20 09:40:54 +0000
@@ -51,15 +51,13 @@
     VALIDATIONRULE,
     PERIOD,
     DATAVALUE,
-    AGGREGATEDDATAVALUE,
-    AGGREGATEDINDICATORVALUE,
-    AGGREGATEDORGUNITDATAVALUE,
-    AGGREGATEDORGUNITINDICATORVALUE,
-    AGGREGATEDDATASETCOMPLETENESS,
-    AGGREGATEDORGUNITDATASETCOMPLETENESS,
     USER,
     USERGROUP,
     REPORTTABLE,
     REPORT,
-    CHART
+    CHART,
+    MAP,
+    DASHBOARD,
+    PROGRAM,
+    PROGRAMSTAGEINSTANCE
 }

=== 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	2015-03-19 15:03:55 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2015-04-20 09:40:54 +0000
@@ -74,7 +74,13 @@
         objectCounts.put( Objects.PERIOD, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM period", Integer.class ) );
         objectCounts.put( Objects.USER, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM users", Integer.class ) );
         objectCounts.put( Objects.USERGROUP, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM usergroup", Integer.class ) );
+        objectCounts.put( Objects.REPORTTABLE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM reporttable", Integer.class ) );
+        objectCounts.put( Objects.CHART, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM chart", Integer.class ) );
+        objectCounts.put( Objects.MAP, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM map", Integer.class ) );
+        objectCounts.put( Objects.DASHBOARD, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM dashboard", Integer.class ) );        
         objectCounts.put( Objects.DATAVALUE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM datavalue", Integer.class ) );
+        objectCounts.put( Objects.PROGRAM, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM program", Integer.class ) );
+        objectCounts.put( Objects.PROGRAMSTAGEINSTANCE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM programstageinstance", Integer.class ) );
         
         return objectCounts;
     }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-04-08 13:53:53 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-04-20 09:40:54 +0000
@@ -570,6 +570,7 @@
 help_intro_text=Please select an item from the menu to the left.
 please_wait_while_the_system_is_processing=Please wait while the system is processing
 organisation_unit_required_for_user=User must be assigned to at least one organisation unit
+
 #-- Contact info ---------------------------------------------------------------#
 
 address=Address
@@ -709,6 +710,12 @@
 period_type=Period Type
 users=Users
 user_groups=User groups
+pivot_tables=Pivot tables
+charts=Charts
+maps=Maps
+dashboards=Dashboards
+programs=Programs
+events=Events
 
 #-- Indicator -----------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm	2015-03-23 13:31:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm	2015-04-20 09:40:54 +0000
@@ -53,10 +53,34 @@
         <td>$objects.getValue( "USERGROUP" )</td>
     </tr>
     <tr>
+        <td>$i18n.getString( "pivot_tables" )</td>
+        <td>$objects.getValue( "REPORTTABLE" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "charts" )</td>
+        <td>$objects.getValue( "CHART" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "maps" )</td>
+        <td>$objects.getValue( "MAP" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "dashboards" )</td>
+        <td>$objects.getValue( "DASHBOARD" )</td>
+    </tr>
+    <tr>
         <td>$i18n.getString( "data_values" )</td>
         <td>$objects.getValue( "DATAVALUE" )</td>
     </tr>
     <tr>
+        <td>$i18n.getString( "programs" )</td>
+        <td>$objects.getValue( "PROGRAM" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "events" )</td>
+        <td>$objects.getValue( "PROGRAMSTAGEINSTANCE" )</td>
+    </tr>
+    <tr>
     	<td colspan="2" style="height:15px"></td>
     </tr>
 </table>