dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11148
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-06-06 10:11:53 +0700
message:
  Applied patch file for fixing bug Manual Person Aggregation Contains Duplicates from Dan Cocos.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationFormAction.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-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationFormAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationFormAction.java	2013-05-30 02:42:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationFormAction.java	2013-06-06 03:11:53 +0000
@@ -76,13 +76,14 @@
         Collection<CaseAggregationCondition> aggConditions = aggregationConditionService
             .getAllCaseAggregationCondition();
 
+        Collection<DataSet> uniqueDataSetList = new HashSet<DataSet>();        
         for ( CaseAggregationCondition aggCondition : aggConditions )
         {
             DataElement dataElement = aggCondition.getAggregationDataElement();
 
-            datasets.addAll( dataElement.getDataSets() );
+            uniqueDataSetList.addAll( dataElement.getDataSets() );
         }
-        
+        datasets.addAll(uniqueDataSetList);
         Collections.sort( datasets, IdentifiableObjectNameComparator.INSTANCE );
 
         return SUCCESS;