Index: lams_central/src/flash/lam_addseq_wiz.fla =================================================================== diff -u -r0cbc21b16173cc5c6470daf122f381696460e124 -r953ffc25c8ca37617d0d45958246c25b7490e779 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as =================================================================== diff -u -rc4c22d3e18a9e5cc345035262503f758d9bada60 -r953ffc25c8ca37617d0d45958246c25b7490e779 --- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision c4c22d3e18a9e5cc345035262503f758d9bada60) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision 953ffc25c8ca37617d0d45958246c25b7490e779) @@ -95,6 +95,8 @@ private var staff_lbl:Label; private var learner_scp:MovieClip; // learners container private var learner_lbl:Label; + private var staff_selAll_cb:CheckBox; + private var learner_selAll_cb:CheckBox; // step 4 UI elements private var schedule_cb:CheckBox; @@ -147,7 +149,7 @@ private var _workspaceModel:WorkspaceModel; private var _workspaceView:WorkspaceView; private var _workspaceController:WorkspaceController; - + //Defined so compiler can 'see' events added at runtime by EventDispatcher private var dispatchEvent:Function; public var addEventListener:Function; @@ -198,17 +200,24 @@ public function update (o:Observable,infoObj:Object):Void{ var wm:WizardModel = WizardModel(o); + _wizardController = getController(); switch (infoObj.updateType){ case 'STEP_CHANGED' : updateScreen(infoObj.data.lastStep, infoObj.data.currentStep); break; case 'USERS_LOADED' : - loadLearners(wm.organisation.getLearners()); - loadStaff(wm.organisation.getMonitors()); + loadLearners(wm.organisation.getLearners(), true); + loadStaff(wm.organisation.getMonitors(), true); _wizardController.clearBusy(); break; + case 'STAFF_RELOAD' : + loadStaff(wm.organisation.getMonitors(), true); + break; + case 'LEARNER_RELOAD' : + loadLearners(wm.organisation.getLearners(), true); + break; case 'SAVED_LC' : conclusionStep(infoObj.data, wm); break; @@ -236,7 +245,7 @@ trace('receiving view update event...'); var wm:WorkspaceModel = event.target; //set a permenent ref to the model for ease (sorry mvc guru) - _workspaceModel = wm; + switch (event.updateType){ case 'REFRESH_TREE' : @@ -297,7 +306,9 @@ start_btn.addEventListener('click', Delegate.create(this, start)); schedule_btn.addEventListener('click', Delegate.create(this, scheduleNow)); schedule_cb.addEventListener("click", Delegate.create(this, scheduleChange)); - + staff_selAll_cb.addEventListener("click", Delegate.create(this, toogleStaffSelection)); + learner_selAll_cb.addEventListener("click", Delegate.create(this, toogleLearnerSelection)); + //Set up the treeview setUpTreeview(); //itemSelected(location_treeview.selectedNode, WorkspaceModel(workspaceView.getModel())); @@ -331,6 +342,10 @@ date_lbl.text = Dictionary.getValue('date_lbl'); time_lbl.text = Dictionary.getValue('time_lbl'); + // checkboxes + staff_selAll_cb.label = Dictionary.getValue('wizard_selAll_cb_lbl'); + learner_selAll_cb.label = Dictionary.getValue('wizard_selAll_cb_lbl'); + resizeButtons([cancel_btn, prev_btn, next_btn, close_btn, finish_btn, start_btn, schedule_btn]); positionButtons(); } @@ -839,6 +854,8 @@ staff_scp.visible = false; learner_lbl.visible = false; learner_scp.visible = false; + staff_selAll_cb.visible = false; + learner_selAll_cb.visible = false; // hide step 4 (Startup) date_lbl.visible = false; @@ -951,6 +968,10 @@ staff_scp.visible = true; learner_lbl.visible = true; learner_scp.visible = true; + + staff_selAll_cb.visible = true; + learner_selAll_cb.visible = true; + } private function clearStep2():Void{ @@ -960,6 +981,8 @@ staff_scp.visible = false; learner_lbl.visible = false; learner_scp.visible = false; + staff_selAll_cb.visible = false; + learner_selAll_cb.visible = false; } private function validateStep2(wm:WizardModel):Boolean{ @@ -1270,11 +1293,10 @@ * @param users Users to load */ - public function loadLearners(users:Array):Void{ + public function loadLearners(users:Array, _selected:Boolean):Void{ trace('loading Learners...'); _learnerList = WizardView.clearScp(_learnerList); _learner_mc = learner_scp.content; - var _selected:Boolean = true; trace('list length: ' + users.length); for(var i=0; i