Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rddbaafba98df3c2f503d7f8cdb755d9f5194dfd0 -r79ecb1908592f3debc72d036a491420ef5a853b3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision ddbaafba98df3c2f503d7f8cdb755d9f5194dfd0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) @@ -514,10 +514,12 @@ grid_mc = Grid.drawGrid(gridLayer,Math.round(s.w),Math.round(s.h),V_GAP,H_GAP); //position bin in canvas. - var bin = cm.getCanvas().bin; - bin._x = canvas_scp._x + (s.w - bin._width) - 10; - bin._y = canvas_scp._y + (s.h - bin._height) - 10; - + if(cm.activeView == this) { + var bin = cm.getCanvas().bin; + bin._x = canvas_scp._x + (s.w - bin._width) - 10; + bin._y = canvas_scp._y + (s.h - bin._height) - 10; + } + canvas_scp.redraw(true); setPosition(cm); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -rddbaafba98df3c2f503d7f8cdb755d9f5194dfd0 -r79ecb1908592f3debc72d036a491420ef5a853b3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision ddbaafba98df3c2f503d7f8cdb755d9f5194dfd0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) @@ -118,8 +118,8 @@ // raise alert if design is empty if (canvasModel.activitiesDisplayed.size() < 1){ Cursor.showCursor(Application.C_DEFAULT); - var msg:String = Dictionary.getValue('al_empty_design'); LFMessage.showMessageAlert(msg); + var msg:String = Dictionary.getValue('al_empty_design'); }else { saveDesignToServerAs(Workspace.MODE_SAVE); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r7bdba8e8a266408f4e6f807f366c76ed91c570f4 -r79ecb1908592f3debc72d036a491420ef5a853b3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) @@ -422,10 +422,12 @@ //Create the grid. The gris is re-drawn each time the canvas is resized. var grid_mc = Grid.drawGrid(gridLayer,Math.round(newWidth),Math.round(newHeight),V_GAP,H_GAP); - //position bin in canvas. - var bin = cm.getCanvas().bin; - bin._x = (s.w - bin._width) - 20; - bin._y = (s.h - bin._height) - 20; + //position bin in canvas. + if(cm.activeView == this) { + var bin = cm.getCanvas().bin; + bin._x = (s.w - bin._width) - 20; + bin._y = (s.h - bin._height) - 20; + } canvas_scp.redraw(true); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r79ecb1908592f3debc72d036a491420ef5a853b3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (.../Lesson.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (.../Lesson.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) @@ -71,9 +71,9 @@ //Create the model lessonModel = new LessonModel(this); + //Create the view lessonView_mc = target_mc.createChildAtDepth("Lesson",DepthManager.kTop); - trace(lessonView_mc); lessonView = LessonView(lessonView_mc); lessonView.init(lessonModel,undefined); @@ -100,7 +100,7 @@ private function viewLoaded(evt:Object){ Debugger.log('viewLoaded called',Debugger.GEN,'viewLoaded','Lesson'); - //lessonModel.setDefaultState(); + if(evt.type=='load') { dispatchEvent({type:'load',target:this}); }else { @@ -113,8 +113,7 @@ // call action var lessonId:Number = _root.lessonID; - //var userId:Number = Application.getInstance().getUserID(); - + // do request Application.getInstance().getComms().getRequest('learning/learner.do?method=getLesson&lessonID='+String(lessonId), callback, false); @@ -142,8 +141,7 @@ // call action var lessonId:Number = lessonModel.ID; - //var userId:Number = Application.getInstance().getUserID(); - + // do request Application.getInstance().getComms().getRequest('learning/learner.do?method=resumeLesson&lessonID='+String(lessonId), callback, false); @@ -185,11 +183,8 @@ } private function startLesson(pkt:Object){ - trace('received message back from server aftering joining lesson...'); - // set lesson as active lessonModel.setActive(); - trace('pktobject value: '+String(pkt)); getURL(_root.serverURL + 'learning'+String(pkt)+'?lessonID='+lessonModel.getLessonID(),'contentFrame'); @@ -295,8 +290,6 @@ } private function closeLesson(pkt:Object){ - trace('receiving message back from server...'); - // set lesson as inactive //lessonModel.setInactive(); @@ -311,7 +304,6 @@ } private function openLearningDesign(){ - trace('opening learning design...'); finishedDesign = false; var designId:Number = lessonModel.learningDesignID; @@ -322,8 +314,6 @@ } private function saveDataDesignModel(learningDesignDTO:Object){ - trace('returning learning design...'); - trace('saving model data...'); if(learningDesignDTO instanceof LFError) { Cursor.showCursor(Application.C_DEFAULT); learningDesignDTO.showErrorAlert(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r79ecb1908592f3debc72d036a491420ef5a853b3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as (.../LessonController.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as (.../LessonController.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) @@ -67,8 +67,7 @@ * the relevent method is called to action the user request * @param evt */ - public function click(evt):Void{ - trace(String(evt.target)); + public function click(evt):Void{ var tgt:String = new String(evt.target); if(tgt.indexOf("export_btn") != -1){ @@ -78,14 +77,12 @@ } public function activityClick(ca:Object):Void{ - //if (ca.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){ - - Debugger.log('activityClick CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityClick','LessonController'); - //} + Debugger.log('activityClick CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityClick','LessonController'); } public function activityDoubleClick(ca:Object):Void{ - setBusy() + setBusy(); + Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityID + ' status: ' + ca.activityStatus + 'type id: ' + ca.activity.activityTypeID,Debugger.GEN,'activityDoubleClick','LessonController'); if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.isGroupActivity()){ @@ -149,7 +146,6 @@ } public function get appData():Object{ - trace("called monitor application") var myObj:Object = new Object(); myObj.compX = Application.LESSON_X myObj.compY = Application.LESSON_Y Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r79ecb1908592f3debc72d036a491420ef5a853b3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as (.../LessonModel.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as (.../LessonModel.as) (revision 79ecb1908592f3debc72d036a491420ef5a853b3) @@ -30,7 +30,6 @@ import org.lamsfoundation.lams.authoring.Activity; import org.lamsfoundation.lams.authoring.Transition; - /* * Model for the Lesson */ @@ -86,7 +85,6 @@ } public function populateFromDTO(dto:Object){ - trace('populating lesson object for lesson:' + dto.lessonName); _lessonID = dto.lessonID; _lessonName = dto.lessonName; _lessonDescription = dto.lessonDescription; @@ -105,13 +103,11 @@ public function setSpadHeight(h:Number){ - trace ("height is set to: "+h) _spadHeight = h Application.getInstance().onResize(); } public function getSpadHeight(){ - trace ("returning pi height: "+_spadHeight) return _spadHeight; } @@ -286,7 +282,6 @@ public function setActive() { _active = true; - trace('setting lesson active...'); setChanged(); @@ -298,7 +293,6 @@ public function setInactive() { _active = false; - trace('setting lesson inactive...'); setChanged(); @@ -313,14 +307,11 @@ } private function orderDesign(activity:Activity, order:Array):Void{ - trace("==> "+activity.activityID); order.push(activity); - trace("transition keys length: "+ddmTransition_keys.length); + for(var i=0;i "+learnerFirstActivity.title); + // recursive method to order design orderDesign(learnerFirstActivity, orderedActivityArr); - - for(var i=0; i "+orderedActivityArr[i].title); - - } return orderedActivityArr; - trace("New Ordered Activities has length: "+orderedActivityArr.length) } @@ -387,25 +370,17 @@ var indexArray:Array = setDesignOrder(); //go through the design and get the activities and transitions - var dataObj:Object; ddmActivity_keys = learningDesignModel.activities.keys(); - //indexArray = ddmActivity_keys; - trace("Length of Activities in DDM: "+indexArray.length) - //loop through for(var i=0;i 0 || ddm_activity.parentUIID > 0){ - trace("this is Child") + return; }else { broadcastViewUpdate("DRAW_ACTIVITY",ddm_activity); } @@ -417,26 +392,19 @@ var indexArray:Array = setDesignOrder(); //go through the design and get the activities and transitions - var dataObj:Object; ddmActivity_keys = learningDesignModel.activities.keys(); - - //indexArray = ddmActivity_keys; - trace("Length of Activities in DDM: "+indexArray.length) - + //loop through for(var i=0;i 0 || ddm_activity.parentUIID > 0){ - trace("this is Child") - }else { + return; + } else { broadcastViewUpdate("UPDATE_ACTIVITY",ddm_activity); } } @@ -487,7 +455,8 @@ public function setPosition(x:Number,y:Number):Void{ //Set state variables __x = x; - __y = y; + __y = y; + //Set flag for notify observers setChanged();