Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as =================================================================== diff -u -rf8aed893cddc6f4482ca7e0601328448a7647496 -rdfb0215633ab655f7c6782638fe9a089a0b78b71 --- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (.../Lesson.as) (revision f8aed893cddc6f4482ca7e0601328448a7647496) +++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (.../Lesson.as) (revision dfb0215633ab655f7c6782638fe9a089a0b78b71) @@ -178,6 +178,23 @@ } + public function moveToActivity(fromAct, toAct){ + var callback:Function = Proxy.create(this, afterMoveActivity); + + // call action + var lessonId:Number = lessonModel.ID; + + // do request + Application.getInstance().getComms().getRequest('learning/learner.do?method=forceMove&lessonID='+String(lessonId)+'&learnerID='+_root.userID+'¤tActivityID='+fromAct+'&destActivityID='+toAct, callback, false); + + return true; + + } + + private function afterMoveActivity(pkt:Object){ + getURL(_root.serverURL + 'learning'+String(pkt)+'?lessonID='+lessonModel.getLessonID(),'contentFrame'); + } + private function getFlashProgress():Void{ var callback:Function = Proxy.create(this,saveProgressData); var lessonId:Number = lessonModel.ID; Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as =================================================================== diff -u -r365ffda62981ed7b15f8800f5bd8fc02c769a43f -rdfb0215633ab655f7c6782638fe9a089a0b78b71 --- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as (.../LessonController.as) (revision 365ffda62981ed7b15f8800f5bd8fc02c769a43f) +++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/LessonController.as (.../LessonController.as) (revision dfb0215633ab655f7c6782638fe9a089a0b78b71) @@ -85,9 +85,9 @@ public function activityDoubleClick(ca:Object):Void{ setBusy() - Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityID + ' status: ' + ca.activityStatus + 'type id: ' + ca.activity.activityTypeID,Debugger.GEN,'activityDoubleClick','LessonController'); + 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){ + if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){ if(ca.activityStatus != undefined){ var URLToSend:String = 'learning/learner.do?method=getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_root.userID+'&lessonID='+_root.lessonID; @@ -97,6 +97,11 @@ } else { _lessonModel.getLesson().getActivityURL(URLToSend, false); } + } else if(_root.mode == 'preview') { + //var URLToSend:String = 'learning/learner.do?method=getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_root.userID+'&lessonID='+_root.lessonID; + //_lessonModel.getLesson().getActivityURL(URLToSend, false); + _lessonModel.getLesson().moveToActivity(_lessonModel.progressData.getCurrentActivityId(), ca.activity.activityID); + } }