Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r1eec898e113bb165741b3c12f7d4f3f889773874 -r0ef5d3d288ff5913c2627b25709f3725ea159cb1 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 1eec898e113bb165741b3c12f7d4f3f889773874) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 0ef5d3d288ff5913c2627b25709f3725ea159cb1) @@ -27,7 +27,8 @@ private var icon_mc:MovieClip; private var icon_mcl:MovieClipLoader; private var title_lbl:MovieClip; - private var stopSign_mc:MovieClip; + private var groupIcon_mc:MovieClip; + private var stopSign_mc:MovieClip; private var clickTarget_mc:MovieClip; private var canvasActivity_mc:MovieClip; private var _dcStartTime:Number = 0; @@ -46,6 +47,9 @@ if(_activity.isGateActivity()){ _visibleHeight = GATE_ACTIVITY_HEIGHT; _visibleWidth = GATE_ACTIVITY_WIDTH; + }else if(_activity.isGroupActivity()){ + _visibleHeight = TOOL_ACTIVITY_HEIGHT; + _visibleWidth = TOOL_ACTIVITY_WIDTH; }else{ _visibleHeight = TOOL_ACTIVITY_HEIGHT; _visibleWidth = TOOL_ACTIVITY_WIDTH; @@ -66,17 +70,28 @@ _activity = initObj.activity; } + showAssets(false); + - if(!_activity.isGateActivity()){ + if(!_activity.isGateActivity() && !_activity.isGroupActivity()){ loadIcon(); } MovieClipUtils.doLater(Proxy.create(this,draw)); } + private function showAssets(isVisible:Boolean){ + groupIcon_mc._visible = isVisible; + title_lbl._visible = isVisible; + icon_mc._visible = isVisible; + stopSign_mc._visible = isVisible; + canvasActivity_mc._visible = isVisible; + clickTarget_mc._visible = isVisible; + } + /** * Updates the CanvasActivity display fields with the current data * @usage @@ -151,8 +166,21 @@ icon_mc._y = (this._height / 2) - (icon_mc._height / 2) - 5; } + /** + * Does the work of laying out the screen assets. + * Depending on type of Activity different bits will be shown + * @usage + * @return + */ private function draw(){ Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity'); + + + + title_lbl._visible = true; + icon_mc._visible = true; + clickTarget_mc._visible = true; + if(_activity.isGateActivity()){ stopSign_mc._visible = true; canvasActivity_mc._visible=false; @@ -161,6 +189,11 @@ clickTarget_mc._height= GATE_ACTIVITY_HEIGHT; }else{ + if(_activity.isGroupActivity()){ + groupIcon_mc._visible = true; + }else{ + groupIcon_mc._visible = false; + } canvasActivity_mc._visible=true; title_lbl.visible=true; //clickTarget_mc._visible=true;