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.6 -r1.7
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	17 Feb 2005 02:52:04 -0000	1.6
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	25 Feb 2005 01:36:54 -0000	1.7
@@ -22,6 +22,8 @@
 		<property name="lessonComplete" type="java.lang.Boolean"
 			column="lesson_completed_flag" />
 
+		<property name="parallelWaiting" type="java.lang.Boolean"
+			column="waiting_flag" />
 		<!-- Associations -->
 
 		<!-- uni-directional one-to-many association to attempted acitivities -->
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.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	23 Feb 2005 04:11:25 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	25 Feb 2005 01:36:54 -0000	1.8
@@ -73,6 +73,13 @@
      */
     private boolean lessonComplete;
     
+    /**
+     * Indicates the learner progress is in a incomplete parallel activity
+     * or not.
+     */
+    private boolean parallelWaiting;
+    
+    
     /** default constructor */
     public LearnerProgress()
     {
@@ -308,4 +315,18 @@
     {
         this.previousActivity = previousActivity;
     }
+    /**
+     * @return Returns the isParallelWaiting.
+     */
+    public boolean isParallelWaiting()
+    {
+        return parallelWaiting;
+    }
+    /**
+     * @param isParallelWaiting The isParallelWaiting to set.
+     */
+    public void setParallelWaiting(boolean parallelWaiting)
+    {
+        this.parallelWaiting = parallelWaiting;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	17 Feb 2005 04:21:45 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	25 Feb 2005 01:36:54 -0000	1.3
@@ -1,19 +1,19 @@
-/*
- * Created on 16/02/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+
 package org.lamsfoundation.lams.lesson;
 
 import org.lamsfoundation.lams.learningdesign.NullActivity;
 
 /**
  * @author dgarth
  *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ParallelWaitActivity extends NullActivity {
 
+    public static final int PARALLEL_WAIT_ACTIVITY_TYPE = -1;
+
+    public Integer getActivityTypeId() {
+		return new Integer(PARALLEL_WAIT_ACTIVITY_TYPE);
+	}
+    
+    
 }
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/TestActivityStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/Attic/TestActivityStrategy.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/lesson/TestActivityStrategy.java	24 Feb 2005 04:11:33 -0000	1.2
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/TestActivityStrategy.java	25 Feb 2005 01:36:54 -0000	1.3
@@ -156,7 +156,7 @@
         assertNotNull("we should have a next activity",nextActivity);
 
         assertTrue("It should be kind of null activity",nextActivity.isNull());
-        assertTrue("It should waiting activity",nextActivity instanceof ParallelWaitActivity);
+        assertTrue("It should waiting activity",nextActivity.getActivityTypeId().intValue()==ParallelWaitActivity.PARALLEL_WAIT_ACTIVITY_TYPE);
 
     }
 }