← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16814: Event charts, minor performance improvement

 

------------------------------------------------------------
revno: 16814
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-09-25 12:28:17 +0200
message:
  Event charts, minor performance improvement
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java


--
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-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2014-09-22 18:31:22 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2014-09-25 10:28:17 +0000
@@ -809,11 +809,14 @@
 
         BaseAnalyticalObject.sortKeys( valueMap );
         
-        for ( NameableObject series : chart.series() )
+        List<NameableObject> seriez = chart.series();
+        List<NameableObject> categories = chart.category();
+        
+        for ( NameableObject series : seriez )
         {
             double categoryIndex = 0;
-
-            for ( NameableObject category : chart.category() )
+            
+            for ( NameableObject category : categories )
             {
                 categoryIndex++;
 
@@ -823,7 +826,7 @@
 
                 key = chart.isAnalyticsType( AnalyticsType.AGGREGATE ) ? key.replace( DataElementOperand.SEPARATOR, DIMENSION_SEP ) : key; 
                 
-                //TODO fix issue with keys including -
+                // TODO fix issue with keys including -
                 
                 // Sort key on components to remove significance of column order