Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r3438d5b8ee54bba2e782f62d77db620df3e0faef -r0ea73ee29a582fe2f120a3d5c87fe50b89cfb57d --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 3438d5b8ee54bba2e782f62d77db620df3e0faef) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 0ea73ee29a582fe2f120a3d5c87fe50b89cfb57d) @@ -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