Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as =================================================================== diff -u -rc1774bfa6a2989cf32fc39f5f0fe7f3e8bfc9787 -rd96ee06a7c055eb3bf6b83b076e15f94a7961f6e --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision c1774bfa6a2989cf32fc39f5f0fe7f3e8bfc9787) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision d96ee06a7c055eb3bf6b83b076e15f94a7961f6e) @@ -164,7 +164,11 @@ trace("TabID for Selected tab is (LessonTab TABCHANGE): "+infoObj.tabID) this._visible = true; //mm.setDirty(); - MovieClipUtils.doLater(Proxy.create(this,draw)); + //MovieClipUtils.doLater(Proxy.create(this,draw)); + if(mm.getIsProgressChanged()){ + trace("I am calling reloadProgress now") + reloadProgress(false); + } }else { this._visible = false; } @@ -173,15 +177,16 @@ if (infoObj.tabID == _tabID){ trace("TabID for Selected tab is (LessonTab): "+infoObj.tabID) this._visible = true; - MovieClipUtils.doLater(Proxy.create(this,draw)); + MovieClipUtils.doLater(Proxy.create(this,draw)); + }else { this._visible = false; } break; case 'RELOADPROGRESS' : if (infoObj.tabID == _tabID){ trace("called Reload progress") - mm.getMonitor().reloadLessonToMonitor(); + reloadProgress(); } break; case 'LM_DIALOG' : @@ -197,6 +202,14 @@ break; case 'STAFF_LOADED' : _dialog.checkStaff(mm.organisation); + break; + case 'DRAW_DESIGN' : + if (infoObj.tabID == _tabID){ + //drawDesignCalled = "called"; + trace("TabID for Selected tab is (LessonTab): "+infoObj.tabID) + populateLessonDetails(); + //mm.setIsProgressChanged(false); + } break; default : Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.LessonTabView'); @@ -216,6 +229,29 @@ this.addEventListener("apply", Delegate.create(_monitorController, _monitorController.changeStatus)); } + + /** + * 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") + //mm.getMonitor().reloadLessonToMonitor(); + + + + + if (isChanged == false){ + mm.setIsProgressChanged(false); + + }else { + mm.setIsProgressChanged(true); + } + mm.getMonitor().getProgressData(mm.getSequence()); + } /** * layout visual elements on the canvas on initialisation @@ -270,6 +306,8 @@ LSDescription_txt.text = s.description; sessionStatus_txt.text = showStatus(s.state); numLearners_txt.text = String(s.noStartedLearners) + " " + Dictionary.getValue('ls_of_text')+" "+String(s.noPossibleLearners); + trace("current logged in learners are: "+mm.allLearnersProgress.length) + //numLearners_txt.text = mm.allLearnersProgress.length + " " + Dictionary.getValue('ls_of_text')+" "+String(s.noPossibleLearners); class_txt.text = s.organisationName; } @@ -638,7 +676,7 @@ private function setSize(mm:MonitorModel):Void{ var s:Object = mm.getSize(); trace("Monitor Tab Widtht: "+s.w+" Monitor Tab Height: "+s.h); - bkg_pnl.setSize(s.w,s.h); + bkg_pnl.setSize(s.w-20,s.h); lessonManager.setSize(s.w-20,lessonManager._height); taskManager.setSize(s.w-20,lessonManager._height); //qTasks_scp.setSize(s.w._width,reqTasks_scp._height);