dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10345
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-20 10:35:04 +0100
message:
  Analytics, simplification
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js


--
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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2013-03-14 13:07:10 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2013-03-20 09:35:04 +0000
@@ -450,8 +450,8 @@
         {
             DataQueryParams query = new DataQueryParams( params );
             query.setAggregationType( SUM );
-            queries.add( query );            
-        }        
+            queries.add( query );
+        }
         
         return queries;
     }
@@ -532,9 +532,11 @@
         
         for ( IdentifiableObject element : dataElements )
         {
-            DataElement dataElement = (DataElement) element;
+            DataElement de = (DataElement) element;
 
-            putByAggregationType( map, dataElement.getType(), dataElement.getAggregationOperator(), dataElement, aggregationPeriodType, dataElement.getPeriodType() );
+            AggregationType aggregationType = getAggregationType( de, de.getType(), de.getAggregationOperator(), aggregationPeriodType, de.getPeriodType() );
+            
+            map.putValue( aggregationType, de );
         }
         
         return map;
@@ -544,31 +546,35 @@
      * Puts the given element into the map according to the value type, aggregation
      * operator, aggregation period type and data period type.
      */
-    private void putByAggregationType( ListMap<AggregationType, IdentifiableObject> map, String valueType, String aggregationOperator, 
-        IdentifiableObject element, PeriodType aggregationPeriodType, PeriodType dataPeriodType )
+    private AggregationType getAggregationType( IdentifiableObject element, String valueType, String aggregationOperator, 
+        PeriodType aggregationPeriodType, PeriodType dataPeriodType )
     {
+        AggregationType aggregationType = null;
+        
         if ( AGGREGATION_OPERATOR_SUM.equals( aggregationOperator ) )
         {
-            map.putValue( SUM, element );
+            aggregationType = SUM;
         }
         else if ( AGGREGATION_OPERATOR_AVERAGE.equals( aggregationOperator ) )
         {
             if ( VALUE_TYPE_BOOL.equals( valueType ) )
             {
-                map.putValue( AVERAGE_BOOL, element );
+                aggregationType = AVERAGE_BOOL;
             }
             else
             {
                 if ( dataPeriodType == null || aggregationPeriodType == null || aggregationPeriodType.getFrequencyOrder() >= dataPeriodType.getFrequencyOrder() )
                 {
-                    map.putValue( AVERAGE_INT, element );
+                    aggregationType = AVERAGE_INT;
                 }
                 else
                 {
-                    map.putValue( AVERAGE_INT_DISAGGREGATION, element );
+                    aggregationType = AVERAGE_INT_DISAGGREGATION;
                 }
             }
         }
+        
+        return aggregationType;
     }
 
     /**

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-03-20 07:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-03-20 09:35:04 +0000
@@ -1,7 +1,7 @@
 #-- Application name -----------------------------------------------------------#
 
 district_health_information_software=District Health Information Software 2
-dhis2=DHIS2
+dhis2=DHIS 2
 
 #-- dhis-wp --------------------------------------------------------------------#
 
@@ -16,8 +16,8 @@
 log_out=Log out
 about=About
 access_denied=Access denied
-access_denied_message=You don't have sufficient authority to view this page.
-create_access_denied_message=You don't have create access to type
+access_denied_message=You don't have sufficient authority to view this page
+create_access_denied_message=You don't have create access to object
 read_access_denied_message=You don't have read access to object
 update_access_denied_message=You don't have update access to object
 delete_access_denied_message=You don't have delete access to object

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-03-19 20:19:16 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-03-20 09:35:04 +0000
@@ -2670,8 +2670,7 @@
 				favorite.userOrganisationUnit = DV.c.userorganisationunit;
 				favorite.userOrganisationUnitChildren = DV.c.userorganisationunitchildren;
 				
-				// Options
-				
+				// Options				
 				if (DV.c.domainaxislabel) {
 					favorite.domainAxisLabel = DV.c.domainaxislabel;
 				}