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.32 -r1.33 --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java 12 Feb 2009 00:23:17 -0000 1.32 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java 17 Feb 2009 03:21:58 -0000 1.33 @@ -96,8 +96,8 @@ } populateCurrentCompletedActivityList(learnerProgress, completedActivityList); return setLessonComplete(learnerProgress, LearnerProgress.LESSON_IN_DESIGN_COMPLETE); - } else if ( completedActivity.isFloating() ) { - // special case - floating activity + } else if ( completedActivity.isFloating() && !completedActivity.getParentActivity().isParallelActivity()) { + // special case - floating activity and not parallel activity (floating) child. return learnerProgress; } else { Transition transition = completedActivity.getTransitionFrom();