Index: lams_central/src/flash/lam_addseq_wiz.fla =================================================================== diff -u -r2867b4270cfe6fa2a0b50dc5a6bf7d345c356d2d -r9cfaa991977db386839a93b6b92bdbc91481db20 Binary files differ Index: lams_central/src/flash/lam_addseq_wiz.swf =================================================================== diff -u -r2867b4270cfe6fa2a0b50dc5a6bf7d345c356d2d -r9cfaa991977db386839a93b6b92bdbc91481db20 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as =================================================================== diff -u -r3903ac02aa19b9fd238cda6002225730fadd6641 -r9cfaa991977db386839a93b6b92bdbc91481db20 --- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision 3903ac02aa19b9fd238cda6002225730fadd6641) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision 9cfaa991977db386839a93b6b92bdbc91481db20) @@ -87,12 +87,6 @@ private var learner_lbl:Label; // step 4 UI elements - private var staff_grp_lbl:Label; - private var learner_grp_lbl:Label; - private var staff_grp_txi:TextInput; - private var learner_grp_txi:TextInput; - - // step 5 UI elements private var schedule_cb:CheckBox; private var start_btn:Button; private var schedule_time:MovieClip; @@ -513,9 +507,6 @@ clearStep4(); break; case 5: - clearStep5(); - break; - case 6: clearFinish(); break; default: @@ -539,9 +530,6 @@ showStep4(); break; case 5: - showStep5(); - break; - case 6: showFinish(); break; default: @@ -567,9 +555,6 @@ case 4: return validateStep4(wm); break; - case 4: - return validateStep5(wm); - break; default: return false; break; @@ -610,12 +595,6 @@ learner_scp.visible = false; // hide step 4 (Startup) - staff_grp_lbl.visible = false; - learner_grp_lbl.visible = false; - staff_grp_txi.visible = false; - learner_grp_txi.visible = false; - - // hide step 5 (Startup) start_btn.visible = false; summery_scp.visible = false; summery_lbl.visible = false; @@ -771,8 +750,10 @@ resultDTO.selectedStaff = selectedStaff; resultDTO.selectedLearners = selectedLearners; + var orgName:String = snode.attributes.data.name; + resultDTO.staffGroupName = orgName + 'staff'; + resultDTO.learnersGroupName = orgName + 'learners'; - trace('selected org ID is: ' + selectedOrgID); } @@ -782,50 +763,7 @@ private function showStep4():Void{ - trace('showing step 4'); - staff_grp_lbl.visible = true; - learner_grp_lbl.visible = true; - staff_grp_txi.visible = true; - learner_grp_txi.visible = true; - - // set default values - var orgName:String = org_treeview.selectedNode.attributes.data.name; - staff_grp_txi.text = orgName + ' staff'; - learner_grp_txi.text = orgName + ' learners'; - - } - - private function clearStep4():Void{ - staff_grp_lbl.visible = false; - learner_grp_lbl.visible = false; - staff_grp_txi.visible = false; - learner_grp_txi.visible = false; - } - - private function validateStep4(wm:WizardModel):Boolean{ - var valid:Boolean = true; - - if(staff_grp_txi.text == ""){ - trace('missing staff group name') - valid = false; - } - - if(learner_grp_txi.text == ""){ - trace('missing learners group name'); - valid = false; - } - - if(valid){ - resultDTO.staffGroupName = staff_grp_txi.text; - resultDTO.learnersGroupName = learner_grp_txi.text; - } - - return valid; - } - - private function showStep5():Void{ - writeSummery(); summery_lbl.visible = true; @@ -855,15 +793,13 @@ _summery_mc.desc_txt.text = resultDTO.resourceDescription; _summery_mc.coursename_txt.text = resultDTO.courseName; _summery_mc.classname_txt.text = resultDTO.className; - _summery_mc.staffgroup_txt.text = resultDTO.staffGroupName; - _summery_mc.learnergroup_txt.text = resultDTO.learnersGroupName; _summery_mc.staff_txt.text = String(resultDTO.selectedStaff.length) + '/' + staffList.length; _summery_mc.learners_txt.text = String(resultDTO.selectedLearners.length) + '/' + learnerList.length; } - private function clearStep5():Void{ + private function clearStep4():Void{ summery_lbl.visible = false; summery_scp.visible = false; schedule_cb.visible = false; @@ -874,7 +810,7 @@ finish_btn.enabled = false; } - private function validateStep5(wm:WizardModel):Boolean{ + private function validateStep4(wm:WizardModel):Boolean{ return true; }