Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as,v diff -u -r1.1 -r1.2 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as 12 Jan 2010 01:14:40 -0000 1.1 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as 14 Mar 2012 19:20:36 -0000 1.2 @@ -12,6 +12,7 @@ public static const LESSON: String = "lessonNavigationEvent" public static const LEARNERS: String = "learnersNavigationEvent" public static const ADVANCED: String = "advancedNavigationEvent" + public static const CONDITIONS: String = "conditionsNavigationEvent" public var selectedIndex:uint; Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/ModelMap.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/ModelMap.mxml,v diff -u -r1.1 -r1.2 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/ModelMap.mxml 12 Jan 2010 01:14:43 -0000 1.1 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/ModelMap.mxml 14 Mar 2012 19:20:37 -0000 1.2 @@ -31,5 +31,9 @@ - + + + + + Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml,v diff -u -r1.5 -r1.6 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml 9 Mar 2012 16:15:14 -0000 1.5 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml 14 Mar 2012 19:20:37 -0000 1.6 @@ -134,8 +134,6 @@ this.dispatchEvent(valEvent); this.setValidationFocus(valEvent.currentTarget.listener); } - } else { - this.clearValidationFocus(dateTimePicker_fItm); } } @@ -163,13 +161,15 @@ } //enable/disable TimeLimit subgroup + /* enableTimeLimits.enabled = !startInMonitor.selected; if(startInMonitor.selected) { enableTimeLimits.selected = false; } if(enableIndividualTimeLimit.selected) { enableIndividualTimeLimit.selected = false; } + */ var event:WizardEvent = new WizardEvent(WizardEvent.CHANGE_START_BUTTON_LABEL); @@ -246,16 +246,6 @@ - - - - - - - - - - Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml 14 Mar 2012 19:20:36 -0000 1.1 @@ -0,0 +1,94 @@ + + + + 0) + return; + + lessonList = new Array(); + + // populate organisationLessons list from User (java) class passed through in the Dictionary data. + var lessonsNumber:uint = uint(dictionary.getValue("lessonsNumber")); + for (var i:uint = 0; i < lessonsNumber; i++) { + label = dictionary.getLabel(String('lessonID' + i)) as String; + value = dictionary.getValue(String('lessonID' + i)) as String; + + lessonList.push({label: label, data: value}); + } + precedingLesson.selectedIndex = 0; + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml,v diff -u -r1.5 -r1.6 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml 9 Mar 2012 16:15:14 -0000 1.5 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml 14 Mar 2012 19:20:36 -0000 1.6 @@ -46,6 +46,9 @@ [Bindable] public var advanced:Advanced; + + [Bindable] + public var conditions:Conditions; [Bindable] public var dictionary:XMLDictionaryRegistry; @@ -110,6 +113,7 @@ } public function addLesson(event:Event):Boolean { + if(selectedNode != null && selectedNode.isValidDesign()) { // validate lesson name (tab - lesson) var valEvent:ValidationResultEvent = lessonNameVal.validate(); @@ -152,6 +156,12 @@ // validate learning design } else if(newLesson.learningDesignID != 0) { + // populate newLesson.precedingLessonID with value + if (conditions.enablePrecedingLesson.selected) { + var selectedPrecedingLesson:uint = conditions.precedingLesson.selectedIndex; + newLesson.precedingLessonID = conditions.precedingLesson.dataProvider[selectedPrecedingLesson].data; + } + var addType:String = (newLesson.numberLessonsSplit > 0) ? WizardEvent.SPLIT_LESSON_CLASS : WizardEvent.ADD_LESSON; var wizardEvent:WizardEvent = new WizardEvent(addType); wizardEvent.lesson = newLesson; @@ -270,13 +280,16 @@ {advanced.noInstances} {advanced.noLearnersPerInstance} - {advanced.enableTimeLimits.selected} + {conditions.enableTimeLimits.selected} - {advanced.noDaysToLessonFinish.value} - {advanced.enableIndividualTimeLimit.selected} + {conditions.noDaysToLessonFinish.value} + {conditions.enableIndividualTimeLimit.selected} {advanced.enableScheduling.selected} + + {conditions.enablePrecedingLesson.selected} + Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml,v diff -u -r1.1 -r1.2 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml 12 Jan 2010 01:14:16 -0000 1.1 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml 14 Mar 2012 19:20:37 -0000 1.2 @@ -21,6 +21,7 @@ public static const LESSON_INDEX:uint = 0; public static const LEARNERS_INDEX:uint = 1; public static const ADVANCED_INDEX:uint = 2; + public static const CONDITIONS_INDEX:uint = 3; public static var focusObject:Object; public static var focusTimeout:Array = []; @@ -73,6 +74,7 @@ + @@ -82,9 +84,10 @@ - + + Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as,v diff -u -r1.3 -r1.4 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as 5 Sep 2011 19:03:03 -0000 1.3 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as 14 Mar 2012 19:20:37 -0000 1.4 @@ -26,7 +26,11 @@ public var numberLessonsSplit:int; public var numberLearnersSplit:int; - + + // Conditions + public var enablePrecedingLesson:Boolean; + public var precedingLessonID:uint; + // new Lesson copy public var copyType:uint = 2; @@ -60,6 +64,10 @@ data.numberLessonsSplit = WDDXUtil.toWDDXNull(this.numberLessonsSplit); data.numberLearnersSplit = WDDXUtil.toWDDXNull(this.numberLearnersSplit); + if (this.enablePrecedingLesson) { + data.precedingLessonID = this.precedingLessonID; + } + data.copyType = this.copyType; data.learners = learners.toData; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v diff -u -r1.93 -r1.94 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 9 Mar 2012 16:16:55 -0000 1.93 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 14 Mar 2012 19:26:10 -0000 1.94 @@ -86,7 +86,7 @@ public Lesson initializeLesson(String lessonName, String lessonDescription, Boolean learnerExportAvailable, long learningDesignId, Integer organisationId, Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled, - Boolean enableNotifications, Integer numberDaysToLessonFinish); + Boolean enableNotifications, Integer numberDaysToLessonFinish, Long precedingLessonId); /** * Initialize a new lesson so as to start the learning process for a normal @@ -895,8 +895,8 @@ /** Open Time Chart */ public Boolean openTimeChart(long lessonId, Integer userId) throws UserAccessDeniedException; - /** Get Organisation Name */ - public String getOrganisationName(Integer organisationId); + /** Get Organisation by organisationId */ + public Organisation getOrganisation(Integer organisationId); public void initToolSessionIfSuitable(ToolActivity activity, Lesson lesson); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.164 -r1.165 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 9 Mar 2012 16:16:55 -0000 1.164 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 14 Mar 2012 19:26:10 -0000 1.165 @@ -416,14 +416,16 @@ public Lesson initializeLesson(String lessonName, String lessonDescription, Boolean learnerExportAvailable, long learningDesignId, Integer organisationId, Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled, - Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish) { + Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish, Long precedingLessonId) { LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId)); if (originalLearningDesign == null) { throw new MonitoringServiceException("Learning design for id=" + learningDesignId + " is missing. Unable to initialize lesson."); } + Lesson precedingLesson = (precedingLessonId == null) ? null : lessonDAO.getLesson(precedingLessonId); + // The duplicated sequence should go in the run sequences folder under // the given organisation WorkspaceFolder runSeqFolder = null; @@ -452,7 +454,7 @@ User user = userID != null ? (User) baseDAO.find(User.class, userID) : null; Lesson initializedLesson = initializeLesson(lessonName, lessonDescription, learnerExportAvailable, originalLearningDesign, user, runSeqFolder, LearningDesign.COPY_TYPE_LESSON, customCSV, - learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish); + learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish, precedingLesson); Long initializedLearningDesignId = initializedLesson.getLearningDesign().getLearningDesignId(); logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CREATE, userID, initializedLearningDesignId, initializedLesson.getLessonId(), null); @@ -477,13 +479,13 @@ return initializeLesson(lessonName, lessonDescription, Boolean.TRUE, originalLearningDesign, user, null, LearningDesign.COPY_TYPE_PREVIEW, customCSV, learnerPresenceAvailable, learnerImAvailable, - liveEditEnabled, null, null); + liveEditEnabled, null, null, null); } public Lesson initializeLesson(String lessonName, String lessonDescription, Boolean learnerExportAvailable, LearningDesign originalLearningDesign, User user, WorkspaceFolder workspaceFolder, int copyType, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled, - Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish) { + Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson) { // copy the current learning design LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign, new Integer( @@ -500,7 +502,7 @@ Lesson lesson = createNewLesson(title, lessonDescription, user, learnerExportAvailable, copiedLearningDesign, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications, - scheduledNumberDaysToLessonFinish); + scheduledNumberDaysToLessonFinish, precedingLesson); auditAction(MonitoringService.AUDIT_LESSON_CREATED_KEY, new Object[] { lessonName, copiedLearningDesign.getTitle(), learnerExportAvailable }); return lesson; @@ -533,7 +535,8 @@ Boolean enableLessonNotifications = WDDXProcessor.convertToBoolean("enableLessonNotifications", table.get("enableLessonNotifications")); String customCSV = WDDXProcessor.convertToString(WDDXTAGS.CUSTOM_CSV, table.get(WDDXTAGS.CUSTOM_CSV)); Integer scheduledNumberDaysToLessonFinish = WDDXProcessor.convertToInteger("scheduledNumberDaysToLessonFinish", table.get("scheduledNumberDaysToLessonFinish")); - + Long precedingLessonId = WDDXProcessor.convertToLong("organisationID", table.get("precedingLessonID")); + // initialize lesson Lesson newLesson = null; @@ -544,7 +547,7 @@ } else { newLesson = initializeLesson(title, desc, learnerExportAvailable, ldId, organisationId, creatorUserId, customCSV, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications, - scheduledNumberDaysToLessonFinish); + scheduledNumberDaysToLessonFinish, precedingLessonId); } if (newLesson != null) { @@ -2230,10 +2233,17 @@ private Lesson createNewLesson(String lessonName, String lessonDescription, User user, Boolean learnerExportAvailable, LearningDesign copiedLearningDesign, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled, Boolean enableLessonNotifications, - Integer scheduledNumberDaysToLessonFinish) { + Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson) { Lesson newLesson = Lesson.createNewLessonWithoutClass(lessonName, lessonDescription, user, learnerExportAvailable, copiedLearningDesign, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish); + if (precedingLesson != null) { + HashSet precedingLessons = new HashSet(); + precedingLessons.add(precedingLesson); + newLesson.setPrecedingLessons(precedingLessons); +// newLesson.getPrecedingLessons().add(precedingLesson); + } + lessonDAO.saveLesson(newLesson); return newLesson; } @@ -2990,13 +3000,14 @@ Boolean enableLessonNotifications = WDDXProcessor.convertToBoolean("enableLessonNotifications", table.get("enableLessonNotifications")); int numLessons = WDDXProcessor.convertToInt("numberLessonsSplit", table.get("numberLessonsSplit")); Integer scheduledNumberDaysToLessonFinish = WDDXProcessor.convertToInteger("scheduledNumberDaysToLessonFinish", table.get("scheduledNumberDaysToLessonFinish")); - + Long precedingLessonId = WDDXProcessor.convertToLong("organisationID", table.get("precedingLessonID")); + // initialize multiple lessons if (numLessons > 0) { for (int i = 1; i <= numLessons; i++) { Lesson newLesson = initializeLesson(title + " " + i, desc, learnerExportAvailable, ldId, organisationId, creatorUserId, customCSV, learnerPresenceAvailable, learnerImAvailable, - liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish); + liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish, precedingLessonId); lessonIds.add(newLesson.getLessonId()); } } @@ -3118,9 +3129,8 @@ groupDAO.saveGroup(group); } - public String getOrganisationName(Integer organisationId) { - Organisation org = (Organisation) baseDAO.find(Organisation.class, organisationId); - return org.getName(); + public Organisation getOrganisation(Integer organisationId) { + return (Organisation) baseDAO.find(Organisation.class, organisationId); } /** @@ -3163,7 +3173,7 @@ .getLearningDesign().getLearningDesignId(), group.getOrganisationId(), userDto .getUserID(), null, lesson.getLearnerPresenceAvailable(), lesson .getLearnerImAvailable(), lesson.getLiveEditEnabled(), lesson - .getEnableLessonNotifications(), null); + .getEnableLessonNotifications(), null, null); // save LessonClasses newLesson = this Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.71 -r1.72 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 9 Mar 2012 16:16:55 -0000 1.71 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 14 Mar 2012 19:26:10 -0000 1.72 @@ -26,32 +26,25 @@ import java.io.IOException; import java.io.PrintWriter; -import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.TimeZone; -import java.util.TreeSet; +import java.util.Set; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.monitoring.MonitoringConstants; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy; -import org.lamsfoundation.lams.timezone.Timezone; -import org.lamsfoundation.lams.timezone.dto.TimezoneDTO; import org.lamsfoundation.lams.timezone.service.ITimezoneService; -import org.lamsfoundation.lams.timezone.util.TimezoneComparator; -import org.lamsfoundation.lams.timezone.util.TimezoneDTOComparator; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; -import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.util.DateUtil; @@ -194,7 +187,7 @@ Boolean learnerPresenceAvailable = WebUtil.readBooleanParam(request, "learnerPresenceAvailable", false); Boolean learnerImAvailable = WebUtil.readBooleanParam(request, "learnerImAvailable", false); Boolean liveEditEnabled = WebUtil.readBooleanParam(request, "liveEditEnabled", false); - Lesson newLesson = monitoringService.initializeLesson(title,desc,learnerExportAvailable,ldId,organisationId,getUserId(), null, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, Boolean.FALSE, null); + Lesson newLesson = monitoringService.initializeLesson(title,desc,learnerExportAvailable,ldId,organisationId,getUserId(), null, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, Boolean.FALSE, null, null); flashMessage = new FlashMessage("initializeLesson",newLesson.getLessonId()); } catch (Exception e) { @@ -682,14 +675,9 @@ MessageService messageService = monitoringService.getMessageService(); String module = WebUtil.readStrParam(request,"module",false); - Integer orgId = WebUtil.readIntParam(request,"orgId",true); - - String orgName = null; - if(orgId != null) orgName = monitoringService.getOrganisationName(orgId); ArrayList languageCollection = new ArrayList(); - - if(module.equals("wizard")) { + if(module.equals("wizard")) { // pre-existing flash app (AS 2.0) labels languageCollection.add(new String("sys.error.msg.start")); languageCollection.add(new String("sys.error")); @@ -743,6 +731,8 @@ languageCollection.add(new String("class.tab.print.name.label")); languageCollection.add(new String("class.tab.heading.label")); languageCollection.add(new String("advanced.tab.form.validation.schedule.date.error")); + languageCollection.add(new String("conditions.tab.label")); + languageCollection.add(new String("conditions.tab.form.preceding.label")); } else if(module.equals("timechart")) { @@ -769,21 +759,44 @@ languageCollection.add(new String("alert.no.learner.data")); } - String languageOutput = ""; - - for(int i = 0; i < languageCollection.size(); i++){ - languageOutput += "" + messageService.getMessage(languageCollection.get(i)) + ""; + String languageOutput = ""; + + for (int i = 0; i < languageCollection.size(); i++) { + languageOutput += "" + + messageService.getMessage(languageCollection.get(i)) + ""; + } + + Integer orgId = WebUtil.readIntParam(request, "orgId", true); + if (module.equals("wizard") && (orgId != null)) { + + Organisation organisation = monitoringService.getOrganisation(orgId); + + int count = 0; + for (Lesson lesson : (Set) organisation.getLessons()) { + if (!Lesson.REMOVED_STATE.equals(lesson.getLessonStateId()) + && !Lesson.FINISHED_STATE.equals(lesson.getLessonStateId())) { + languageOutput += "" + + "" + lesson.getLessonName() + "" + + "" + lesson.getLessonId() + "" + + ""; } - - if(module.equals("wizard") && (orgName != null)) { - languageOutput += "" + orgName + ""; - } - - languageOutput += ""; - - response.setContentType("text/xml"); - response.setCharacterEncoding("UTF-8"); - response.getWriter().print(languageOutput); + } + +// // sort lessons +// TreeSet lessons = new TreeSet(new TimezoneComparator()); +// lessons.addAll(getTimezoneService().getDefaultTimezones()); + + // let Flex know the number of lessons + languageOutput += "" + count + ""; + + languageOutput += "" + organisation.getName() + ""; + } + + languageOutput += ""; + + response.setContentType("text/xml"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().print(languageOutput); return null; } Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/Attic/TestMonitoringService.java,v diff -u -r1.50 -r1.51 --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java 5 Dec 2011 16:03:31 -0000 1.50 +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java 14 Mar 2012 19:26:11 -0000 1.51 @@ -157,7 +157,7 @@ long previousLDId = getMaxId(lamsLearningDesignTableName, idName); Lesson testLesson = monitoringService.initializeLesson("Test_Lesson", "Test_Description", Boolean.TRUE, - TEST_LEARNING_DESIGN_ID, null, testUser.getUserId(), null, false, false, false, false, null); + TEST_LEARNING_DESIGN_ID, null, testUser.getUserId(), null, false, false, false, false, null, null); TestMonitoringService.TEST_LESSON_ID = testLesson.getLessonId(); Lesson createdLesson = lessonDao.getLesson(TestMonitoringService.TEST_LESSON_ID); assertNotNull(createdLesson); Index: lams_monitoring/web/CloudWizard.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/CloudWizard.swf,v diff -u -r1.15 -r1.16 Binary files differ