Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r630afd3318d7c0a12ea203eacfbf4406b26ec128 -rd40fc72f59374b30a27da8dc29203d2b411fb8f0 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 630afd3318d7c0a12ea203eacfbf4406b26ec128) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision d40fc72f59374b30a27da8dc29203d2b411fb8f0) @@ -316,13 +316,16 @@ var now:Number = new Date().getTime(); if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){ - //Debugger.log('DoubleClicking: '+_canvasModel.activeTool,Debugger.GEN,'onPress','CanvasActivity'); + trace("Module passed is: "+_module) if (app.controlKeyPressed != "transition"){ _doubleClicking = true; if (_module == "monitoring"){ - _monitorController.activityDoubleClick(this); + Debugger.log('DoubleClicking: '+this.activity.activityID,Debugger.GEN,'onPress','CanvasActivity For Monitoring'); + _monitorController.activityDoubleClick(this, "MonitorTabView"); + }else { + Debugger.log('DoubleClicking: '+this,Debugger.GEN,'onPress','CanvasActivity'); + _canvasController.activityDoubleClick(this); } - _canvasController.activityDoubleClick(this); } /* if(workspaceRef.inspecting){ @@ -335,16 +338,18 @@ */ }else{ - Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity'); + _doubleClicking = false; //Debugger.log('_canvasController:'+_canvasController,Debugger.GEN,'onPress','CanvasActivity'); if (_module == "monitoring"){ + Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity for monitoring'); _monitorController.activityClick(this); - } - _canvasController.activityClick(this); + }else { + Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasActivity'); + _canvasController.activityClick(this); + } - /* if (userDrawingTransition){ debug('user drawing transition'); @@ -375,8 +380,9 @@ trace("Activity ID is: "+this.activity.activityUIID) if (_module == "monitoring"){ _monitorController.activityRelease(this); + }else { + _canvasController.activityRelease(this); } - _canvasController.activityRelease(this); } } @@ -385,8 +391,9 @@ Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity'); if (_module == "monitoring"){ _monitorController.activityReleaseOutside(this); + }else { + _canvasController.activityReleaseOutside(this); } - _canvasController.activityReleaseOutside(this); } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -re22e7e035f082eb6b38b4fcadbaef0d2097930ba -rd40fc72f59374b30a27da8dc29203d2b411fb8f0 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision e22e7e035f082eb6b38b4fcadbaef0d2097930ba) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision d40fc72f59374b30a27da8dc29203d2b411fb8f0) @@ -68,7 +68,6 @@ // Only for Monitor Optional Container children private var fromModuleTab:String; private var _learnerTabView:LearnerTabView; - private var actStatus:String; private var learner:Object = new Object(); private var containerPanelHeader:MovieClip; private var completed_mc:MovieClip; @@ -109,20 +108,23 @@ for (var i = 0; i < _children.length; i ++) { - if (fromModuleTab != "monitorLearnerTab"){ - children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity" + i, childActivities_mc.getNextHighestDepth (), {_activity : _children [i] , _canvasController : _canvasController, _canvasView : _canvasView}); + if (fromModuleTab != "monitorMonitorTab"){ + children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _monitorController:_monitorController, _monitorView:_monitorView, _module:"monitoring"}); //set the positioning co-ords - children_mc [i].activity.xCoord = CHILD_OFFSET_X; - children_mc [i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE); + children_mc [i].activity.xCoord = CHILD_OFFSET_X; + children_mc [i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE); + }else if (fromModuleTab != "monitorLearnerTab"){ + children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _canvasController:_canvasController, _canvasView:_canvasView}); + //set the positioning co-ords + children_mc [i].activity.xCoord = CHILD_OFFSET_X; + children_mc [i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE); }else { trace("child's activityID is "+_children [i].activityID) - children_mc [i] = childHolder_mc.attachMovie ("CanvasActivityLinear_forOptional", "CanvasActivity" + i, childHolder_mc.getNextHighestDepth (), {_activity : _children [i] , _monitorController : _monitorController, _monitorView : _monitorView, actLabel:_children [i].title, learner:learner}); + var progStatus:String = _learnerTabView.compareProgressData(learner, _children [i].activityID); + children_mc [i] = childHolder_mc.attachMovie ("CanvasActivityLinear_forOptional", "CanvasActivityLinear_forOptional"+i, childHolder_mc.getNextHighestDepth(), {_activity:_children[i], _monitorController:_monitorController, _monitorView:_monitorView, learner:learner, actStatus:progStatus}); //set the positioning co-ords children_mc [i]._y = (i*21); - //children_mc [i]._x = 57; - - } children_mc [i]._visible = true; childHolder_mc._visible = false; @@ -159,7 +161,7 @@ } private function draw (){ - actStatus = _learnerTabView.compareProgressData(learner, _activity.activityID); + var actStatus:String = _learnerTabView.compareProgressData(learner, _activity.activityID); switch (actStatus){ case 'completed_mc' : //trace("TabID for Selected tab is: "+infoObj.tabID) @@ -169,14 +171,14 @@ case 'current_mc' : current_mc._visible = true; break; - //case 'toto_mc' : - //todo_mc._visible = true; - //break; + case 'attempted_mc' : + current_mc._visible = true; + break; default : todo_mc._visible = true; //Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView'); } - clickTarget_mc.swapDepths(childActivities_mc.getNextHighestDepth()); + //clickTarget_mc.swapDepths(childActivities_mc.getNextHighestDepth()); var numOfChildren = _children.length panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE); setStyles () @@ -195,21 +197,21 @@ } _x = _activity.xCoord; _y = _activity.yCoord; + + //dimentions of container (this) + if (_locked) { + padlockClosed_mc._visible = true; + clickTarget_mc._height = container_pnl._height; + }else{ + padlockOpen_mc._visible = true; + padlockClosed_mc._visible = false; + clickTarget_mc._height = 45; + } }else { containerPanelHeader.title_lbl.text = 'Optional Activities' container_pnl._height = 16+(numOfChildren * 21); } - //dimentions of container (this) - if (_locked) - { - padlockClosed_mc._visible = true; - clickTarget_mc._height = container_pnl._height; - }else - { - padlockOpen_mc._visible = true; - padlockClosed_mc._visible = false; - clickTarget_mc._height = 45; - } + Debugger.log ("I am in Draw :" + _activity.title + 'uiID:' + _activity.activityUIID + ' children:' + _children.length, Debugger.GEN, 'Draw', 'CanvasOptionalActivity'); _visible = true; //child1_mc._visible = true; Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -r705e46f5a95d075036b16b9fdc1ce322559c327a -rd40fc72f59374b30a27da8dc29203d2b411fb8f0 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 705e46f5a95d075036b16b9fdc1ce322559c327a) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision d40fc72f59374b30a27da8dc29203d2b411fb8f0) @@ -74,7 +74,6 @@ // Only for Monitor Optional Container children private var fromModuleTab:String; private var _learnerTabView:LearnerTabView; - private var actStatus:String; private var learner:Object = new Object(); private var containerPanelHeader:MovieClip; private var completed_mc:MovieClip; @@ -131,10 +130,14 @@ child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorView, learner:learner}); child2_mc.init({activity:child2,_monitorController:_monitorController,_monitorView:_monitorView, learner:learner}); + + //set the visibility to false + child1_mc._visible = false; + child2_mc._visible = false; } + //let it wait one frame to set up the components. - //childActivities_mc.createChildAtDepth("Bin",DepthManager.kTop); MovieClipUtils.doLater(Proxy.create(this,draw)); } @@ -164,7 +167,7 @@ private function draw(){ - actStatus = _learnerTabView.compareProgressData(learner, _activity.activityID); + var actStatus:String = _learnerTabView.compareProgressData(learner, _activity.activityID); switch (actStatus){ case 'completed_mc' : //trace("TabID for Selected tab is: "+infoObj.tabID) @@ -246,10 +249,32 @@ private function localOnRelease():Void{ Debugger.log('_doubleClicking:'+_doubleClicking+', localOnRelease:'+this,Debugger.GEN,'localOnRelease','CanvasParallelActivity'); - if(!_doubleClicking){ - _canvasController.activityRelease(this); + if (fromModuleTab != "monitorLearnerTab"){ + if ( ! _doubleClicking) + { + _canvasController.activityRelease (this); + } + }else { + if (_locked) + { + _locked = false; + gotoAndStop('collapse') + //set the visibility to false + child1_mc._visible = false; + child2_mc._visible = false; + draw (); + + }else + { + _locked = true; + //set the visibility to true + child1_mc._visible = true; + child2_mc._visible = true; + gotoAndStop('expand') + draw (); + + } } - } private function localOnReleaseOutside():Void{