Index: lams_central/src/flash/lam_addseq_wiz.fla =================================================================== diff -u -r04aa578011325409e9a66b773b2d80229e50ebe3 -rdc9612e5319353c17810e15c1c97895439d16cde Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as =================================================================== diff -u -rb428d79c0cb4e33d2b931c9588c517466cf7da04 -rdc9612e5319353c17810e15c1c97895439d16cde --- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision b428d79c0cb4e33d2b931c9588c517466cf7da04) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision dc9612e5319353c17810e15c1c97895439d16cde) @@ -52,8 +52,11 @@ public var STRING_NULL:String = "string_null_value" public static var USERS_X:Number = 10; public static var USER_OFFSET:Number = 20; - public var SUMMERY_X:Number = 20; - public var SUMMERY_Y:Number = 20; + public static var SUMMERY_X:Number = 11; + public static var SUMMERY_Y:Number = 150; + public static var SUMMERY_W:Number = 500; + public static var SUMMERY_H:Number = 22; + public static var SUMMERY_OFFSET:Number = 2; // submission modes public static var FINISH_MODE:Number = 0; @@ -102,7 +105,8 @@ private var _summery_mc:MovieClip; private var _summeryList:Array; private var scheduleDate_dt:DateField; - + private var summery_lbl_arr:Array; + // conclusion UI elements private var confirmMsg_txt:TextField; @@ -656,30 +660,35 @@ private function finish(evt:Object){ trace('FINISH CLICKED'); - disableButtons(); - resultDTO.mode = FINISH_MODE; - _wizardController.initializeLesson(resultDTO); + var wm:WizardModel = WizardModel(getModel()); + if(validateStep(wm)){ + disableButtons(); + resultDTO.mode = FINISH_MODE; + _wizardController.initializeLesson(resultDTO); + } } private function start(evt:Object){ trace('START CLICKED'); - - if(schedule_cb.selected){ - resultDTO.scheduleDateTime = getScheduleDateTime(scheduleDate_dt.selectedDate, schedule_time.f_returnTime()); - - if(resultDTO.scheduleDateTime != null){ - trace(resultDTO.scheduleDateTime); - resultDTO.mode = START_SCH_MODE; + var wm:WizardModel = WizardModel(getModel()); + if(validateStep(wm)){ + if(schedule_cb.selected){ + resultDTO.scheduleDateTime = getScheduleDateTime(scheduleDate_dt.selectedDate, schedule_time.f_returnTime()); + + if(resultDTO.scheduleDateTime != null){ + trace(resultDTO.scheduleDateTime); + resultDTO.mode = START_SCH_MODE; + } else { + LFMessage.showMessageAlert(Dictionary.getValue('al_validation_schstart'), null, null); + return; + } } else { - LFMessage.showMessageAlert(Dictionary.getValue('al_validation_schstart'), null, null); - return; + resultDTO.mode = START_MODE; } - } else { - resultDTO.mode = START_MODE; + + disableButtons(); + _wizardController.initializeLesson(resultDTO); } - - disableButtons(); - _wizardController.initializeLesson(resultDTO); } private function cancel(evt:Object){ @@ -717,14 +726,11 @@ case 2: clearStep2(); break; - case 3: + case 3: + positionButtons(false); clearStep3(); break; case 4: - positionButtons(false); - clearStep4(); - break; - case 5: clearFinish(); break; default: @@ -738,14 +744,11 @@ case 2: showStep2(); break; - case 3: + case 3: + positionButtons(true); showStep3(); break; case 4: - positionButtons(true); - showStep4(); - break; - case 5: showFinish(); break; default: @@ -765,12 +768,9 @@ case 2: return validateStep2(wm); break; - case 3: + case 3: return validateStep3(wm); break; - case 4: - return validateStep4(wm); - break; default: return false; break; @@ -820,6 +820,7 @@ location_treeview.visible = false; } + private function validateStep1(wm:WizardModel):Boolean{ var snode = location_treeview.selectedNode; if (snode.attributes.data.resourceType==wm.RT_FOLDER){ @@ -845,6 +846,7 @@ } } + /** private function showStep2():Void{ trace('showing step 2'); @@ -866,6 +868,7 @@ } + private function clearStep2():Void{ // display Step 2 title_lbl.visible = false; @@ -874,6 +877,7 @@ resourceDesc_txa.visible = false; } + private function validateStep2(wm:WizardModel):Boolean{ var valid:Boolean = true; if(resourceTitle_txi.text == ""){ @@ -889,12 +893,15 @@ } return valid; } - - private function showStep3():Void{ - trace('showing step 3'); + */ + private function showStep2():Void{ + trace('showing step 2'); setTitle(Dictionary.getValue('wizardTitle_3_lbl')); setDescription(Dictionary.getValue('wizardDesc_3_lbl')); + // enable prev button after Step 1 + prev_btn.enabled = true; + if(!resultDTO.selectedLearners && !resultDTO.selectedStaff){ WizardModel(getModel()).getWizard().getOrganisations(_root.courseID, _root.classID); } @@ -907,15 +914,16 @@ learner_scp.visible = true; } - private function clearStep3():Void{ + private function clearStep2():Void{ org_treeview.visible = false; staff_lbl.visible = false; staff_scp.visible = false; learner_lbl.visible = false; learner_scp.visible = false; } - private function validateStep3(wm:WizardModel):Boolean{ + + private function validateStep2(wm:WizardModel):Boolean{ _global.breakpoint(); var valid:Boolean = true; @@ -988,60 +996,85 @@ return valid; } - - private function showStep4():Void{ + private function showStep3():Void{ - setTitle(Dictionary.getValue('wizardTitle_4_lbl')); setDescription(Dictionary.getValue('wizardDesc_4_lbl')); + title_lbl.visible = true; + resourceTitle_txi.visible = true; + desc_lbl.visible = true; + resourceDesc_txa.visible = true; + + // check for NULL value + if(resourceDesc_txa.text == STRING_NULL){ + resourceDesc_txa.text = ""; + } + writeSummery(); summery_lbl.visible = true; schedule_cb.visible = true; start_btn.visible = true; + if(schedule_cb.selected){ schedule_time.f_enableTimeSelect(true); scheduleDate_dt.enabled = true; } else { schedule_time.f_enableTimeSelect(false); scheduleDate_dt.enabled = false; } + schedule_time._visible = true; scheduleDate_dt.visible = true; next_btn.visible = false; finish_btn.visible = true; } private function writeSummery():Void{ - if(_summery_mc != null){ - _summery_mc.removeMovieClip(); + + if(summery_lbl_arr.length > 0) { + for(var i=0; i 0) { + for(var i=0; i