Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml,v
diff -u -r1.17 -r1.18
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	3 Mar 2008 04:41:12 -0000	1.17
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	12 Feb 2009 00:22:51 -0000	1.18
@@ -45,15 +45,11 @@
 				class="org.lamsfoundation.lams.learningdesign.Activity" />
 		</set>
 
-		<!-- uni-directional one-to-many association to completed activities -->
-		<set name="completedActivities" lazy="false" batch-size="20"
-			cascade="none" table="lams_progress_completed">
-			<key>
-				<column name="learner_progress_id" />
-			</key>
-			<many-to-many column="activity_id"
-				class="org.lamsfoundation.lams.learningdesign.Activity" />
-		</set>
+		<map name="completedActivities" lazy="false" batch-size="20" cascade="none" table="lams_progress_completed">
+			<key column="learner_progress_id"/>
+			<index-many-to-many column="activity_id" class="org.lamsfoundation.lams.learningdesign.Activity"/>
+			<element column="completed_date_time" type="java.util.Date"/>
+		</map>
 
 		<!-- bi-directional many-to-one association to User -->
 		<many-to-one name="user" lazy="false"
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.127 -r1.128
--- lams_common/db/sql/create_lams_11_tables.sql	28 Jan 2009 00:03:44 -0000	1.127
+++ lams_common/db/sql/create_lams_11_tables.sql	12 Feb 2009 00:22:51 -0000	1.128
@@ -799,6 +799,7 @@
 CREATE TABLE lams_progress_completed (
        learner_progress_id BIGINT(20) NOT NULL
      , activity_id BIGINT(20) NOT NULL
+     , completed_date_time DATETIME NOT NULL
      , PRIMARY KEY (learner_progress_id, activity_id)
      , INDEX (learner_progress_id)
      , CONSTRAINT FK_lams_progress_completed_1 FOREIGN KEY (learner_progress_id)
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	3 Feb 2009 06:57:43 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	12 Feb 2009 00:22:51 -0000	1.6
@@ -24,6 +24,9 @@
 -- LDEV-2107 --------------
 INSERT into lams_workspace_folder_type VALUES (3, 'PUBLIC SEQUENCES');
 
+-- LDEV-2115 --------------
+ALTER TABLE lams_progress_completed ADD COLUMN completed_date_time DATETIME NOT NULL;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java	9 Oct 2007 05:27:28 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java	12 Feb 2009 00:22:51 -0000	1.7
@@ -86,7 +86,7 @@
 	        for(Iterator i = complexActivity.getActivities().iterator();i.hasNext();)
 	        {
 	            Activity currentActivity = (Activity)i.next();
-	            boolean actComplete = learnerProgress.getCompletedActivities().contains(currentActivity);
+	            boolean actComplete = learnerProgress.getCompletedActivities().containsKey(currentActivity);
 	            if ( isPreview && ! actComplete) {
 	            	// found one not complete, so can try more branches
 	            	return false;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java	4 Jul 2007 03:35:01 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java	12 Feb 2009 00:22:51 -0000	1.8
@@ -61,7 +61,7 @@
 	        for(Iterator i = complexActivity.getActivities().iterator();i.hasNext();)
 	        {
 	            Activity currentActivity = (Activity)i.next();
-	            if(learnerProgress.getCompletedActivities().contains(currentActivity))
+	            if(learnerProgress.getCompletedActivities().containsKey(currentActivity))
 	                numOfCompletedActivities++;
 	        }
         }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java,v
diff -u -r1.21 -r1.22
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	3 Mar 2008 04:41:12 -0000	1.21
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	12 Feb 2009 00:22:51 -0000	1.22
@@ -36,6 +36,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -102,7 +104,7 @@
      *  Set of completed activities that includes all completed activities
      *  before current activity.
      */
-    private Set completedActivities;
+    private Map completedActivities;
     
     /**
      * The activity that user just completed. The purpose of this
@@ -167,11 +169,11 @@
      */
     public LearnerProgress(User user,Lesson lesson)
     {
-        this(null,user,lesson,new TreeSet( new ActivityOrderComparator()),new TreeSet( new ActivityOrderComparator()));
+        this(null,user,lesson,new TreeSet( new ActivityOrderComparator()),new TreeMap( new ActivityOrderComparator()));
     }
     
     /** full constructor */
-    public LearnerProgress(Long learnerProgressId, User user, Lesson lesson, Set attemptedActivities, Set completedActivities)
+    public LearnerProgress(Long learnerProgressId, User user, Lesson lesson, Set attemptedActivities, Map completedActivities)
     {
         this.learnerProgressId = learnerProgressId;
         this.user = user;
@@ -242,13 +244,13 @@
      *           
      *
      */
-    public Set getCompletedActivities()
+    public Map getCompletedActivities()
     {
         
         return this.completedActivities;
     }
     
-    public void setCompletedActivities(java.util.Set completedActivities)
+    public void setCompletedActivities(java.util.Map completedActivities)
     {
         
         this.completedActivities = completedActivities;
@@ -303,10 +305,10 @@
      */
     public byte getProgressState(Activity activity)
     {
-        if (completedActivities.contains(activity))
+        if (completedActivities.containsKey(activity))
         {
             return ACTIVITY_COMPLETED;
-        }
+        } 
         else if (attemptedActivities.contains(activity))
         {
             return ACTIVITY_ATTEMPTED;
@@ -361,7 +363,7 @@
     		this.attemptedActivities.add(activity);
     	}
     	else if (state == LearnerProgress.ACTIVITY_COMPLETED) {
-    		this.completedActivities.add(activity);
+    		this.completedActivities.put(activity, new Date(System.currentTimeMillis()));
     	}
     }
 
@@ -488,7 +490,7 @@
                                       this.user.getUserId(),
                                       this.currentActivity != null ? this.currentActivity.getActivityId() : null,
                                       this.createIdArrayFrom(this.attemptedActivities),
-                                      this.createIdArrayFrom(this.completedActivities),
+                                      this.createIdArrayFrom(this.completedActivities.keySet()),
                                       isComplete());
     }
     
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java,v
diff -u -r1.34 -r1.35
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	12 Nov 2008 02:36:32 -0000	1.34
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	12 Feb 2009 00:22:51 -0000	1.35
@@ -632,7 +632,7 @@
 	    LessonService.log.debug("Removed activity from attempted activities");
 	}
 
-	removed = progress.getCompletedActivities().remove(activity);
+	removed = (progress.getCompletedActivities().remove(activity) != null);
 	if (removed) {
 	    recordUpdated = true;
 	    LessonService.log.debug("Removed activity from completed activities");
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java,v
diff -u -r1.18 -r1.19
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	15 Jan 2009 03:18:00 -0000	1.18
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	12 Feb 2009 00:23:17 -0000	1.19
@@ -183,7 +183,7 @@
 
 	// if learner only include the attempted and completed activities
 	if (accessMode == ToolAccessMode.LEARNER
-		&& !(progress.getCompletedActivities().contains(activity) || progress.getAttemptedActivities()
+		&& !(progress.getCompletedActivities().containsKey(activity) || progress.getAttemptedActivities()
 			.contains(activity))) {
 	    return;
 	}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java,v
diff -u -r1.31 -r1.32
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	13 Jan 2009 06:58:40 -0000	1.31
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	12 Feb 2009 00:23:17 -0000	1.32
@@ -142,7 +142,7 @@
                                         +"learning design ["+ld.getTitle()+"], id["
                                         +ld.getLearningDesignId().longValue()
                                         +"]");
-        } else if ( progress.getCompletedActivities().contains(ld.getFirstActivity())  ) {
+        } else if ( progress.getCompletedActivities().containsKey(ld.getFirstActivity())  ) {
         	// special case - recalculating the appropriate current activity.
         	return doCalculateProgress(progress.getUser(), ld.getFirstActivity(), progress, new LinkedList<Long>());
         } else if ( canDoActivity(progress.getLesson(), ld.getFirstActivity()) ) {
@@ -241,7 +241,7 @@
     {
     	Activity nextActivity = transition.getToActivity();
     	
-    	if ( ! learnerProgress.getCompletedActivities().contains(nextActivity) ) {
+    	if ( ! learnerProgress.getCompletedActivities().containsKey(nextActivity) ) {
     		// normal case - the next activity is still yet to be done
     		
 	        learnerProgress.setPreviousActivity(completedActivity);
@@ -305,7 +305,7 @@
             
             
             ComplexActivity complexParent = (ComplexActivity) activityDAO.getActivityByActivityId(parent.getActivityId(),ComplexActivity.class);
-            if (! learnerProgress.getCompletedActivities().contains(complexParent) && !complexParent.areChildrenCompleted(learnerProgress))
+            if (! learnerProgress.getCompletedActivities().containsKey(complexParent) && !complexParent.areChildrenCompleted(learnerProgress))
             {
                 Activity nextActivity = complexParent.getNextActivityByParent(completedActivity);
                 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.93 -r1.94
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	16 Jan 2009 05:57:09 -0000	1.93
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	12 Feb 2009 00:23:17 -0000	1.94
@@ -397,7 +397,7 @@
 	    Boolean clearCompletedFlag) {
 	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
 
-	if (!progress.getCompletedActivities().contains(activity)) {
+	if (!progress.getCompletedActivities().containsKey(activity)) {
 	    // if we skip a sequence in an optional sequence, or have been force completed for branching / optional
 	    // sequence
 	    // and we go back to the sequence later, then the LessonComplete flag must be reset so that it will step
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java,v
diff -u -r1.25 -r1.26
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	15 Jan 2009 03:18:00 -0000	1.25
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	12 Feb 2009 00:23:17 -0000	1.26
@@ -218,7 +218,7 @@
     	
 		if ( currentActivity == null ) {
 			progress = learnerService.joinLesson(learnerId, lesson.getLessonId());
-		} else if ( progress.getCompletedActivities().contains(currentActivity) ) {
+		} else if ( progress.getCompletedActivities().containsKey(currentActivity) ) {
 			return actionMappings.getCloseForward(currentActivity, lesson.getLessonId());
 		} else {
 			// Set activity as complete
@@ -322,7 +322,7 @@
 			
 			progressSummary.append("&completed=");
 			first = true;
-			for ( Object obj : learnerProgress.getCompletedActivities() ) {
+			for ( Object obj : learnerProgress.getCompletedActivities().keySet() ) {
 				Activity activity = (Activity ) obj;
 				if ( ! first ) {
 					progressSummary.append("_");
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.146 -r1.147
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	24 Nov 2008 00:16:27 -0000	1.146
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	12 Feb 2009 00:23:46 -0000	1.147
@@ -1211,7 +1211,7 @@
 	    }
 
 	    // check if activity is already complete
-	    if (learnerProgress != null && learnerProgress.getCompletedActivities().contains(stopActivity)) {
+	    if (learnerProgress != null && learnerProgress.getCompletedActivities().containsKey(stopActivity)) {
 		return messageService.getMessage(MonitoringService.FORCE_COMPLETE_STOP_MESSAGE_ACTIVITY_DONE,
 			new Object[] { stopActivity.getTitle() });
 	    }
@@ -1352,7 +1352,7 @@
 	// be set.
 	if (stopReason == null) {
 	    LearnerProgress learnerProgress = learnerService.getProgress(learner.getUserId(), lessonId);
-	    if (learnerProgress.getCompletedActivities().contains(stopActivity)) {
+	    if (learnerProgress.getCompletedActivities().containsKey(stopActivity)) {
 		// we have reached the stop activity. It may have been the
 		// activity we just processed
 		// or it may have been a parent activity (e.g. an optional