Index: lams_flash/src/central/flash/lams_monitoring_v1.fla =================================================================== diff -u -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 -r853036d1bfb199ee42a2e1d785590509d4b3b9de Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -r853036d1bfb199ee42a2e1d785590509d4b3b9de --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) @@ -164,6 +164,8 @@ } public function init(initObj):Void{ + Debugger.log("init called.", Debugger.CRITICAL, "init", "CanvasActivity"); + if(initObj){ _module = initObj._module; if (_module == "monitoring"){ @@ -174,10 +176,17 @@ _canvasView = initObj._canvasView; _canvasController = initObj._canvasController; } + _activity = initObj.activity; } _canvasModel = CanvasModel(_canvasController.getModel()); + mm = MonitorModel(_monitorController.getModel()); + + Debugger.log("mm: " + mm, Debugger.CRITICAL, "init", "CanvasActivity"); + Debugger.log("_activity: " + _activity.activityUIID, Debugger.CRITICAL, "init", "CanvasActivity"); + + showAssets(false); if (_activity.selectActivity == "false"){ @@ -366,6 +375,7 @@ drawLearners(); Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity'); + setStyles(); var theIcon_mc:MovieClip; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -r279eb9923e590404e9eec790ee85645ca46e184e -r853036d1bfb199ee42a2e1d785590509d4b3b9de --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 279eb9923e590404e9eec790ee85645ca46e184e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) @@ -43,14 +43,17 @@ private var CHILD_OFFSET_X:Number = 8; private var CHILD1_OFFSET_Y:Number = 45 //67.5; private var CHILD2_OFFSET_Y:Number = 108 //130.5; + private var newContainerXCoord:Number; private var newContainerYCoord:Number; //this is set by the init object private var _canvasController:CanvasController; private var _canvasView:CanvasView; + private var _monitorController:MonitorController; private var _monitorTabView:MonitorTabView; + private var _tm:ThemeManager; //Set by the init obj @@ -73,9 +76,12 @@ private var _ddm:DesignDataModel; private var _dcStartTime:Number = 0; private var _doubleClicking:Boolean; - private var child1_mc:MovieClip; - private var child2_mc:MovieClip; + + private var child1_mc:CanvasActivity; + private var child2_mc:CanvasActivity; + private var _locked:Boolean = false; + private var _visibleHeight:Number; private var _visibleWidth:Number; @@ -91,8 +97,10 @@ function CanvasParallelActivity(){ Debugger.log("_activity:"+_activity.title+'uiID:'+_activity.activityUIID+' children:'+_children.length,Debugger.GEN,'Constructor','CanvasParallelActivity'); _visible = false; + _tm = ThemeManager.getInstance(); _ddm = new DesignDataModel() + _visibleHeight = container_pnl._height; _visibleWidth = container_pnl._width; @@ -120,20 +128,30 @@ } //set the positioning co-ords - newContainerXCoord = container_pnl._width/2 - newContainerYCoord = container_pnl._height/2 + newContainerXCoord = container_pnl._width/2; + newContainerYCoord = container_pnl._height/2; child1.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); child1.yCoord = CHILD1_OFFSET_Y; child2.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); child2.yCoord = CHILD2_OFFSET_Y //+ newContainerYCoord; //so now it is placed on in the IDE and we just call init - if (fromModuleTab == "monitorMonitorTab"){ - child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); - child2_mc.init({activity:child2,_monitorController:_monitorController,_monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); - + Debugger.log("fromModuleTab: " + fromModuleTab, Debugger.CRITICAL, "init", "CanvasParallelActivity"); + + if(fromModuleTab == "monitorMonitorTab"){ + Debugger.log("initialising for monitor: " + child1.activityUIID + " " + child2.activityUIID, Debugger.CRITICAL, "init", "CanvasParallelActivity"); + + //child1_mc = childActivities_mc.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:child1 ,_monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + //child2_mc = childActivities_mc.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:child2 ,_monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + + child1_mc.init({activity:child1, _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + child2_mc.init({activity:child2, _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + + Debugger.log("child_mc(s) " + child1_mc + " " + child2_mc, Debugger.CRITICAL, "init", "CanvasParallelActivity"); + }else { + child1_mc.init({activity:child1,_canvasController:_canvasController,_canvasView:_canvasView}); child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasView:_canvasView}); @@ -208,6 +226,7 @@ private function drawLearners():Void { var mm:MonitorModel = MonitorModel(_monitorController.getModel()); + var learner_X = _activity.xCoord + learnerOffset_X; var learner_Y = _activity.yCoord + learnerOffset_Y; @@ -245,11 +264,12 @@ drawLearners() //position the container (this) - _x = _activity.xCoord //- newContainerXCoord; - _y = _activity.yCoord + _x = _activity.xCoord; //- newContainerXCoord; + _y = _activity.yCoord; - setLocking() - setStyles() + setLocking(); + setStyles(); + _visible = true; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as =================================================================== diff -u -rb0054257349ffef3a3cd82ecd30eb6e5b48ad953 -r853036d1bfb199ee42a2e1d785590509d4b3b9de --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision b0054257349ffef3a3cd82ecd30eb6e5b48ad953) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) @@ -196,17 +196,17 @@ childActivity.activity.yCoord = CHILD_OFFSET_Y; childActivity._visible = true; - if(childActivity.activity.activityUIID == _canvasModel.selectedItem.activity.activityUIID) + if(childActivity.activity.activityUIID == getModel().selectedItem.activity.activityUIID) childActivity.setSelected(true); children_mc.push(childActivity); a.orderID = _children.length; Debugger.log("children length: " + _children.length, Debugger.CRITICAL, "drawChildActivity", "CanvasSequenceActivity"); - var transitionObj:Object = _canvasModel.getCanvas().ddm.getTransitionsForActivityUIID(childActivity.activity.activityUIID) + var transitionObj:Object = getDDM().getTransitionsForActivityUIID(childActivity.activity.activityUIID) if(transitionObj.hasTrans && transitionObj.out != null) { - _children.push(_canvasModel.getCanvas().ddm.getActivityByUIID(transitionObj.out.toUIID)) + _children.push(getDDM().getActivityByUIID(transitionObj.out.toUIID)) drawChildActivity(_children[_children.length-1]); } } @@ -331,12 +331,7 @@ } private function localOnPress():Void{ - - if (_module == "monitoring"){ - } else { - _canvasModel.selectedItem = this; - } - + getModel().selectedItem = this; } private function localOnRelease():Void{ @@ -421,6 +416,13 @@ } } + private function getModel() { + if(_module == "monitoring") + return mm; + else + return _canvasModel; + } + public function get children():Array { return children_mc; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -r853036d1bfb199ee42a2e1d785590509d4b3b9de --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) @@ -271,9 +271,10 @@ var cvc = getController(); var setupBranchView:Boolean = (cm.lastBranchActionType == CanvasModel.OPEN_FROM_FILE) ? true : false; - Debugger.log('setupBranchView:' + setupBranchView, Debugger.CRITICAL, 'drawActivity','CanvasView'); + Debugger.log('setupBranchView:' + setupBranchView, Debugger.CRITICAL, 'drawActivity','CanvasView'); Debugger.log('I am in drawActivity and Activity typeID :'+a.activityTypeID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView'); + //take action depending on act type if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()){ var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv}); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 -r853036d1bfb199ee42a2e1d785590509d4b3b9de --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) @@ -39,7 +39,8 @@ import mx.behaviors.* import mx.core.* import mx.events.* -import mx.effects.* +import mx.effects.* +import mx.managers.DepthManager; import org.lamsfoundation.lams.authoring.cv.CanvasModel; @@ -75,7 +76,34 @@ Debugger.log('activityClick CanvasActivity:'+act.Learner.getUserName(),Debugger.GEN,'activityClick','MonitorController'); }else { + var _tempSelectedItem = _monitorModel.selectedItem; + + var parentAct = _monitorModel.getMonitor().ddm.getActivityByUIID(act.activity.parentUIID); + var parentSelectedAct = _monitorModel.getMonitor().ddm.getActivityByUIID(_monitorModel.selectedItem.activity.parentUIID); + + if(_tempSelectedItem != null) { + + // clear currently selected activity + if(_monitorModel.getMonitor().ddm.getActivityByUIID(parentSelectedAct.parentUIID).activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE) { + _tempSelectedItem._parent._parent.swapDepths(_tempSelectedItem._parent._parent.depthHistory); + _tempSelectedItem._parent._parent.depthHistory = null; + + _tempSelectedItem.swapDepths(_tempSelectedItem.depthHistory); + _tempSelectedItem.depthHistory = null; + } + + } + + if(_monitorModel.getMonitor().ddm.getActivityByUIID(parentAct.parentUIID).activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE) { + act._parent._parent.depthHistory = act._parent._parent.getDepth(); + act._parent._parent.swapDepths(DepthManager.kTop); + + act.depthHistory = act.getDepth(); + act.swapDepths(DepthManager.kTop); + } + _monitorModel.selectedItem = act; + } } @@ -264,8 +292,9 @@ private function reloadProgress(ref, URLToSend){ var callback:Function = Proxy.create(ref, getProgressData); Application.getInstance().getComms().getRequest(URLToSend,callback, false); + //_monitorModel.updateIndexButtons(); + } - private function activitySnapBack(act:Object){ act._x = act.xCoord; act._y = act.yCoord; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -rf8e0c0e67f67bdcdf8ae8367b638c3775f7652de -r853036d1bfb199ee42a2e1d785590509d4b3b9de --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision f8e0c0e67f67bdcdf8ae8367b638c3775f7652de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) @@ -244,7 +244,6 @@ transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth()); //branchLayer = this.createEmptyMovieClip("_branchLayer_mc", this.getNextHighestDepth()); - activityComplexLayer = this.createEmptyMovieClip("_activityComplexLayer_mc", this.getNextHighestDepth()); activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height}); // creates learner icon on initial draw @@ -355,10 +354,10 @@ newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring"}); } else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){ var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID); - newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kBottom,{_activity:a,_children:children, _monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc}); - } else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){ + newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc}); + } else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){ var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID); - newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv, fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc}); + newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kBottom, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc}); } else if(a.isBranchingActivity()){ var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false}); } else {