dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5725
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-01-13 11:12:43 +0100
message:
  Org unit distribution, total value is now total of all group members
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.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/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java	2011-11-22 09:03:42 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java	2012-01-13 10:12:43 +0000
@@ -135,9 +135,9 @@
         {
             grid.addHeader( new GridHeader( group.getName(), false, false )  );
         }
-        
+
+        grid.addHeader( new GridHeader( HEADER_TOTAL, false, false ) );
         grid.addHeader( new GridHeader( HEADER_NONE, false, false ) );
-        grid.addHeader( new GridHeader( HEADER_TOTAL, false, false ) );
         
         boolean hasNone = false;
         
@@ -163,9 +163,9 @@
             
             int total = subTree != null ? subTree.size() : 0;
             int none = total - totalGroup;
-            
+
+            grid.addValue( totalGroup );
             grid.addValue( none );
-            grid.addValue( total );
             
             if ( none > 0 )
             {