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.125 -r1.126
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	14 Jan 2008 23:33:33 -0000	1.125
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	12 Feb 2008 04:09:27 -0000	1.126
@@ -1132,8 +1132,14 @@
 					throw new MonitoringServiceException(e);
 				}
 				
+        }else if(activity.isBranchingActivity() || activity.isOptionsActivity() ){
+        	// Can force complete over a branching activity, but none of the branches are marked as done.
+        	// Ditto the two types of optional activities. 
+        	// Then if the user goes back to them, they will operate normally.
+        	learnerService.completeActivity(learner.getUserId(), activity, lessonId);
+        	
        	}else if(activity.isComplexActivity()){
-        		//for complex activities:SEQUENCE ACTIVITY,PARALLEL ACTIVITY,OPTIONS ACTIVITY
+        		// expect it to be a parallel activity
         		ComplexActivity complexActivity = (ComplexActivity) activity;
         		Set allActivities = complexActivity.getActivities();
         		Iterator iter = allActivities.iterator();