Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml =================================================================== diff -u -r01801565c08ef5dd2394a888e7fa5043d8a93584 -rea7b29a6f1c1567f276bdd802ccffeb486e2f1e7 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision 01801565c08ef5dd2394a888e7fa5043d8a93584) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision ea7b29a6f1c1567f276bdd802ccffeb486e2f1e7) @@ -63,9 +63,13 @@ PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -r01801565c08ef5dd2394a888e7fa5043d8a93584 -rea7b29a6f1c1567f276bdd802ccffeb486e2f1e7 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 01801565c08ef5dd2394a888e7fa5043d8a93584) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision ea7b29a6f1c1567f276bdd802ccffeb486e2f1e7) @@ -75,7 +75,7 @@ * @param lessionPackage * @return */ - public String createLesson(Integer creatorUserId,String lessionPackage); + public String createLessonClassForLessonWDDX(Integer creatorUserId,String lessionPackage); /** * Setup the lesson class and organization for a lesson according to the Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r01801565c08ef5dd2394a888e7fa5043d8a93584 -rea7b29a6f1c1567f276bdd802ccffeb486e2f1e7 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 01801565c08ef5dd2394a888e7fa5043d8a93584) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision ea7b29a6f1c1567f276bdd802ccffeb486e2f1e7) @@ -21,6 +21,7 @@ package org.lamsfoundation.lams.monitoring.service; import java.io.IOException; +import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.HashMap; @@ -309,9 +310,9 @@ } /** - * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLesson(Integer, String) + * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLessonClassForLessonWDDX(Integer, String) */ - public String createLesson(Integer creatorUserId, String lessonPacket){ + public String createLessonClassForLessonWDDX(Integer creatorUserId, String lessonPacket){ FlashMessage flashMessage = null; try{ Hashtable table = (Hashtable)WDDXProcessor.deserialize(lessonPacket); @@ -1065,7 +1066,7 @@ if(!grouping.isChosenGrouping()){ log.error("GroupingActivity ["+groupingActivity.getActivityId() +"] does not have chosen grouping."); throw new MonitoringServiceException("GroupingActivity ["+groupingActivity.getActivityId() - +"] does not have chosen grouping."); + +"] is not chosen grouping."); } try { //try to sorted group list by orderID. @@ -1083,15 +1084,26 @@ } iter = sortedMap.values().iterator(); //grouping all group in list - while(iter.hasNext()){ + for(int orderId=0;iter.hasNext();orderId++){ Hashtable group = (Hashtable) iter.next(); - List learners = (List) group.get(MonitoringConstants.KEY_GROUP_LEARNERS); + List learnerIdList = (List) group.get(MonitoringConstants.KEY_GROUP_LEARNERS); String groupName = WDDXProcessor.convertToString(group,MonitoringConstants.KEY_GROUP_NAME); + List learners = new ArrayList(); + //? Seem too low efficient, is there a easy way? + for(int idx=0;idx