Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r091d9e1a6ef60ed0d736ca6b850c290f097968a4 -r7ac96e0fd0b72ec5d56bbcfa6716da9e151ce647 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 091d9e1a6ef60ed0d736ca6b850c290f097968a4) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 7ac96e0fd0b72ec5d56bbcfa6716da9e151ce647) @@ -23,6 +23,7 @@ import org.lamsfoundation.lams.common.util.* import org.lamsfoundation.lams.common.ui.* +import org.lamsfoundation.lams.common.* import org.lamsfoundation.lams.common.style.* import org.lamsfoundation.lams.monitoring.mv.* import org.lamsfoundation.lams.monitoring.mv.tabviews.*; @@ -39,7 +40,7 @@ import mx.containers.*; import mx.events.* import mx.utils.* -import mx.controls.TabBar; +import mx.controls.*; /** @@ -55,6 +56,9 @@ private var GRID_WIDTH:Number; private var H_GAP:Number; private var V_GAP:Number; + private var endGateOffset:Number = 60; + private var learner_X:Number = 22; + private var learner_Y:Number = 19; private var drawDesignCalled:String; private var _tm:ThemeManager; @@ -63,6 +67,12 @@ //Canvas clip //private var _monitor_mc:MovieClip; + private var lessonEnd_lbl:Label; + private var finishedLearnersList:Array; + private var bg_pnl:MovieClip; + private var doorClosed:MovieClip; + private var doorOpen:MovieClip; + private var bar_pnl:MovieClip; private var learnerMenuBar:MovieClip; private var monitorTabs_tb:MovieClip; private var _monitorTabViewContainer_mc:MovieClip; @@ -71,6 +81,7 @@ private var _transitionLayer_mc:MovieClip; private var _activityLayerComplex_mc:MovieClip; private var _activityLayer_mc:MovieClip; + private var endGate_mc:MovieClip; //private var _transitionPropertiesOK:Function; //Defined so compiler can 'see' events added at runtime by EventDispatcher @@ -125,6 +136,7 @@ case 'TABCHANGE' : trace("isChanged value in monitorModel is: "+mm.getIsProgressChanged()) if (infoObj.tabID == _tabID){ + setStyles(); this._visible = true; hideMainExp(mm); trace("TabID for Selected tab is (TABCHANGE): "+infoObj.tabID) @@ -152,7 +164,7 @@ case 'RELOADPROGRESS' : if (infoObj.tabID == _tabID){ trace("called Reload progress") - reloadProgress() + reloadProgress(true) } break; case 'DRAW_ACTIVITY' : @@ -186,8 +198,11 @@ case 'DRAW_DESIGN' : if (infoObj.tabID == _tabID){ + setStyles(); + setSize(mm); drawDesignCalled = "called"; trace("TabID for Selected tab is (MonitorTab): "+infoObj.tabID) + showEndGateData(mm); mm.drawDesign(infoObj.tabID); //mm.setIsProgressChanged(false); } @@ -216,13 +231,40 @@ //learnerMenuBar.refresh_btn.onRelease = Proxy.create (this, reloadProgress); trace("Loaded MonitorTabView Data"+ this) //setSize (mm) + var s:Object = mm.getSize(); + endGate_mc = _activityLayer_mc.createChildAtDepth("endGate",DepthManager.kTop, {_x:0, _y:s.h-endGateOffset}); + mm.endGate(endGate_mc); + mm.endGate = endGate_mc; + //_activityLayer_mc.endgate setStyles(); dispatchEvent({type:'load',target:this}); } + private function showEndGateData(mm:MonitorModel):Void{ + endGate_mc.doorClosed._visible = true + var mc = getController(); + var finishedLearners:Number = 0; + finishedLearnersList = new Array(); + var totalLearners:Number = mm.allLearnersProgress.length; + for (var i=0; i "+finishedLearners+" of "+ totalLearners; + //setSize(mm); + } + private function hideMainExp(mm:MonitorModel):Void{ //var mcontroller = getController(); mm.broadcastViewUpdate("EXPORTSHOWHIDE", true) @@ -235,19 +277,20 @@ * @return nothing */ private function reloadProgress(isChanged:Boolean){ - + var s:Object = mm.getSize(); 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(); - + endGate_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}); + endGate_mc = _activityLayer_mc.createChildAtDepth("endGate",DepthManager.kTop, {_x:0, _y:s.h-endGateOffset}); if (isChanged == false){ mm.setIsProgressChanged(false); @@ -298,7 +341,7 @@ * @return Boolean - successfullit */ private function drawActivity(a:Activity,mm:MonitorModel):Boolean{ - Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView'); + Debugger.log('The activity:'+a.title+','+a.activityID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView'); var s:Boolean = false; var mtv = MonitorTabView(this); @@ -330,7 +373,7 @@ mm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); } s = true; - //mm.getMonitor().getMV().getMonitorScp().redraw(true); + return s; } @@ -366,7 +409,13 @@ */ private function setStyles():Void{ var styleObj = _tm.getStyleObject('CanvasPanel'); - bkg_pnl.setStyle('styleName',styleObj); + bkg_pnl.setStyle('styleName',styleObj); + styleObj = _tm.getStyleObject('WZPanel'); + endGate_mc.bg_pnl.setStyle('styleName',styleObj); + styleObj = _tm.getStyleObject('BGPanel'); + endGate_mc.bar_pnl.setStyle('styleName',styleObj); + styleObj = _tm.getStyleObject('EndGatelabel'); + endGate_mc.lessonEnd_lbl.setStyle('styleName',styleObj); } /** @@ -376,10 +425,16 @@ var s:Object = mm.getSize(); 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; + bkg_pnl.setSize(s.w-17,s.h-17); + endGate_mc._y = s.h-endGateOffset; + endGate_mc.bg_pnl.setSize(s.w-17,endGate_mc.bg_pnl.height); + endGate_mc.bar_pnl.setSize(s.w-37,endGate_mc.bar_pnl.height); + for (var i=0; i