Index: lams_build/lib/lams/lams-monitoring.jar =================================================================== diff -u -rb8aa7f7aee7229c3701eea9935070811c778b651 -rf3c1df459a445f75ad8279cf72cf5a1e97bd3112 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java =================================================================== diff -u -r4ffbdd859f941a9118e379f922f68c72b60bff63 -rf3c1df459a445f75ad8279cf72cf5a1e97bd3112 --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (.../LessonManagerSoapBindingImpl.java) (revision 4ffbdd859f941a9118e379f922f68c72b60bff63) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (.../LessonManagerSoapBindingImpl.java) (revision f3c1df459a445f75ad8279cf72cf5a1e97bd3112) @@ -75,8 +75,9 @@ ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap, userMap, courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR); // 1. init lesson - Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap - .getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, null); + Lesson lesson = monitoringService.initializeLesson(title, desc, ldId, orgMap.getOrganisation() + .getOrganisationId(), userMap.getUser().getUserId(), customCSV, false, false, true, false, false, + false, false, null, null); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser()); // 3. start lesson @@ -97,14 +98,14 @@ ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap, userMap, courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR); // 1. init lesson - Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap - .getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, null); + Lesson lesson = monitoringService.initializeLesson(title, desc, ldId, orgMap.getOrganisation() + .getOrganisationId(), userMap.getUser().getUserId(), customCSV, false, false, true, false, false, + false, false, null, null); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser()); // 3. schedule lesson Date date = DateUtil.convertFromLAMSFlashFormat(startDate); - monitoringService.startLessonOnSchedule(lesson.getLessonId(), date, userMap.getUser() - .getUserId(), null); + monitoringService.startLessonOnSchedule(lesson.getLessonId(), date, userMap.getUser().getUserId()); return lesson.getLessonId(); } catch (Exception e) { throw new RemoteException(e.getMessage(), e); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java =================================================================== diff -u -r4ffbdd859f941a9118e379f922f68c72b60bff63 -rf3c1df459a445f75ad8279cf72cf5a1e97bd3112 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java (.../LessonJoinServlet.java) (revision 4ffbdd859f941a9118e379f922f68c72b60bff63) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java (.../LessonJoinServlet.java) (revision f3c1df459a445f75ad8279cf72cf5a1e97bd3112) @@ -249,6 +249,8 @@ // create new lesson String lessonName; String lessonDescription; + Boolean enableLessonIntro; + Boolean displayDesignImage; Boolean learnerExportAvailable; Boolean learnerPresenceAvailable; Boolean learnerImAvailable; @@ -267,6 +269,8 @@ Lesson l = (Lesson)lessons.get(lessons.size()-1); lessonName = incrementLessonName(l.getLessonName()); lessonDescription = l.getLessonDescription(); + enableLessonIntro = l.isEnableLessonIntro(); + displayDesignImage = l.isDisplayDesignImage(); learnerExportAvailable = l.getLearnerExportAvailable(); learnerPresenceAvailable = l.getLearnerPresenceAvailable(); learnerImAvailable = l.getLearnerImAvailable(); @@ -281,6 +285,8 @@ LearningDesign ld = (LearningDesign)userService.findById(LearningDesign.class, ldId); lessonName = ld.getTitle(); lessonDescription = ld.getDescription(); + enableLessonIntro = false; + displayDesignImage = false; learnerExportAvailable = true; learnerPresenceAvailable = false; learnerImAvailable = false; @@ -292,8 +298,8 @@ Vector userDTOs = userService.getUsersFromOrganisationByRole(orgId, Role.MONITOR, false, false); staffList = getUsersFromDTOs(userDTOs); } - Lesson lesson = monitoringService.initializeLesson(lessonName, lessonDescription, learnerExportAvailable, - ldId, orgId, ownerUserId, null, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableNotifications, null); + Lesson lesson = monitoringService.initializeLesson(lessonName, lessonDescription, + ldId, orgId, ownerUserId, null, enableLessonIntro, displayDesignImage, learnerExportAvailable, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableNotifications, null, 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 -r91b5a45ed577ce52a8447ffaec3e6b09be082a0f -rf3c1df459a445f75ad8279cf72cf5a1e97bd3112 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 91b5a45ed577ce52a8447ffaec3e6b09be082a0f) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision f3c1df459a445f75ad8279cf72cf5a1e97bd3112) @@ -316,9 +316,8 @@ Organisation organisation = orgMap.getOrganisation(); // 1. init lesson - Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, - organisation.getOrganisationId(), user.getUserId(), customCSV, Boolean.FALSE, Boolean.FALSE, - Boolean.TRUE, Boolean.FALSE, null); + Lesson lesson = monitoringService.initializeLesson(title, desc, ldId, organisation.getOrganisationId(), + user.getUserId(), customCSV, false, false, true, false, false, true, false, null, null); // 2. create lessonClass for lesson createLessonClass(lesson, organisation, user); // 3. start lesson @@ -342,15 +341,14 @@ ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap, courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR); // 1. init lesson - Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, - orgMap.getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, false, - false, true, false, null); + Lesson lesson = monitoringService.initializeLesson(title, desc, ldId, orgMap.getOrganisation() + .getOrganisationId(), userMap.getUser().getUserId(), customCSV, false, false, true, false, false, + true, false, null, null); // 2. create lessonClass for lesson createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser()); // 3. schedule lesson Date date = DateUtil.convertFromLAMSFlashFormat(startDate); - LessonManagerServlet.monitoringService.startLessonOnSchedule(lesson.getLessonId(), date, userMap.getUser() - .getUserId(), null); + monitoringService.startLessonOnSchedule(lesson.getLessonId(), date, userMap.getUser().getUserId()); return lesson.getLessonId(); } catch (Exception e) { throw new RemoteException(e.getMessage(), e);