Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r5ebc04888c42799642c9249df906922db6af4450 -rdee8f3e886e170f502a05d559769c4fff6cdf291 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r5ebc04888c42799642c9249df906922db6af4450 -rdee8f3e886e170f502a05d559769c4fff6cdf291 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -rd25e9238849c5bd874163f8433c94b6d606c3433 -rdee8f3e886e170f502a05d559769c4fff6cdf291 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision d25e9238849c5bd874163f8433c94b6d606c3433) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision dee8f3e886e170f502a05d559769c4fff6cdf291) @@ -32,7 +32,8 @@ import org.lamsfoundation.lams.common.style.* import org.lamsfoundation.lams.common.ws.Workspace import org.lamsfoundation.lams.common.ApplicationParent -import org.lamsfoundation.lams.common.* +import org.lamsfoundation.lams.common.* + import mx.managers.* import mx.utils.* import mx.transitions.Tween; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -rd25e9238849c5bd874163f8433c94b6d606c3433 -rdee8f3e886e170f502a05d559769c4fff6cdf291 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision d25e9238849c5bd874163f8433c94b6d606c3433) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision dee8f3e886e170f502a05d559769c4fff6cdf291) @@ -28,10 +28,11 @@ import org.lamsfoundation.lams.authoring.cv. *; import org.lamsfoundation.lams.monitoring.mv. *; import org.lamsfoundation.lams.monitoring.mv.tabviews.*; -//import org.lamsfoundation.lams.authoring.cv.DesignDataModel; -import org.lamsfoundation.lams.common.style. *; +import org.lamsfoundation.lams.common.style. *; + import mx.controls. *; -import mx.managers. * +import mx.managers. *; + /** * CanvasOptionalActivity * This is the UI / view representation of a complex (Optional) activity @@ -44,6 +45,10 @@ private var CHILD_OFFSET_X:Number = 8; private var CHILD_OFFSET_Y:Number = 57; private var CHILD_INCRE:Number = 60; + + private var PANEL_OFFSET_X:Number = null; + + private var CONTAINER_PANEL_W:Number = 142.8; private var newContainerXCoord:Number; private var newContainerYCoord:Number; @@ -71,7 +76,8 @@ //refs to screen items: private var container_pnl:Panel; private var header_pnl:Panel; - private var act_pnl:Panel; + private var act_pnl:Panel; + private var title_lbl:Label; private var actCount_lbl:Label; @@ -106,10 +112,13 @@ optionalActivity_mc = this; _visible = false; + _tm = ThemeManager.getInstance (); - _dictionary = Dictionary.getInstance(); + _dictionary = Dictionary.getInstance(); + _visibleHeight = container_pnl._height; _visibleWidth = container_pnl._width; + _ca = new ComplexActivity(_activity.activityUIID) _activity.activityCategoryID = Activity.CATEGORY_SYSTEM; @@ -141,9 +150,6 @@ showStatus(false); - CHILD_OFFSET_X = 8; - CHILD_OFFSET_Y = 57; - removeAllChildren(); children_mc = new Array(); @@ -176,12 +182,15 @@ CHILD_OFFSET_X = 4; CHILD_OFFSET_Y = 48; + PANEL_OFFSET_X = CHILD_OFFSET_X; + CHILD_INCRE = 57; removeAllChildren(); children_mc = new Array(); - + var _newVisibleWidth:Number = null; + for(var i=0; i < _children.length; i++) { if(_children[i].isSequenceActivity()) { if(fromModuleTab == "monitorMonitorTab") @@ -194,10 +203,20 @@ children_mc[i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE); children_mc[i]._visible = true; - if(_visibleWidth < children_mc[i].getVisibleWidth()) _visibleWidth = children_mc[i].getVisibleWidth(); + + if(_visibleWidth < children_mc[i].getVisibleWidth()) { + _newVisibleWidth = children_mc[i].getVisibleWidth(); + PANEL_OFFSET_X = (CHILD_OFFSET_X*2); + } + + if(_newVisibleWidth != null) _visibleWidth = _newVisibleWidth; } } + // set width for children + for(var i=0; i children_mc[i].getVisibleWidth()) children_mc[i].setSize(_visibleWidth, null); + ComplexActivity(_activity).noSequences = _children.length; MovieClipUtils.doLater(Proxy.create(this, draw)); @@ -210,6 +229,7 @@ public function updateChildren(newChildren:Array):Void { _visible = false; + _visibleWidth = CONTAINER_PANEL_W; _children = newChildren; init(); @@ -271,23 +291,24 @@ if (isLearnerCurrentAct){ if (learner_X > (_activity.xCoord + 112)){ - learner_X = _activity.xCoord + learnerOffset_X - learner_Y = 27 + learner_X = _activity.xCoord + learnerOffset_X ; + learner_Y = 27; hasPlus = true; learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus }); + return; } learnerContainer.attachMovie("learnerIcon", "learnerIcon"+learner.getUserName(), learnerContainer.getNextHighestDepth(),{_activity:_activity, learner:learner, _monitorController:_monitorController, _x:learner_X, _y:learner_Y, _hasPlus:hasPlus}); - learner_X = learner_X+10 + learner_X = learner_X+10; } } } private function draw (){ - var numOfChildren = _children.length + var numOfChildren = _children.length; panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE); setStyles(); @@ -305,9 +326,14 @@ } if(_type == SEQ_TYPE) { - container_pnl._height += 10; - container_pnl._width = _visibleWidth + 6; - header_pnl._width = _visibleWidth - 6; + container_pnl._height += 3; + container_pnl._width = _visibleWidth + PANEL_OFFSET_X; + header_pnl._width = _visibleWidth - 6 + PANEL_OFFSET_X; + + clickTarget_mc._width = _visibleWidth + PANEL_OFFSET_X; + + padlockClosed_mc._x = header_pnl._width + header_pnl._x - padlockClosed_mc._width - 5; + padlockOpen_mc._x = padlockClosed_mc._x; } _x = _activity.xCoord; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as =================================================================== diff -u -rd25e9238849c5bd874163f8433c94b6d606c3433 -rdee8f3e886e170f502a05d559769c4fff6cdf291 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision d25e9238849c5bd874163f8433c94b6d606c3433) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision dee8f3e886e170f502a05d559769c4fff6cdf291) @@ -42,7 +42,7 @@ */ class org.lamsfoundation.lams.authoring.cv.CanvasSequenceActivity extends MovieClip implements ICanvasActivity{ - public static var TOOL_ACTIVITY_WIDTH:Number = 136; + public static var TOOL_ACTIVITY_WIDTH:Number = 138; public static var TOOL_ACTIVITY_HEIGHT:Number = 55.5; public static var ICON_WIDTH:Number = 25; public static var ICON_HEIGHT:Number = 25; @@ -176,7 +176,7 @@ } - var _newVisibleWidth = (_children.length*CHILD_INCRE) + (CHILD_OFFSET_X*2); + var _newVisibleWidth = (_children.length*CHILD_INCRE) + (CHILD_OFFSET_X*2) + 6; if(_newVisibleWidth > CanvasSequenceActivity.TOOL_ACTIVITY_WIDTH) _visibleWidth = _newVisibleWidth; @@ -436,5 +436,11 @@ public function get children():Array { return children_mc; } + + public function setSize(w:Number, h:Number):Void { + _visibleWidth = w; + + draw(); + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -r3979a501cce3d6a3e64398ccc3c88a45fbde810a -rdee8f3e886e170f502a05d559769c4fff6cdf291 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 3979a501cce3d6a3e64398ccc3c88a45fbde810a) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision dee8f3e886e170f502a05d559769c4fff6cdf291) @@ -490,6 +490,8 @@ if(o.noSequences < noSeqAct_cmb.value) { for(var i=0; i<(noSeqAct_cmb.value - o.noSequences); i++) _canvasModel.createNewSequenceActivity(oa, o.noSequences+(i-1)); + + _canvasModel.setDirty(); } else { var itemsToRemove:Array = CanvasOptionalActivity(_canvasModel.selectedItem).getLastItems((o.noSequences - noSeqAct_cmb.value)); Debugger.log("itemsToRemove len: " + itemsToRemove.length,Debugger.CRITICAL, "updateOptionalSequenceData", "PropertyInspector");