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.73 -r1.74
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	31 May 2006 12:42:04 -0000	1.73
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	1 Jun 2006 22:57:48 -0000	1.74
@@ -777,7 +777,7 @@
             			learnerService.performGrouping(lessonId, groupActivity);
 //            			grouping = groupActivity.getCreateGrouping();
 //            			myGroup = grouping.getGroupBy(learner);
-            			learnerService.completeActivity(learner.getUserId(),activity,newLesson);
+            			learnerService.completeActivity(learner.getUserId(),activity,lessonId);
             			log.debug("Grouping activity [" + activity.getActivityId() + "] is completed.");
             		}else{
 	            		//except random grouping, stop here
@@ -786,14 +786,14 @@
             		}
             	}else{
             		//if group already exist
-            		learnerService.completeActivity(learner.getUserId(),activity,newLesson);
+            		learnerService.completeActivity(learner.getUserId(),activity,lessonId);
             		log.debug("Grouping activity [" + activity.getActivityId() + "] is completed.");
             	}
             }else if ( activity.isGateActivity() ) {
             	GateActivity gate = (GateActivity) activity;
             	if(learnerService.knockGate(lessonId,gate,learner)){
             		//the gate is opened, continue to next activity to complete
-            		learnerService.completeActivity(learner.getUserId(),activity,newLesson);
+            		learnerService.completeActivity(learner.getUserId(),activity,lessonId);
             		log.debug("Gate activity [" + gate.getActivityId() + "] is completed.");
             	}else{
             		//the gate is closed, stop here