Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as =================================================================== diff -u -r0af498ef07db863b378543a741469535635ff500 -r07e43914da81db3c524e447835775fc7d27a3e6a --- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision 0af498ef07db863b378543a741469535635ff500) +++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision 07e43914da81db3c524e447835775fc7d27a3e6a) @@ -23,12 +23,12 @@ import org.lamsfoundation.lams.common.*; import org.lamsfoundation.lams.common.util.*; -import org.lamsfoundation.lams.common.util.ui.*; +import org.lamsfoundation.lams.common.ui.*; import org.lamsfoundation.lams.common.mvc.*; import org.lamsfoundation.lams.learner.ls.*; import org.lamsfoundation.lams.monitoring.mv.*; import org.lamsfoundation.lams.authoring.Activity; -import org.lamsfoundation.lams.common.style.* +import org.lamsfoundation.lams.common.style.*; import com.polymercode.Draw; import mx.managers.* @@ -46,6 +46,12 @@ public static var GATE_ACTIVITY_WIDTH:Number = 50; public static var TOOL_ACTIVITY_WIDTH:Number = 123.1; public static var TOOL_ACTIVITY_HEIGHT:Number = 50.5; + + public static var LABEL_X:Number = 0; + public static var LABEL_Y:Number = 10; + public static var LABEL_W:Number = 130; + public static var LABEL_H:Number = 22; + private var xPos:Number; private var yPos:Number; @@ -67,7 +73,7 @@ private var todo_mc:MovieClip; private var attempted_mc:MovieClip; private var canvasActivity_mc:MovieClip; - private var title_lbl:Label; + private var title_lbl:MovieClip; private var groupIcon_mc:MovieClip; private var stopSign_mc:MovieClip; private var sentFrom:String; @@ -79,7 +85,7 @@ private var _base_mc:MovieClip; private var _selected_mc:MovieClip; - + private var _complex:Boolean; function LearnerActivity(){ Debugger.log("_activity:"+_activity.title,4,'Constructor','Activity'); @@ -106,6 +112,8 @@ } public function init(initObj):Void{ + var styleObj = _tm.getStyleObject('smallLabel'); + var _autosize:String; if(initObj){ @@ -115,17 +123,26 @@ learner = initObj.learner; } + if(_complex){ + _autosize = "left"; + LABEL_X = 18; + LABEL_Y = 2; + } else { + LABEL_X = 0 + LABEL_Y = 10 + _autosize = "center"; + } + + title_lbl = this.attachMovie("Label", "Label"+_activity.activityID, this.getNextHighestDepth(), {_x:LABEL_X , _y:LABEL_Y, _width:LABEL_W, _height:LABEL_H, autoSize:_autosize, styleName:styleObj}); + 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)); @@ -160,11 +177,12 @@ */ private function draw(){ + if (actStatus == null || actStatus == undefined){ actStatus = Progress.compareProgressData(learner, _activity.activityID); } - title_lbl._visible = true; + //title_lbl._visible = true; Debugger.log('activity status : ' + actStatus ,Debugger.CRITICAL,'draw','org.lamsfoundation.lams.LearnerActivity'); //clickTarget_mc._visible = true; @@ -298,7 +316,7 @@ * directly to the instanced * @usage * @return - */ + private function setStyles() { var styleObj; if(app.module == 'learner'){ @@ -313,7 +331,6 @@ title_lbl.setStyle('styleName',styleObj); title_lbl.setStyle('textAlign', 'center'); - } - - + } + */ } \ No newline at end of file Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== diff -u -r716f585a4fa8ea57c2c41f47aed1e6e108feb87d -r07e43914da81db3c524e447835775fc7d27a3e6a --- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision 716f585a4fa8ea57c2c41f47aed1e6e108feb87d) +++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision 07e43914da81db3c524e447835775fc7d27a3e6a) @@ -42,6 +42,9 @@ private var CHILD_OFFSET_X : Number = 8; private var CHILD_OFFSET_Y : Number = 57; private var CHILD_INCRE : Number = 60; + + private var LABEL_W:Number = 130; + private var LABEL_H:Number = 22; //this is set by the init object private var _controller:AbstractController; @@ -54,8 +57,8 @@ //refs to screen items: private var container_pnl : Panel; - private var title_lbl : Label; - + private var title_lbl:MovieClip; + private var labelHolder_mc:MovieClip; //locals private var actStatus:String; private var childActivities_mc : MovieClip; @@ -82,7 +85,7 @@ private var _tm : ThemeManager; private var _ddm : DesignDataModel; - private var app:ApplicationParent; + private var app:ApplicationParent; function LearnerComplexActivity () { @@ -92,14 +95,17 @@ _visible = false; _tm = ThemeManager.getInstance (); _visibleHeight = container_pnl._height; - _visibleWidth = container_pnl._width; + _visibleWidth = container_pnl._width; MovieClipUtils.doLater (Proxy.create (this, init)); } public function init () : Void { + var styleObj = _tm.getStyleObject('smallLabel'); + title_lbl = labelHolder_mc.attachMovie("Label", "actTitle", this.getNextHighestDepth(), {_width:LABEL_W, _height:LABEL_H, autoSize:"center", styleName:styleObj}); + children_mc = new Array(); var childrenArray:Array; @@ -126,7 +132,7 @@ { var progStatus:String = Progress.compareProgressData(learner, childrenArray[i].activityID); - children_mc [i] = childHolder_mc.attachMovie("LearnerActivity_forComplex", "LearnerActivity_forComplex"+i, childHolder_mc.getNextHighestDepth(), {_activity:childrenArray[i], _controller:_controller, _view:_view, learner:learner, actStatus:progStatus}); + children_mc [i] = childHolder_mc.attachMovie("LearnerActivity_forComplex", "LearnerActivity_forComplex"+i, childHolder_mc.getNextHighestDepth(), {_activity:childrenArray[i], _controller:_controller, _view:_view, learner:learner, actStatus:progStatus, _complex:true}); Debugger.log('attaching child movieL ' + children_mc[i],Debugger.CRITICAL,'init','LearnerComplexActivity'); //set the positioning co-ords @@ -179,7 +185,8 @@ draw(); } - private function draw (){ + private function draw (){ + if (actStatus == null || actStatus == undefined){ actStatus = Progress.compareProgressData(learner, _activity.activityID); } @@ -201,8 +208,7 @@ var numOfChildren = _children.length; panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE); - setStyles(); - + //write text if(_activity.title != undefined){ title_lbl.text = _activity.title; @@ -229,7 +235,6 @@ private function localOnPress():Void{ this.swapDepths(this._parent.getNextHighestDepth()); - // check double-click var now : Number = new Date ().getTime (); if ((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY) { @@ -348,8 +353,5 @@ public function get panelHeight():Number { return _panelHeight; } - private function setStyles():Void { - var styleObj = _tm.getStyleObject ('label'); - title_lbl.setStyle (styleObj); - } + } Index: lams_learning/web/lams_learner.swf =================================================================== diff -u -r9ffa6cfa55e2a13c2ae5ec1d6df702b12978c633 -r07e43914da81db3c524e447835775fc7d27a3e6a Binary files differ