Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -re0d62f22871c958a83ad837bab37b802ce921ef4 --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (.../LessonManagerSoapBindingImpl.java) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (.../LessonManagerSoapBindingImpl.java) (revision e0d62f22871c958a83ad837bab37b802ce921ef4) @@ -27,6 +27,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.Vector; import javax.servlet.http.HttpServlet; @@ -40,7 +41,9 @@ import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.DateUtil; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -120,10 +123,21 @@ } } + @SuppressWarnings("unchecked") private void createLessonClass(Lesson lesson, Organisation organisation, User creator) { List staffList = new LinkedList(); staffList.add(creator); List learnerList = new LinkedList(); + IUserManagementService userManagementService = (IUserManagementService) WebApplicationContextUtils + .getRequiredWebApplicationContext( + ((HttpServlet) context + .getProperty(HTTPConstants.MC_HTTP_SERVLET)) + .getServletContext()).getBean( + "userManagementService"); + Vector learnerVector = userManagementService + .getUsersFromOrganisationByRole(organisation + .getOrganisationId(), Role.LEARNER, false, true); + learnerList.addAll(learnerVector); monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation, organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList, creator.getUserId()); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -rd1649f237cf33c580c22999be93534b4d07ed437 -re0d62f22871c958a83ad837bab37b802ce921ef4 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision d1649f237cf33c580c22999be93534b4d07ed437) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision e0d62f22871c958a83ad837bab37b802ce921ef4) @@ -12,6 +12,7 @@ import java.util.List; import java.util.Set; import java.util.SortedMap; +import java.util.Vector; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -53,7 +54,9 @@ import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CentralConstants; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -79,6 +82,8 @@ private static IExportToolContentService exportService = null; private static ILamsCoreToolService toolService = null; + + private static IUserManagementService userManagementService = null; /** * Constructor of the object. @@ -553,10 +558,15 @@ } - private void createLessonClass(Lesson lesson, Organisation organisation, User creator) { + @SuppressWarnings("unchecked") + private void createLessonClass(Lesson lesson, Organisation organisation, User creator) { List staffList = new LinkedList(); staffList.add(creator); List learnerList = new LinkedList(); + Vector learnerVector = userManagementService + .getUsersFromOrganisationByRole(organisation + .getOrganisationId(), Role.LEARNER, false, true); + learnerList.addAll(learnerVector); LessonManagerServlet.monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation, organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList, creator .getUserId()); @@ -589,6 +599,8 @@ LessonManagerServlet.toolService = (ILamsCoreToolService) WebApplicationContextUtils .getRequiredWebApplicationContext(getServletContext()).getBean("lamsCoreToolService"); + LessonManagerServlet.userManagementService = (IUserManagementService) WebApplicationContextUtils.getRequiredWebApplicationContext( + getServletContext()).getBean("userManagementService"); } private class AddUsersToLessonThread implements Runnable {