dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18638
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-03-19 16:03:55 +0100
message:
  Data statistics, added user groups and org unit groups
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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/EnumMapWrapper.java
  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-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java	2015-03-19 15:03:55 +0000
@@ -44,7 +44,6 @@
     INDICATORGROUP,
     INDICATORGROUPSET,
     DATASET,
-    SOURCE,
     ORGANISATIONUNIT,
     ORGANISATIONUNITGROUP,
     ORGANISATIONUNITGROUPSET,
@@ -59,6 +58,7 @@
     AGGREGATEDDATASETCOMPLETENESS,
     AGGREGATEDORGUNITDATASETCOMPLETENESS,
     USER,
+    USERGROUP,
     REPORTTABLE,
     REPORT,
     CHART

=== 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-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2015-03-19 15:03:55 +0000
@@ -68,10 +68,12 @@
         objectCounts.put( Objects.INDICATOR, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM indicator", Integer.class ) );
         objectCounts.put( Objects.INDICATORGROUP, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM indicatorgroup", Integer.class ) );
         objectCounts.put( Objects.DATASET, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM dataset", Integer.class ) );
-        objectCounts.put( Objects.SOURCE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM organisationunit", Integer.class ) );
+        objectCounts.put( Objects.ORGANISATIONUNIT, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM organisationunit", Integer.class ) );
+        objectCounts.put( Objects.ORGANISATIONUNITGROUP, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM orgunitgroup", Integer.class ) );
         objectCounts.put( Objects.VALIDATIONRULE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM validationrule", Integer.class ) );
         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.DATAVALUE, jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM datavalue", 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-03-16 15:02:40 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-03-19 15:03:55 +0000
@@ -562,7 +562,6 @@
 openid=OpenID
 username=Username
 phone_number=Mobile phone number
-organisation_units=Organisation units
 user_roles=User roles
 update_user_success=Account was updated
 wrong_password=Wrong password
@@ -709,6 +708,7 @@
 validation_rules=Validation rules
 period_type=Period Type
 users=Users
+user_groups=User groups
 
 #-- Indicator -----------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/EnumMapWrapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/EnumMapWrapper.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/EnumMapWrapper.java	2015-03-19 15:03:55 +0000
@@ -37,7 +37,6 @@
  * enums.
  * 
  * @author Lars Helge Overland
- * @version $Id$
  */
 public class EnumMapWrapper<E extends Enum<E>, T>
 {

=== 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	2014-10-15 04:17:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm	2015-03-19 15:03:55 +0000
@@ -30,7 +30,11 @@
     </tr>
     <tr>
         <td>$i18n.getString( "organisation_units" )</td>
-        <td>$objects.getValue( "SOURCE" )</td>
+        <td>$objects.getValue( "ORGANISATIONUNIT" )</td>
+    </tr>
+    <tr>
+        <td>$i18n.getString( "organisation_unit_groups" )</td>
+        <td>$objects.getValue( "ORGANISATIONUNITGROUP" )</td>
     </tr>
     <tr>
         <td>$i18n.getString( "validation_rules" )</td>
@@ -45,6 +49,10 @@
         <td>$objects.getValue( "USER" )</td>
     </tr>
     <tr>
+        <td>$i18n.getString( "user_groups" )</td>
+        <td>$objects.getValue( "USERGROUP" )</td>
+    </tr>
+    <tr>
         <td>$i18n.getString( "data_values" )</td>
         <td>$objects.getValue( "DATAVALUE" )</td>
     </tr>