Index: lams_central/src/flash/org/lamsfoundation/lams/learner/LearnerActivity.as =================================================================== diff -u -r7be9a9c06d4a89020ea1608c6344cff5118a00a7 -r43c90a273921dcd3a1b42b3ec5ae055a2e79d283 --- lams_central/src/flash/org/lamsfoundation/lams/learner/LearnerActivity.as (.../LearnerActivity.as) (revision 7be9a9c06d4a89020ea1608c6344cff5118a00a7) +++ lams_central/src/flash/org/lamsfoundation/lams/learner/LearnerActivity.as (.../LearnerActivity.as) (revision 43c90a273921dcd3a1b42b3ec5ae055a2e79d283) @@ -45,11 +45,13 @@ public static var TOOL_ACTIVITY_WIDTH:Number = 123.1; public static var TOOL_ACTIVITY_HEIGHT:Number = 50.5; private var xPos:Number; - private var yPos:Number; + private var yPos:Number; + //this is set by the init object private var _lessonController:LessonController; private var _lessonView:LessonView; private var _tm:ThemeManager; + //TODO:This should be ToolActivity private var _activity:Activity; private var _isSelected:Boolean; @@ -101,20 +103,24 @@ } public function init(initObj):Void{ - Debugger.log('initialising activity : ' + _activity.activityID ,Debugger.CRITICAL,'init','org.lamsfoundation.lams.LearnerActivity'); - + if(initObj){ _lessonView = initObj._lessonView; _lessonController = initObj._lessonController; _activity = initObj.activity; + learner = initObj.learner; } showAssets(false); if(!_activity.isGateActivity() && !_activity.isGroupActivity()){ //loadIcon(); } + + Debugger.log('initialising activity : ' + _activity.activityID ,Debugger.CRITICAL,'init','org.lamsfoundation.lams.LearnerActivity'); + + setStyles(); trace("Data for sentFrom: "+sentFrom) MovieClipUtils.doLater(Proxy.create(this,draw)); @@ -125,20 +131,18 @@ completed_mc._visible = isVisible; current_mc._visible = isVisible; canvasActivity_mc._visible = isVisible; - //clickTarget_mc._visible = isVisible; todo_mc._visible = isVisible; attempted_mc._visible = isVisible title_lbl._visible = true; } /** - * Updates the CanvasActivity display fields with the current data + * Updates the LearnerActivity display fields with the current data * @usage * @return */ public function refresh():Void{ draw(); - //setSelected(_isSelected); } /** @@ -151,7 +155,7 @@ Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity'); if (actStatus == null || actStatus == undefined){ - actStatus = _lessonView.compareProgressData(learner, _activity.activityID); + actStatus = Progress.compareProgressData(learner, _activity.activityID); } title_lbl._visible = true;