Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r3eeca454e32dc80209de753276a4df44d622821d -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 3eeca454e32dc80209de753276a4df44d622821d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5) @@ -340,13 +340,19 @@ var endX:Number = (this.activity.endXCoord != null) ? this.activity.endXCoord : hubEndDir_x; var endY:Number = (this.activity.endYCoord != null) ? this.activity.endYCoord : _endy; + var _module = null; + + if(model instanceof MonitorModel) { + _module = "monitoring"; + } + // start-point connector hub - cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: startX , _y: startY, branchConnector:true}) - : activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _monitorController:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true}); + cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: startX , _y: startY, branchConnector:true, _module:_module}) + : activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _monitorController:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true, _module:_module}); // end-point connector hub - cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: endX , _y: endY, branchConnector:true}) - : activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true}); - + cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: endX , _y: endY, branchConnector:true, _module:_module}) + : activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true, _module:_module}); + this.onEnterFrame = hitConnectorHubs; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r3eeca454e32dc80209de753276a4df44d622821d -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 3eeca454e32dc80209de753276a4df44d622821d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5) @@ -29,6 +29,7 @@ import org.lamsfoundation.lams.authoring.br.*; import org.lamsfoundation.lams.monitoring.mv.*; import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView; +import org.lamsfoundation.lams.monitoring.mv.tabviews.MonitorTabView; import org.lamsfoundation.lams.common.style.* import mx.controls.* @@ -337,7 +338,7 @@ icon_mc._y -= (!_sequenceChild) ? 6 : 0; } - private function drawLearners():Void { + public function drawLearners():Void { mm = MonitorModel(_monitorController.getModel()); var learner_X = _activity.xCoord + learnerOffset_X; @@ -382,10 +383,11 @@ } // get the length of learners from the Monitor Model and run a for loop. - for (var j=0; j 0 || ddm_activity.parentUIID > 0){ var parentAct; if((parentAct = _activeSeq.getLearningDesignModel().activities.get(ddm_activity.parentUIID)) != null) @@ -892,11 +893,11 @@ } private function callDesignEvents(tabID, eventArr):Void { - if(tabID != LearnerTabView._tabID) + if(tabID != LearnerTabView._tabID && tabID != MonitorTabView._tabID) for(var i=0; i