Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r2870ba9d3f788670624a32d6e5a1fe05c026d47a -rc44482d534e42cdecb0eefd678fad9cc5d8eb137
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 2870ba9d3f788670624a32d6e5a1fe05c026d47a)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision c44482d534e42cdecb0eefd678fad9cc5d8eb137)
@@ -46,14 +46,13 @@
 	 * */
 	/******************************************************************/
 	public static final int TOOL_ACTIVITY_TYPE = 1;
-	public static final int RANDOM_GROUPING_ACTIVITY_TYPE = 2;
-	public static final int CHOSEN_GROUPING_ACTIVITY_TYPE = 3;
-	public static final int PERMISSION_GATE_ACTIVITY_TYPE = 4;
-	public static final int SCHEDULE_GATE_ACTIVITY_TYPE = 5;
-	public static final int SYNCH_GATE_ACTIVITY_TYPE = 6;
-	public static final int PARALLEL_ACTIVITY_TYPE = 7;
-	public static final int OPTIONS_ACTIVITY_TYPE = 8;
-	public static final int SEQUENCE_ACTIVITY_TYPE = 9;
+	public static final int GROUPING_ACTIVITY_TYPE = 2;
+	public static final int SYNCH_GATE_ACTIVITY_TYPE = 3;
+	public static final int SCHEDULE_GATE_ACTIVITY_TYPE = 4;
+	public static final int PERMISSION_GATE_ACTIVITY_TYPE = 5;
+	public static final int PARALLEL_ACTIVITY_TYPE = 6;
+	public static final int OPTIONS_ACTIVITY_TYPE = 7;
+	public static final int SEQUENCE_ACTIVITY_TYPE = 8;
 	/******************************************************************/
 	
 	/**
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java
===================================================================
diff -u -rb6b326d086fe25330c98956012a4e5773fcfa1dc -rc44482d534e42cdecb0eefd678fad9cc5d8eb137
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java	(.../ActivityOrderComparator.java)	(revision b6b326d086fe25330c98956012a4e5773fcfa1dc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java	(.../ActivityOrderComparator.java)	(revision c44482d534e42cdecb0eefd678fad9cc5d8eb137)
@@ -44,6 +44,9 @@
         Activity activity1 = (Activity)o1;
         Activity activity2 = (Activity)o2;
         
+        if(activity1.getOrderId()==null||activity2.getOrderId()==null)
+            return activity1.getActivityId().compareTo(activity2.getActivityId());
+        
         int orderDiff = activity1.getOrderId().compareTo(activity2.getOrderId());
         //return order id compare result if they are not the same
         if(orderDiff!=0)
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
===================================================================
diff -u -r943be0168f1f74f2f72c457cbbf2b7fe5d83fff2 -rc44482d534e42cdecb0eefd678fad9cc5d8eb137
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision 943be0168f1f74f2f72c457cbbf2b7fe5d83fff2)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision c44482d534e42cdecb0eefd678fad9cc5d8eb137)
@@ -26,6 +26,7 @@
 import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator;
 
 import java.io.Serializable;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -386,10 +387,11 @@
         return currentCompletedActivitiesList;
     }
     /**
-     * @param currentCompletedActivitiesList The currentCompletedActivitiesList to set.
+     * @param completedActivitiesList The currentCompletedActivitiesList to set.
      */
-    public void setCurrentCompletedActivitiesList(List currentCompletedActivitiesList)
+    public void setCurrentCompletedActivitiesList(List completedActivitiesList)
     {
-        this.currentCompletedActivitiesList = currentCompletedActivitiesList;
+        this.currentCompletedActivitiesList = new LinkedList();
+        this.currentCompletedActivitiesList.addAll(completedActivitiesList);
     }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -rffedc450c9e442cbefc9a7ddd8aa26933041b6fa -rc44482d534e42cdecb0eefd678fad9cc5d8eb137
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision ffedc450c9e442cbefc9a7ddd8aa26933041b6fa)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision c44482d534e42cdecb0eefd678fad9cc5d8eb137)
@@ -77,6 +77,12 @@
     /** nullable persistent field */
     private Date endDateTime;
 
+    /** nullable persistent field */
+    private Date scheduleStartDate;
+    
+    /** nullable persistent field */
+    private Date scheduleEndDate;
+    
     /** persistent field */
     private User user;
 
@@ -94,7 +100,7 @@
 
     /** persistent field */
     private Set learnerProgresses;
-    
+
     //---------------------------------------------------------------------
     // constructors
     //---------------------------------------------------------------------
@@ -201,6 +207,37 @@
         this.endDateTime = endDateTime;
     }
 
+    /**
+     * @hibernate.property type="java.sql.Timestamp"  column="end_date_time"
+     *            	       length="19"
+     * 
+     * @return Returns the scheduleEndDate.
+     */
+    public Date getScheduleEndDate()
+    {
+        return scheduleEndDate;
+    }
+    /**
+     * @param scheduleEndDate The scheduleEndDate to set.
+     */
+    public void setScheduleEndDate(Date scheduleEndDate)
+    {
+        this.scheduleEndDate = scheduleEndDate;
+    }
+    /**
+     * @return Returns the scheduleStartDate.
+     */
+    public Date getScheduleStartDate()
+    {
+        return scheduleStartDate;
+    }
+    /**
+     * @param scheduleStartDate The scheduleStartDate to set.
+     */
+    public void setScheduleStartDate(Date scheduleStartDate)
+    {
+        this.scheduleStartDate = scheduleStartDate;
+    }
     /** 
      * @hibernate.many-to-one not-null="true"
      * @hibernate.column name="user_id"     
@@ -315,4 +352,5 @@
                              this.getLearningDesign().getDescription(),
                              this.lessonStateId);
     }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r12d6fc6f178b092584e94a447949193d9617e5ca -rc44482d534e42cdecb0eefd678fad9cc5d8eb137
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 12d6fc6f178b092584e94a447949193d9617e5ca)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision c44482d534e42cdecb0eefd678fad9cc5d8eb137)
@@ -38,8 +38,9 @@
 
 /**
  * 
- * @author Jacky Fang 2005-2-23
- * 
+ * @author Jacky Fang 
+ * @version 1.1
+ * @since 2005-2-23
  */
 public class LamsToolService implements ILamsToolService,ApplicationContextAware
 {
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestGrouping.java
===================================================================
diff -u -r2962a623ecfbd3460df3e34aa323e0cdc65438bd -rc44482d534e42cdecb0eefd678fad9cc5d8eb137
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestGrouping.java	(.../TestGrouping.java)	(revision 2962a623ecfbd3460df3e34aa323e0cdc65438bd)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestGrouping.java	(.../TestGrouping.java)	(revision c44482d534e42cdecb0eefd678fad9cc5d8eb137)
@@ -19,8 +19,9 @@
 
 /**
  * 
- * @author Jacky Fang 8/02/2005
- * 
+ * @author Jacky Fang 
+ * @since 8/02/2005
+ * @version 1.1
  */
 public class TestGrouping extends TestCase
 {