Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r6a868a9857f9c835af5d6cdf6deb82b640bbe495 -r569040a69574de6e225967aed31288da54936850 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r6a868a9857f9c835af5d6cdf6deb82b640bbe495 -r569040a69574de6e225967aed31288da54936850 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivityEntry.as =================================================================== diff -u --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivityEntry.as (revision 0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivityEntry.as (revision 569040a69574de6e225967aed31288da54936850) @@ -0,0 +1,77 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ************************************************************************ + */ + +import org.lamsfoundation.lams.authoring.*; + +/** + * + * @author Mitchell Seaton + * @version 2.1 + **/ +class BranchActivityEntry { + + private var _entryID:Number; + private var _entryUIID:Number; + private var _sequenceActivity:SequenceActivity; + private var _branchingActivity:BranchingActivity; + + function BranchActivityEntry(){ + } + + public function set entryID(a:Number) { + _entryID = a; + } + + public function get entryID():Number { + return _entryID; + } + + public function set entryUIID(a:Number) { + _entryUIID = a; + } + + public function get entryUIID():Number { + return _entryUIID; + } + + public function set sequenceActivity(a:SequenceActivity) { + _sequenceActivity = a; + } + + public function get sequenceActivity():SequenceActivity { + return _sequenceActivity; + } + + public function set branchingActivity(a:BranchingActivity) { + _branchingActivity = a; + } + + public function get branchingActivity():BranchingActivity { + return _branchingActivity; + } + + public function get sequenceName():String { + return _sequenceActivity.title; + } + +} \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as =================================================================== diff -u -r7955216f858ed1e0e6a38abef06b770af3326ad3 -r569040a69574de6e225967aed31288da54936850 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as (.../GroupBranchActivityEntry.as) (revision 7955216f858ed1e0e6a38abef06b770af3326ad3) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as (.../GroupBranchActivityEntry.as) (revision 569040a69574de6e225967aed31288da54936850) @@ -28,53 +28,32 @@ * @author Mitchell Seaton * @version 2.1 **/ -class GroupBranchActivityEntry { +class GroupBranchActivityEntry extends BranchActivityEntry { - private var _entryID:Number; - private var _entryUIID:Number; - private var _group:Group; - private var _sequenceActivity:SequenceActivity; - private var _branchingActivity:BranchingActivity; - function GroupBranchActivityEntry(entryID:Number, entryUIID:Number, group:Group, sequenceActivity:SequenceActivity, branchingActivity:BranchingActivity){ - _entryID = entryID; - _entryUIID = entryUIID; - - _group = group; - _sequenceActivity = sequenceActivity; - _branchingActivity = branchingActivity; - + function GroupBranchActivityEntry(entryID:Number, entryUIID:Number, group:Group, sequenceActivity:SequenceActivity, branchingActivity:BranchingActivity){ + this.entryID = entryID; + this.entryUIID = entryUIID; + this.sequenceActivity = sequenceActivity; + this.branchingActivity = branchingActivity; + + this.group = group; } public function toData():Object { var dto:Object = new Object(); - if(_entryID) dto.entryID = _entryID; - if(_entryUIID) dto.entryUIID = _entryUIID; + if(this.entryID) dto.entryID = this.entryID; + if(this.entryUIID) dto.entryUIID = this.entryUIID; + if(this.sequenceActivity) dto.sequenceActivityUIID = this.sequenceActivity.activityUIID; + if(this.branchingActivity) dto.branchingActivityUIID = this.branchingActivity.activityUIID; + if(_group) dto.groupUIID = _group.groupUIID; - if(_sequenceActivity) dto.sequenceActivityUIID = _sequenceActivity.activityUIID; - if(_branchingActivity) dto.branchingActivityUIID = _branchingActivity.activityUIID; return dto; } - public function set entryID(a:Number) { - _entryID = a; - } - - public function get entryID():Number { - return _entryID; - } - - public function set entryUIID(a:Number) { - _entryUIID = a; - } - - public function get entryUIID():Number { - return _entryUIID; - } - public function set group(a:Group) { _group = a; } @@ -83,26 +62,6 @@ return _group; } - public function set sequenceActivity(a:SequenceActivity) { - _sequenceActivity = a; - } - - public function get sequenceActivity():SequenceActivity { - return _sequenceActivity; - } - - public function set branchingActivity(a:BranchingActivity) { - _branchingActivity = a; - } - - public function get branchingActivity():BranchingActivity { - return _branchingActivity; - } - - public function get sequenceName():String { - return _sequenceActivity.title; - } - public function get groupName():String { return _group.groupName; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as =================================================================== diff -u --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as (revision 0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as (revision 569040a69574de6e225967aed31288da54936850) @@ -0,0 +1,110 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ************************************************************************ + */ + +import org.lamsfoundation.lams.authoring.*; + +/** + * + * @author Mitchell Seaton + * @version 2.1 + **/ +class ToolOutputBranchActivityEntry extends BranchActivityEntry { + + private var _orderId:Number; + private var _name:String; + private var _type:String; + private var _startValue:Object; + private var _endValue:Object; + private var _exactMatchValue:Object; + + function ToolOutputBranchActivityEntry(entryID:Number, entryUIID:Number, sequenceActivity:SequenceActivity, branchingActivity:BranchingActivity){ + super(entryID, entryUIID, sequenceActivity, branchingActivity); + } + + public function toData():Object { + var dto:Object = new Object(); + + if(this.entryID) dto.entryID = this.entryID; + if(this.entryUIID) dto.entryUIID = this.entryUIID; + if(this.sequenceActivity) dto.sequenceActivityUIID = this.sequenceActivity.activityUIID; + if(this.branchingActivity) dto.branchingActivityUIID = this.branchingActivity.activityUIID; + + if(_orderId) dto.orderId = _orderId; + if(_name) dto.name = _name; + if(_type) dto.type = _type; + if(_startValue) dto.startValue = _startValue; + if(_endValue) dto.endValue = _endValue; + if(_exactMatchValue) dto.exactMatchValue = _exactMatchValue; + + return dto; + } + + public function set name(a:String) { + _name = a; + } + + public function get name():String { + return _name; + } + + public function set type(a:String) { + _type = a; + } + + public function get type():String { + return _type; + } + + public function set startValue(a:Object) { + _startValue = a; + } + + public function get startValue():Object { + return _startValue; + } + + public function set endValue(a:Object) { + _endValue = a; + } + + public function get endValue():Object { + return _endValue; + } + + public function set exactMatchValue(a:Object) { + _exactMatchValue = a; + } + + public function get exactMatchValue():Object { + return _exactMatchValue; + } + + public function set orderId(a:Number) { + _orderId = a; + } + + public function get orderId():Number { + return _orderId; + } + +} \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r6a868a9857f9c835af5d6cdf6deb82b640bbe495 -r569040a69574de6e225967aed31288da54936850 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 6a868a9857f9c835af5d6cdf6deb82b640bbe495) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 569040a69574de6e225967aed31288da54936850) @@ -626,8 +626,15 @@ _activity = (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : null; - if(_activity != null && _activity instanceof ToolActivity) { - tActivities.addItem({label: _activity.title, data: _activity.activityUIID}); + if(_activity != null) { + if(_activity instanceof ToolActivity) { + tActivities.addItem({label: _activity.title, data: _activity.activityUIID}); + } else if(_activity instanceof ComplexActivity) { + var children:Array = getCanvas().ddm.getComplexActivityChildren(_activity.activityUIID); + for(var i=0; i