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.81 -r1.82
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	14 Jun 2006 23:11:22 -0000	1.81
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	18 Jun 2006 13:17:23 -0000	1.82
@@ -818,7 +818,7 @@
 						} catch (LessonServiceException e) {
 		            		stopReason = "Force complete stop at non-grouped grouping activity [" + groupActivity + "] due to exception "+e.getMessage();
 						}
-            			learnerService.completeActivity(learner.getUserId(),activity,lessonId);
+            			learnerService.completeActivity(learner.getUserId(),activity);
             			log.debug("Grouping activity [" + activity.getActivityId() + "] is completed.");
             		}else{
 	            		//except random grouping, stop here
@@ -827,14 +827,14 @@
             		}
             	}else{
             		//if group already exist
-            		learnerService.completeActivity(learner.getUserId(),activity,lessonId);
+            		learnerService.completeActivity(learner.getUserId(),activity);
             		log.debug("Grouping activity [" + activity.getActivityId() + "] is completed.");
             	}
             }else if ( activity.isGateActivity() ) {
             	GateActivity gate = (GateActivity) activity;
-            	if(learnerService.knockGate(lessonId,gate,learner)){
+            	if(learnerService.knockGate(gate,learner,false)){
             		//the gate is opened, continue to next activity to complete
-            		learnerService.completeActivity(learner.getUserId(),activity,lessonId);
+            		learnerService.completeActivity(learner.getUserId(),activity);
             		log.debug("Gate activity [" + gate.getActivityId() + "] is completed.");
             	}else{
             		//the gate is closed, stop here