Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as =================================================================== diff -u -r288a24d430e10138d07e89241364fc014a1f9352 -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as (.../NavigationEvent.as) (revision 288a24d430e10138d07e89241364fc014a1f9352) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/NavigationEvent.as (.../NavigationEvent.as) (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -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 =================================================================== diff -u -r288a24d430e10138d07e89241364fc014a1f9352 -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/ModelMap.mxml (.../ModelMap.mxml) (revision 288a24d430e10138d07e89241364fc014a1f9352) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/ModelMap.mxml (.../ModelMap.mxml) (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -31,5 +31,9 @@ - + + + + + Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml =================================================================== diff -u -r1b6827c217b5614b1b625b5d70c5c82733e813bd -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml (.../Advanced.mxml) (revision 1b6827c217b5614b1b625b5d70c5c82733e813bd) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml (.../Advanced.mxml) (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -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 =================================================================== diff -u --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml (revision 0) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -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 =================================================================== diff -u -r1b6827c217b5614b1b625b5d70c5c82733e813bd -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml (.../Lesson.mxml) (revision 1b6827c217b5614b1b625b5d70c5c82733e813bd) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml (.../Lesson.mxml) (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -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 =================================================================== diff -u -r288a24d430e10138d07e89241364fc014a1f9352 -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml (.../Wizard.mxml) (revision 288a24d430e10138d07e89241364fc014a1f9352) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml (.../Wizard.mxml) (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -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 =================================================================== diff -u -rb6597b39c4538183110557d7867dff0ab215930e -r91eb5e78fc8721e338f460cf8ad1f22fe3eee48d --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as (.../Lesson.as) (revision b6597b39c4538183110557d7867dff0ab215930e) +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as (.../Lesson.as) (revision 91eb5e78fc8721e338f460cf8ad1f22fe3eee48d) @@ -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;