Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -r9394d1df3d8cf8e655967369854b7a8af0625b45 -red0509b2b5a9f74c037110767e896fc793ff0b47 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 9394d1df3d8cf8e655967369854b7a8af0625b45) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision ed0509b2b5a9f74c037110767e896fc793ff0b47) @@ -74,7 +74,8 @@ private var _learnerTabViewContainer_mc:MovieClip private var bkg_pnl:MovieClip; - private var _helpLayer_mc:MovieClip; + private var learnerMenuBar:MovieClip; + //private var _helpLayer_mc:MovieClip; private var _gridLayer_mc:MovieClip; private var _learnersLayer_mc:MovieClip; private var _activityLayerComplex_mc:MovieClip; @@ -145,6 +146,9 @@ trace("all learner progress length is: "+mm.allLearnersProgress.length) if (learnersDrawn != mm.allLearnersProgress.length){ drawAllLearnersDesign(mm, infoObj.tabID) + } + if(mm.getIsProgressChanged()){ + reloadProgress(false); } }else { this._visible = false; @@ -192,7 +196,7 @@ //set up the Movie Clips to load relevant //_helpLayer_mc = this.attachMovie("RefreshBar", "RefreshBar", _helpLayer_mc.getNextHighestDepth()) - var learnerMenuBar = this.attachMovie("RefreshBar", "RefreshBar", _helpLayer_mc.getNextHighestDepth()) + learnerMenuBar = this.attachMovie("RefreshBar", "RefreshBar", this.getNextHighestDepth()) learnerMenuBar = eval(learnerMenuBar) //_helpLayer_mc.createEmptyMovieClip("_helpLayer_mc", this.getNextHighestDepth()); @@ -201,7 +205,7 @@ _gridLayer_mc = this.createEmptyMovieClip("_gridLayer_mc", this.getNextHighestDepth()); _activityLayerComplex_mc = this.createEmptyMovieClip("_activityLayerComplex_mc", this.getNextHighestDepth()); - _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:_helpLayer_mc._height}); + _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height}); learnerMenuBar.refresh_btn.onRelease = Proxy.create (this, reloadProgress); trace("Help layer path: "+ learnerMenuBar.refresh_btn.label) @@ -242,8 +246,13 @@ return array; } - - private function reloadProgress(){ + /** + * Reloads the learner Progress and + * @Param isChanged Boolean Value to pass it to setIsProgressChanged in monitor model so that it sets it to true if refresh button is clicked and sets it to fasle as soon as latest data is loaded and design is redrawn. + * @usage + * @return nothing + */ + private function reloadProgress(isChanged:Boolean){ //if (learnersDrawn != mm.allLearnersProgress.length){ trace("reloading Progress data for Learners") @@ -252,10 +261,16 @@ ACT_Y = 35; //for(var i=0; i<_activityLayer_mc.children.length;i++){ _activityLayer_mc.removeMovieClip(); - _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:_helpLayer_mc._height}); + _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height}); //} - + if (isChanged == false){ + mm.setIsProgressChanged(false); + + }else { + mm.setIsProgressChanged(true); + } mm.getMonitor().getProgressData(mm.getSequence()); + //} } @@ -388,7 +403,7 @@ trace("Monitor Tab Grid Width: "+s.w+" Monitor Tab Grid Height: "+s.h); //monitor_scp.setSize(s.w,s.h); bkg_pnl.setSize(s.w,s.h); - + learnerMenuBar.help_btn._x = s.w - 80 //Create the grid. The grid is re-drawn each time the canvas is resized. //var grid_mc = Grid.drawGrid(_gridLayer_mc,Math.round(s.w-10),Math.round(s.h-10),V_GAP,H_GAP); Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r3737ddf65cda8de67f24acc36fd91570b0d02804 -red0509b2b5a9f74c037110767e896fc793ff0b47 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 3737ddf65cda8de67f24acc36fd91570b0d02804) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision ed0509b2b5a9f74c037110767e896fc793ff0b47) @@ -63,6 +63,7 @@ //Canvas clip //private var _monitor_mc:MovieClip; + private var learnerMenuBar:MovieClip; private var monitorTabs_tb:MovieClip; private var _monitorTabViewContainer_mc:MovieClip private var bkg_pnl:MovieClip; @@ -122,6 +123,7 @@ setSize(mm); break; case 'TABCHANGE' : + trace("isChanged value in monitorModel is: "+mm.getIsProgressChanged()) if (infoObj.tabID == _tabID){ this._visible = true; trace("TabID for Selected tab is (TABCHANGE): "+infoObj.tabID) @@ -130,6 +132,9 @@ }else if (drawDesignCalled == undefined){ drawDesignCalled = "called"; mm.drawDesign(infoObj.tabID); + }else if(mm.getIsProgressChanged()){ + trace("I am calling reloadProgress now") + reloadProgress(false); } }else { this._visible = false; @@ -174,6 +179,7 @@ drawDesignCalled = "called"; trace("TabID for Selected tab is (MonitorTab): "+infoObj.tabID) mm.drawDesign(infoObj.tabID); + //mm.setIsProgressChanged(false); } break; default : @@ -192,16 +198,48 @@ //set up the //_canvas_mc = this; _gridLayer_mc = this.createEmptyMovieClip("_gridLayer_mc", this.getNextHighestDepth()); + learnerMenuBar = this.attachMovie("RefreshBar", "RefreshBar", this.getNextHighestDepth()) + learnerMenuBar = eval(learnerMenuBar) _transitionLayer_mc = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth()); _activityLayerComplex_mc = this.createEmptyMovieClip("_activityLayerComplex_mc", this.getNextHighestDepth()); - _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth()); - + _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height}); + learnerMenuBar.refresh_btn.onRelease = Proxy.create (this, reloadProgress); trace("Loaded MonitorTabView Data"+ this) //setSize (mm) dispatchEvent({type:'load',target:this}); } /** + * Reloads the learner Progress and + * @Param isChanged Boolean Value to pass it to setIsProgressChanged in monitor model so that it sets it to true if refresh button is clicked and sets it to fasle as soon as latest data is loaded and design is redrawn. + * @usage + * @return nothing + */ + private function reloadProgress(isChanged:Boolean){ + + trace("reloading Progress data for Learners") + drawDesignCalled = undefined + + //Remove all the movies drawn on the transition and activity movieclip holder + + _transitionLayer_mc.removeMovieClip(); + _activityLayer_mc.removeMovieClip(); + + //Recreate both Transition holder and Activity holder Movieclips + _transitionLayer_mc = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth()); + _activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height}); + + + if (isChanged == false){ + mm.setIsProgressChanged(false); + + }else { + mm.setIsProgressChanged(true); + } + mm.getMonitor().getProgressData(mm.getSequence()); + } + + /** * Remove the activityies from screen on selection of new lesson * * @usage @@ -306,6 +344,7 @@ trace("Monitor Tab Grid Width: "+s.w+" Monitor Tab Grid Height: "+s.h); //monitor_scp.setSize(s.w,s.h); bkg_pnl.setSize(s.w,s.h); + learnerMenuBar.help_btn._x = s.w - 80; //Create the grid. The grid is re-drawn each time the canvas is resized. var grid_mc = Grid.drawGrid(_gridLayer_mc,Math.round(s.w-10),Math.round(s.h-10),V_GAP,H_GAP);