dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2094
fixes bug(s): https://launchpad.net/bugs/675872
committer: Tran Ng Minh Luan <Luan@MinhLuan-PC>
branch nick: dhis2
timestamp: Thu 2010-11-18 10:02:18 +0700
message:
  Add ActivityComparator
added:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/comparator/
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/comparator/ActivityComparator.java
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.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

=== added directory 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/comparator'
=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/comparator/ActivityComparator.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/comparator/ActivityComparator.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/comparator/ActivityComparator.java	2010-11-18 03:02:18 +0000
@@ -0,0 +1,15 @@
+package org.hisp.dhis.web.api.model.comparator;
+
+import java.util.Comparator;
+
+import org.hisp.dhis.web.api.model.Activity;
+
+public class ActivityComparator implements Comparator<Activity>
+{
+
+    @Override
+    public int compare( Activity act1, Activity act2 )
+    {
+        return act2.getBeneficiary().getFirstName().compareToIgnoreCase( act1.getBeneficiary().getFirstName() );
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java	2010-11-17 06:12:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java	2010-11-18 03:02:18 +0000
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -18,6 +19,7 @@
 import org.hisp.dhis.web.api.model.ActivityPlan;
 import org.hisp.dhis.web.api.model.Beneficiary;
 import org.hisp.dhis.web.api.model.PatientAttribute;
+import org.hisp.dhis.web.api.model.comparator.ActivityComparator;
 import org.hisp.dhis.web.api.service.mapping.TaskMapper;
 import org.joda.time.DateMidnight;
 import org.joda.time.DateTime;
@@ -33,6 +35,8 @@
 
     private org.hisp.dhis.activityplan.ActivityPlanService activityPlanService;
 
+    private ActivityComparator activityComparator = new ActivityComparator();
+    
     public org.hisp.dhis.activityplan.ActivityPlanService getActivityPlanService()
     {
         return activityPlanService;
@@ -136,12 +140,15 @@
         }
         if ( !items.isEmpty() )
         {
+            Collections.sort( items, activityComparator );
             plan.setActivitiesList( items );
         }
 
         return plan;
 
     }
+    
+    
 
     private org.hisp.dhis.web.api.model.Activity getActivityModel( org.hisp.dhis.activityplan.Activity activity )
     {