Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -r794bc07f43db8e11804eae12803407806196d777 -r600dc5c9c87aa8fc67e052124ac91385847c856c
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 794bc07f43db8e11804eae12803407806196d777)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 600dc5c9c87aa8fc67e052124ac91385847c856c)
@@ -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
===================================================================
diff -u -ra5aec5a4cb2377cbdf8b8937b66ab762ce76c171 -r600dc5c9c87aa8fc67e052124ac91385847c856c
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision a5aec5a4cb2377cbdf8b8937b66ab762ce76c171)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision 600dc5c9c87aa8fc67e052124ac91385847c856c)
@@ -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
===================================================================
diff -u -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e -r600dc5c9c87aa8fc67e052124ac91385847c856c
--- lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	(.../ParallelWaitActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	(.../ParallelWaitActivity.java)	(revision 600dc5c9c87aa8fc67e052124ac91385847c856c)
@@ -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
===================================================================
diff -u -r0cd6d5f3a368eb1fa3a140d87b5b1664ee4aa88d -r600dc5c9c87aa8fc67e052124ac91385847c856c
--- lams_common/test/java/org/lamsfoundation/lams/lesson/TestActivityStrategy.java	(.../TestActivityStrategy.java)	(revision 0cd6d5f3a368eb1fa3a140d87b5b1664ee4aa88d)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/TestActivityStrategy.java	(.../TestActivityStrategy.java)	(revision 600dc5c9c87aa8fc67e052124ac91385847c856c)
@@ -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);
 
     }
 }