Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java =================================================================== diff -u -r7989387d4db95c8bee3a100d1d036f1f22c7af97 -r5026f52ee7319416d69e0ac42fa99e80e0df7251 --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (.../LessonManagerSoapBindingImpl.java) (revision 7989387d4db95c8bee3a100d1d036f1f22c7af97) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (.../LessonManagerSoapBindingImpl.java) (revision 5026f52ee7319416d69e0ac42fa99e80e0df7251) @@ -72,7 +72,7 @@ countryIsoCode, langIsoCode); // 1. init lesson Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap - .getOrganisation().getOrganisationId(), userMap.getUser().getUserId()); + .getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), null); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser()); // 3. start lesson @@ -94,7 +94,7 @@ countryIsoCode, langIsoCode); // 1. init lesson Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap - .getOrganisation().getOrganisationId(), userMap.getUser().getUserId()); + .getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), null); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser()); // 3. schedule lesson Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java =================================================================== diff -u -rfbe6bf3b510954848d716aa87e23d24859380245 -r5026f52ee7319416d69e0ac42fa99e80e0df7251 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java (.../LessonJoinServlet.java) (revision fbe6bf3b510954848d716aa87e23d24859380245) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java (.../LessonJoinServlet.java) (revision 5026f52ee7319416d69e0ac42fa99e80e0df7251) @@ -280,7 +280,7 @@ staffList = getUsersFromDTOs(userDTOs); } Lesson lesson = monitoringService.initializeLesson(lessonName, lessonDescription, learnerExportAvailable, - ldId, orgId, ownerUserId); + ldId, orgId, ownerUserId, null); monitoringService.createLessonClassForLesson(lesson.getLessonId().longValue(), org, learnerGroupName, learnerList, staffGroupName, staffList, ownerUserId); monitoringService.startLesson(lesson.getLessonId().longValue(), ownerUserId); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -r4954f3df2e711d3644055d77e604e6241644b2d8 -r5026f52ee7319416d69e0ac42fa99e80e0df7251 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 4954f3df2e711d3644055d77e604e6241644b2d8) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 5026f52ee7319416d69e0ac42fa99e80e0df7251) @@ -122,7 +122,9 @@ String learnerIds = request.getParameter(CentralConstants.PARAM_LEARNER_IDS); String monitorIds = request.getParameter(CentralConstants.PARAM_MONITOR_IDS); - + // Custom CSV string to be used for tool adapters + String customCSV = request.getParameter(CentralConstants.PARAM_CUSTOM_CSV); + Long ldId = null; Long lsId = null; try { @@ -142,15 +144,15 @@ if (method.equals(CentralConstants.METHOD_START)) { ldId = new Long(ldIdStr); Long lessonId = startLesson(serverId, datetime, hashValue, - username, ldId, courseId, title, desc, country, lang); + username, ldId, courseId, title, desc, country, lang, customCSV); element = document.createElement(CentralConstants.ELEM_LESSON); element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString()); } else if (method.equals(CentralConstants.METHOD_PREVIEW)) { ldId = new Long(ldIdStr); Long lessonId = startPreview(serverId, datetime, hashValue, - username, ldId, courseId, title, desc, country, lang); + username, ldId, courseId, title, desc, country, lang, customCSV); element = document.createElement(CentralConstants.ELEM_LESSON); element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString()); @@ -159,7 +161,7 @@ ldId = new Long(ldIdStr); Long lessonId = scheduleLesson(serverId, datetime, hashValue, username, ldId, courseId, title, desc, startDate, - country, lang); + country, lang, customCSV); element = document.createElement(CentralConstants.ELEM_LESSON); element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString()); @@ -186,7 +188,7 @@ } else if (method.equals(CentralConstants.METHOD_IMPORT)) { // ldId = new Long(ldIdStr); - Long ldID = importLearningDesign(request, response, filePath, username, serverId); + Long ldID = importLearningDesign(request, response, filePath, username, serverId, customCSV); element = document.createElement(CentralConstants.ELEM_LEARNINGDESIGN); element.setAttribute(CentralConstants.PARAM_LEARNING_DESIGN_ID, ldID.toString()); @@ -271,7 +273,7 @@ public Long startLesson(String serverId, String datetime, String hashValue, String username, long ldId, String courseId, String title, - String desc, String countryIsoCode, String langIsoCode) + String desc, String countryIsoCode, String langIsoCode, String customCSV) throws RemoteException { try { ExtServerOrgMap serverMap = integrationService @@ -283,10 +285,10 @@ ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap( serverMap, userMap, courseId, countryIsoCode, langIsoCode); // 1. init lesson - Lesson lesson = monitoringService - .initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap - .getOrganisation().getOrganisationId(), userMap - .getUser().getUserId()); + Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, + orgMap.getOrganisation().getOrganisationId(), + userMap.getUser().getUserId(), + customCSV); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap .getUser()); @@ -303,7 +305,7 @@ public Long scheduleLesson(String serverId, String datetime, String hashValue, String username, long ldId, String courseId, String title, String desc, String startDate, String countryIsoCode, - String langIsoCode) throws RemoteException { + String langIsoCode, String customCSV) throws RemoteException { try { ExtServerOrgMap serverMap = integrationService .getExtServerOrgMap(serverId); @@ -317,7 +319,7 @@ Lesson lesson = monitoringService .initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap .getOrganisation().getOrganisationId(), userMap - .getUser().getUserId()); + .getUser().getUserId(), customCSV); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap .getUser()); @@ -514,7 +516,7 @@ public Long startPreview(String serverId, String datetime, String hashValue, String username, Long ldId, String courseId, String title, - String desc, String countryIsoCode, String langIsoCode) + String desc, String countryIsoCode, String langIsoCode, String customCSV) throws RemoteException { try { @@ -528,7 +530,7 @@ serverMap, userMap, courseId, countryIsoCode, langIsoCode); // 1. init lesson Lesson lesson = monitoringService - .initializeLessonForPreview(title, desc, ldId, userMap.getUser().getUserId()); + .initializeLessonForPreview(title, desc, ldId, userMap.getUser().getUserId(), customCSV); // 2. create lessonClass for lesson monitoringService.createPreviewClassForLesson(userMap.getUser().getUserId(), lesson.getLessonId()); @@ -546,7 +548,7 @@ public Long importLearningDesign(HttpServletRequest request, HttpServletResponse response, - String filePath, String username, String serverId) + String filePath, String username, String serverId, String customCSV) throws RemoteException { List ldErrorMsgs = new ArrayList(); @@ -576,7 +578,7 @@ } File designFile = new File(filePath); - Object[] ldResults = exportService.importLearningDesign(designFile, user, workspaceFolderUid, toolsErrorMsgs); + Object[] ldResults = exportService.importLearningDesign(designFile, user, workspaceFolderUid, toolsErrorMsgs, customCSV); ldId = (Long) ldResults[0]; ldErrorMsgs = (List) ldResults[1]; toolsErrorMsgs = (List) ldResults[2]; Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -ra1196223ee2f3c89384224a29303b30a5af7a9f7 -r5026f52ee7319416d69e0ac42fa99e80e0df7251 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision a1196223ee2f3c89384224a29303b30a5af7a9f7) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 5026f52ee7319416d69e0ac42fa99e80e0df7251) @@ -583,7 +583,7 @@ LearningDesign design = (LearningDesign)iterator.next(); authoringService.copyLearningDesign(design, new Integer(LearningDesign.COPY_TYPE_NONE), - user,targetWorkspaceFolder, false, null); + user,targetWorkspaceFolder, false, null, null); } } }