Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -re023857e217082f46fd3235d5673129ffccf6ff4 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision e023857e217082f46fd3235d5673129ffccf6ff4)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -19,7 +19,7 @@
 			<generator class="native" />
 		</id>
 
-		<property name="lessonComplete" type="java.lang.Boolean"
+		<property name="lessonComplete" type="java.lang.Byte"
 			column="lesson_completed_flag" />
 
 		<property name="parallelWaiting" type="java.lang.Byte"
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
===================================================================
diff -u -rc27d97af7a284e7fb373be1efb26af904643329b -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision c27d97af7a284e7fb373be1efb26af904643329b)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -75,6 +75,14 @@
     public static final byte PARALLEL_WAITING = 1;
     /** Parallel waiting state: All activities completed, break out of parallel frames */
     public static final byte PARALLEL_WAITING_COMPLETE = 2;
+    
+    /** Learner has not completed the lesson */
+    public static final byte LESSON_NOT_COMPLETE = 0;
+    /** Learner has completed the lesson in the normal manner. */
+    public static final byte LESSON_END_OF_DESIGN_COMPLETE = 1;
+    /** Learner has completed the lesson by reaching a "Stop After Activity" point */
+    public static final byte LESSON_IN_DESIGN_COMPLETE = 2;
+    
     //---------------------------------------------------------------------
     // attributes
     //---------------------------------------------------------------------
@@ -124,7 +132,7 @@
     /**
      * Indicates is the User has completed this lesson.
      */
-    private boolean lessonComplete;
+    private Byte lessonComplete;
     
     /**
      * Indicates the learner progress is in a incomplete parallel activity
@@ -150,6 +158,7 @@
     /** default constructor */
     public LearnerProgress()
     {
+    	this.lessonComplete = new Byte(LESSON_NOT_COMPLETE);
     }
     /**
      * Chain constructor to create new learner progress with minimum data.
@@ -169,6 +178,7 @@
         this.lesson = lesson;
         this.attemptedActivities = attemptedActivities;
         this.completedActivities = completedActivities;
+    	this.lessonComplete = new Byte(LESSON_NOT_COMPLETE);
     }
     //---------------------------------------------------------------------
     // Getters and Setters
@@ -356,22 +366,29 @@
     }
 
     /**
-     * Getter for property lessonComplete.
-     * @return Value of property lessonComplete.
+     * Has the user completed the lesson? We don't care how (ie at end of sequence or after a "stop after activity")
      */
-    public boolean isLessonComplete()
+    public boolean isComplete()
     {
 
-        return this.lessonComplete;
+        return lessonComplete == LESSON_END_OF_DESIGN_COMPLETE || lessonComplete == LESSON_IN_DESIGN_COMPLETE;
     }
 
     /**
+     * The "real" value for lessonComplete.
+     * @return LESSON_NOT_COMPLETE, LESSON_END_OF_DESIGN_COMPLETE, LESSON_IN_DESIGN_COMPLETE
+     */
+    public Byte getLessonComplete()
+    {
+    	return lessonComplete;
+    }
+    
+    /**
      * Setter for property lessonComplete.
      * @param lessonComplete New value of property lessonComplete.
      */
-    public void setLessonComplete(boolean lessonComplete)
+    public void setLessonComplete(Byte lessonComplete)
     {
-
         this.lessonComplete = lessonComplete;
     }
 
@@ -472,7 +489,7 @@
                                       this.currentActivity != null ? this.currentActivity.getActivityId() : null,
                                       this.createIdArrayFrom(this.attemptedActivities),
                                       this.createIdArrayFrom(this.completedActivities),
-                                      this.lessonComplete);
+                                      isComplete());
     }
     
     //---------------------------------------------------------------------
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
===================================================================
diff -u -rc5afbded875388afbb25dcdc972af56bf021658a -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(.../LearnerProgressDAO.java)	(revision c5afbded875388afbb25dcdc972af56bf021658a)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(.../LearnerProgressDAO.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -52,7 +52,7 @@
    // +
    // 	"or activity in elements(p.previousActivity) or activity in elements(p.completedActivities)";
 	private final static String LOAD_COMPLETED_PROGRESS_BY_LESSON = 
-        "from LearnerProgress p where p.lessonComplete = true and p.lesson.id = :lessonId";
+        "from LearnerProgress p where p.lessonComplete > 0 and p.lesson.id = :lessonId";
 
 	private final static String COUNT_ATTEMPTED_ACTIVITY ="select count(*) from LearnerProgress prog, "
 		+" Activity act where act.id = :activityId and " 
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
diff -u -r4a347e27e76d051dfb231810330b42d0b7295ded -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision 4a347e27e76d051dfb231810330b42d0b7295ded)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -591,7 +591,8 @@
 					 Iterator iter = progresses.iterator();
 					 while ( iter.hasNext() ) {
 						 LearnerProgress progress = (LearnerProgress) iter.next();
-						 progress.setLessonComplete(false);
+						 if ( progress.getLessonComplete() == LearnerProgress.LESSON_END_OF_DESIGN_COMPLETE ) 
+							 progress.setLessonComplete(LearnerProgress.LESSON_NOT_COMPLETE);
 						 count++;
 					 }
 				 }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
diff -u -re863ee0730b7f5a82c13dd55fc39c2f9741cd695 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision e863ee0730b7f5a82c13dd55fc39c2f9741cd695)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -95,7 +95,7 @@
         		completedActivityList.add(parentActivity.getActivityId());        	
         	}
             populateCurrentCompletedActivityList(learnerProgress, completedActivityList);
-        	return setLessonComplete(learnerProgress);
+        	return setLessonComplete(learnerProgress, LearnerProgress.LESSON_IN_DESIGN_COMPLETE);
         } else {
 	        Transition transition = completedActivity.getTransitionFrom();
 	        if (transition != null)
@@ -132,6 +132,8 @@
         if (progress.getLesson().getLockedForEdit()) {
         	// special case - currently setting up the stop gates for live edit.
         	return clearProgressNowhereToGoNotCompleted(progress,"setUpStartPoint");
+        } else if (progress.isComplete() ) {
+        	return progress;
         } else if(ld.getFirstActivity()==null) {
             throw new ProgressException("Could not find first activity for " 
                                         +"learning design ["+ld.getTitle()+"], id["
@@ -192,7 +194,7 @@
     	  
     	progress.setCurrentActivity(null);
     	progress.setNextActivity(null);
-    	progress.setLessonComplete(false);
+    	progress.setLessonComplete(LearnerProgress.LESSON_NOT_COMPLETE);
     	return progress;
     }
     
@@ -340,7 +342,7 @@
         }
         //lesson is meant to be completed if there is no transition and no parent.
         else {
-        	learnerProgress = setLessonComplete(learnerProgress);
+        	learnerProgress = setLessonComplete(learnerProgress, LearnerProgress.LESSON_END_OF_DESIGN_COMPLETE);
         }
 
         return learnerProgress;
@@ -352,10 +354,10 @@
 	 * @param learnerProgress
 	 * @return updated learnerProgress
 	 */
-	private LearnerProgress setLessonComplete(LearnerProgress learnerProgress) {
+	private LearnerProgress setLessonComplete(LearnerProgress learnerProgress, byte completionStatus) {
 		learnerProgress.setCurrentActivity(null);
 		learnerProgress.setNextActivity(null);
-		learnerProgress.setLessonComplete(true);
+		learnerProgress.setLessonComplete(completionStatus);
 		return learnerProgress;
 	}
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r07d6aab3c681c1f2ecb8041756e99567ed639f31 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 07d6aab3c681c1f2ecb8041756e99567ed639f31)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -369,8 +369,8 @@
     	// and we go back to the sequence later, then the LessonComplete flag must be reset so that it will step through
     	// all the activities in the sequence - otherwise it will go to the "Completed" screen after the first activity in the sequence
     	if ( clearCompletedFlag && activity.getParentActivity() != null && activity.getParentActivity().isSequenceActivity() 
-    			&& progress.isLessonComplete() && ! progress.getCompletedActivities().contains(activity) )  
-    		progress.setLessonComplete(false);
+    			&& progress.isComplete() && ! progress.getCompletedActivities().contains(activity) )  
+    		progress.setLessonComplete(LearnerProgress.LESSON_NOT_COMPLETE);
     	
     	progressEngine.setActivityAttempted(progress, activity);
     	progress.setCurrentActivity(activity);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
diff -u -r0b15f95c45e3f984eb6b422bb035fb6d9f824e82 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	(.../ActivityMapping.java)	(revision 0b15f95c45e3f984eb6b422bb035fb6d9f824e82)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	(.../ActivityMapping.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -128,7 +128,7 @@
     {
         ActionForward actionForward = null;
 
-        if (progress.isLessonComplete())
+        if (progress.isComplete())
         {
             // If lesson complete forward to lesson complete action. This action will
             // cause a client request to clear ALL frames. Need to append the progress
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
diff -u -re023857e217082f46fd3235d5673129ffccf6ff4 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision e023857e217082f46fd3235d5673129ffccf6ff4)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -315,7 +315,7 @@
         testProgress = learnerService.calculateProgress(testCompletedActivity,
                                                         testUser.getUserId(),
                                                         testProgress);
-        assertTrue("verify lesson complete",testProgress.isLessonComplete());
+        assertTrue("verify lesson complete",testProgress.isComplete());
         assertEquals("verify temp completed activities",1,testProgress.getCurrentCompletedActivitiesList().size());
     }
 
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
===================================================================
diff -u -re023857e217082f46fd3235d5673129ffccf6ff4 -r96b3b3ff3f62e1bca1d299f75f512995388e420b
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java	(.../TestDisplayActivityAction.java)	(revision e023857e217082f46fd3235d5673129ffccf6ff4)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java	(.../TestDisplayActivityAction.java)	(revision 96b3b3ff3f62e1bca1d299f75f512995388e420b)
@@ -167,7 +167,7 @@
     {
         //setup the session bean to display completion page.
         //LearnerProgress progress = testBean.getLearnerProgress();
-        learnerProgress.setLessonComplete(true);
+        learnerProgress.setLessonComplete(LearnerProgress.LESSON_END_OF_DESIGN_COMPLETE);
         //testBean.setLearnerProgress(progress);
         //httpSession.setAttribute(SessionBean.NAME,testBean);
         httpSession.setAttribute(ActivityAction.LEARNER_PROGRESS_REQUEST_ATTRIBUTE,learnerProgress);