Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as =================================================================== diff -u -rccd1c0a44577b850bc54a131f7a86f36e24ddaba -rff92b59b2014cb0c8468aae77844b70cae595570 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision ccd1c0a44577b850bc54a131f7a86f36e24ddaba) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision ff92b59b2014cb0c8468aae77844b70cae595570) @@ -58,11 +58,17 @@ private var _monitorView_mc:MovieClip; //Canvas clip - private var _monitor_mc:MovieClip; - private var monitor_scp:MovieClip; + + private var _monitorLesson_mc:MovieClip; + private var monitorLesson_scp:MovieClip; + private var _monitorSequence_mc:MovieClip; + private var monitorSequence_scp:MovieClip; + private var _monitorLearner_mc:MovieClip + private var monitorLearner_scp:MovieClip; private var monitorTabs_tb:MovieClip; private var learnerMenuBar:MovieClip; private var bkg_pnl:MovieClip; + private var bkgHeader_pnl:MovieClip; private var _gridLayer_mc:MovieClip; private var _lessonTabLayer_mc:MovieClip; @@ -93,6 +99,8 @@ private var learnerTabView:LearnerTabView; private var learnerTabView_mc:MovieClip; + + private var _monitorController:MonitorController; //Defined so compiler can 'see' events added at runtime by EventDispatcher @@ -186,17 +194,21 @@ var mcontroller = getController(); //get the content path for Tabs - _monitor_mc = monitor_scp.content; + _monitorLesson_mc = monitorLesson_scp.content; + _monitorSequence_mc = monitorSequence_scp.content; + _monitorLearner_mc = monitorLearner_scp.content; - _lessonTabLayer_mc = _monitor_mc.createEmptyMovieClip("_lessonTabLayer_mc", _monitor_mc.getNextHighestDepth()); + _lessonTabLayer_mc = _monitorLesson_mc.createEmptyMovieClip("_lessonTabLayer_mc", _monitorLesson_mc.getNextHighestDepth()); - _monitorTabLayer_mc = _monitor_mc.createEmptyMovieClip("_monitorTabLayer_mc", _monitor_mc.getNextHighestDepth()); + _monitorTabLayer_mc = _monitorSequence_mc.createEmptyMovieClip("_monitorTabLayer_mc", _monitorSequence_mc.getNextHighestDepth()); - _todoTabLayer_mc = _monitor_mc.createEmptyMovieClip("_todoTabLayer_mc", _monitor_mc.getNextHighestDepth()); - _learnerTabLayer_mc = _monitor_mc.createEmptyMovieClip("_learnerTabLayer_mc", _monitor_mc.getNextHighestDepth()); + _learnerTabLayer_mc = _monitorLearner_mc.createEmptyMovieClip("_learnerTabLayer_mc", _monitorLearner_mc.getNextHighestDepth()); + //_todoTabLayer_mc = _monitor_mc.createEmptyMovieClip("_todoTabLayer_mc", _monitor_mc.getNextHighestDepth()); + + var tab_arr:Array = [{label:Dictionary.getValue('mtab_lesson'), data:"lesson"}, {label:Dictionary.getValue('mtab_seq'), data:"monitor"}, {label:Dictionary.getValue('mtab_learners'), data:"learners"}]; monitorTabs_tb.dataProvider = tab_arr; @@ -226,26 +238,22 @@ private function setupTabInit(){ - - var mm:Observable = getModel(); + // Inititialsation for Lesson Tab View lessonTabView_mc = _lessonTabLayer_mc.attachMovie("LessonTabView", "lessonTabView_mc",DepthManager.kTop) - lessonTabView_mc._visible = false; lessonTabView = LessonTabView(lessonTabView_mc); lessonTabView.init(mm, undefined); lessonTabView.addEventListener('load',Proxy.create(this,tabLoaded)); - + // Inititialsation for Monitor Tab View monitorTabView_mc = _monitorTabLayer_mc.attachMovie("MonitorTabView", "monitorTabView_mc",DepthManager.kTop) - monitorTabView_mc._visible = false; monitorTabView = MonitorTabView(monitorTabView_mc); monitorTabView.init(mm, undefined); monitorTabView.addEventListener('load',Proxy.create(this,tabLoaded)); // Inititialsation for Learner Tab View learnerTabView_mc = _learnerTabLayer_mc.attachMovie("LearnerTabView", "learnerTabView_mc",DepthManager.kTop) - learnerTabView_mc._visible = false; learnerTabView = LearnerTabView(learnerTabView_mc); learnerTabView.init(mm, undefined); learnerTabView.addEventListener('load',Proxy.create(this,tabLoaded)); @@ -272,9 +280,9 @@ var btnLabel = btnObj.label; var xpos:Number; if (btnLabel == "Help"){ - xpos = btnObj._x - 105 + xpos = bkgHeader_pnl.width - 165 //btnObj._x - 105 }else if (btnLabel == "Refresh"){ - xpos = btnObj._x - 40 + xpos = bkgHeader_pnl.width - 165 //btnObj._x - 40 }else{ xpos = btnObj._x } @@ -297,8 +305,12 @@ private function setStyles():Void{ var styleObj = _tm.getStyleObject('BGPanel'); bkg_pnl.setStyle('styleName',styleObj); + styleObj = _tm.getStyleObject('MHPanel'); + bkgHeader_pnl.setStyle('styleName',styleObj); styleObj = _tm.getStyleObject('scrollpane'); - monitor_scp.setStyle('styleName',styleObj); + monitorLesson_scp.setStyle('styleName',styleObj); + monitorSequence_scp.setStyle('styleName',styleObj); + monitorLearner_scp.setStyle('styleName',styleObj); styleObj = _tm.getStyleObject('button'); monitorTabs_tb.setStyle('styleName', styleObj); refresh_btn.setStyle('styleName',styleObj); @@ -320,9 +332,12 @@ var s:Object = mm.getSize(); trace("Monitor Tab Widtht: "+s.w+" Monitor Tab Height: "+s.h); bkg_pnl.setSize(s.w,s.h); + bkgHeader_pnl.setSize(s.w, bkgHeader_pnl._height) trace("Monitor View Stage Width "+s.w+" and Monitor View Stage height "+s.h) trace("Monitor View bg panel Width "+bkg_pnl.width+" and Monitor View bg panel height "+bkg_pnl.height) - monitor_scp.setSize(s.w-monitor_scp._x,s.h-monitor_scp._y); + monitorLesson_scp.setSize(s.w-monitorLesson_scp._x,s.h-monitorLesson_scp._y); + monitorSequence_scp.setSize(s.w-monitorSequence_scp._x,s.h-monitorSequence_scp._y); + monitorLearner_scp.setSize(s.w-monitorLearner_scp._x,s.h-monitorLearner_scp._y); exportPortfolio_btn._x = s.w - 260; refresh_btn._x = s.w - 160 help_btn._x = s.w - 80 @@ -358,10 +373,18 @@ return monitorTabs_tb; } - public function getMonitorScp():MovieClip{ + public function getMonitorLessonScp():MovieClip{ trace("Called getMonitorScp") - return monitor_scp; + return monitorLesson_scp; } + public function getMonitorSequenceScp():MovieClip{ + trace("Called getMonitorScp") + return monitorSequence_scp; + } + public function getMonitorLearnerScp():MovieClip{ + trace("Called getMonitorScp") + return monitorLearner_scp; + } /* * Returns the default controller for this view.