Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rc09edcc3e54b8a8324169e0877b057b3abb8b483 -rc519cdd55a51de98ac7e09348f1eac36f5369263 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rc09edcc3e54b8a8324169e0877b057b3abb8b483 -rc519cdd55a51de98ac7e09348f1eac36f5369263 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as =================================================================== diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -rc519cdd55a51de98ac7e09348f1eac36f5369263 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as (.../BranchingActivity.as) (revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as (.../BranchingActivity.as) (revision c519cdd55a51de98ac7e09348f1eac36f5369263) @@ -81,6 +81,8 @@ if(_endXCoord) dto.endXCoord = _endXCoord; if(_endYCoord) dto.endYCoord = _endYCoord; + + return dto; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as =================================================================== diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rc519cdd55a51de98ac7e09348f1eac36f5369263 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 60db93c549c96bad95e890f34add10c4ef9d3d2e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision c519cdd55a51de98ac7e09348f1eac36f5369263) @@ -80,6 +80,7 @@ private var _transitions:Hashtable; private var _groupings:Hashtable; private var _branches:Hashtable; + private var _branchMappings:Hashtable; private var _licenseID:Number; @@ -103,6 +104,7 @@ _transitions = new Hashtable("_transitions"); _groupings = new Hashtable("_groupings"); _branches = new Hashtable("_branches"); + _branchMappings = new Hashtable("_branchMappings"); //set the defualts: _objectType = "LearningDesign"; @@ -258,6 +260,24 @@ return true; } + /** + * Adds a branch/group mapping to the DDM + * @usage + * @param branch + * @return + */ + public function addBranchMapping(entry:GroupBranchActivityEntry):Boolean{ + //dispatch an event to show the design has changed + dispatchEvent({type:'ddmBeforeUpdate',target:this}); + + Debugger.log('Branch Mapping entry:' + entry.entryUIID,4,'addBranchMapping','DesignDataModel'); + _branchMappings.put(entry.entryUIID,entry); + + dispatchEvent({type:'ddmUpdate',target:this}); + + return true; + } + public function addGrouping(grp:Grouping):Object{ //dispatch an event to show the design is going to change dispatchEvent({type:'ddmBeforeUpdate',target:this}); @@ -311,6 +331,27 @@ } /** + * Removes the branch from the DDM + * @usage + * @param branchUIID + * @return + */ + public function removeBranchMapping(entryUIID):Object{ + //dispatch an event to show the design has changed + dispatchEvent({type:'ddmBeforeUpdate',target:this}); + + var r:Object = _branchMappings.remove(entryUIID); + if(r==null){ + return new LFError("Removing branch mapping failed:"+entryUIID,"removeBranch",this,null); + }else{ + + Debugger.log('Removed:'+r.entryUIID,Debugger.GEN,'removeBranch','DesignDataModel'); + dispatchEvent({type:'ddmUpdate',target:this}); + } + } + + + /** * Sets a new design for the DDM. * note the design must be empty to call this, use clearCanvas(true) * @usage .setDesign(design:Object) @@ -438,12 +479,17 @@ } + for(var i=0; i 0){ - - for(var i=0; i 0) + for(var i=0; i 0){ - - for(var i=0; i 0) + for(var i=0; i 0) + for(var i=0; i> Branch: " + branch.sequenceName; - match_lst.addItem({label: desc, data: group}); + var gbMatch:GroupBranchActivityEntry = new GroupBranchActivityEntry(null, app.getCanvas().ddm.newUIID(), group, branch.sequenceActivity, _branchingActivity); + match_dgd.addItem(gbMatch); + app.getCanvas().ddm.addBranchMapping(gbMatch); + } private function removeMatch():Void { - var rItem:Object = match_lst.selectedItem; + var rItem:Object = match_dgd.selectedItem; if(rItem != null) { - groups_lst.addItem(rItem.data); - groups_lst.sortItemsBy("groupID", Array.NUMERIC); + groups_lst.addItem(rItem.group); + groups_lst.sortItemsBy("groupUIID", Array.NUMERIC); - match_lst.removeItemAt(match_lst.selectedIndex); + match_dgd.removeItemAt(match_dgd.selectedIndex); + app.getCanvas().ddm.removeBranchMapping(rItem); + } else { LFMessage.showMessageAlert("No match selected"); } @@ -276,8 +283,7 @@ panel.setSize(w,h); //Buttons - ok_btn.move(w-xOkOffset,h-yOkOffset); - cancel_btn.move(w-xCancelOffset,h-yCancelOffset); + close_btn.move(w-xOkOffset,h-yOkOffset); } //Gets+Sets @@ -295,5 +301,9 @@ public function set branches(a:Array){ _branches = a; } + + public function set branchingActivity(a:BranchingActivity) { + _branchingActivity = a; + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as =================================================================== diff -u -rc09edcc3e54b8a8324169e0877b057b3abb8b483 -rc519cdd55a51de98ac7e09348f1eac36f5369263 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as (.../GroupNamingDialog.as) (revision c09edcc3e54b8a8324169e0877b057b3abb8b483) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as (.../GroupNamingDialog.as) (revision c519cdd55a51de98ac7e09348f1eac36f5369263) @@ -61,7 +61,7 @@ private var fm:FocusManager; //Reference to focus manager private var themeManager:ThemeManager; //Theme manager - + //Dimensions for resizing private var xOkOffset:Number; private var yOkOffset:Number; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -rc09edcc3e54b8a8324169e0877b057b3abb8b483 -rc519cdd55a51de98ac7e09348f1eac36f5369263 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision c09edcc3e54b8a8324169e0877b057b3abb8b483) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision c519cdd55a51de98ac7e09348f1eac36f5369263) @@ -838,9 +838,11 @@ private function groupMatchDialogLoaded(evt:Object) { var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID); var grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.groupingUIID); - + + evt.target.scrollContent.branchingActivity = _canvasModel.selectedItem.activity; evt.target.scrollContent.groups = grouping.getGroups(); - evt.target.scrollContent.branches = getValidBranches(branches.myBranches); + evt.target.scrollContent.branches = getValidBranches(branches.myBranches); + evt.target.scrollContent.loadLists(); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rc519cdd55a51de98ac7e09348f1eac36f5369263 --- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as (.../WizardModel.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as (.../WizardModel.as) (revision c519cdd55a51de98ac7e09348f1eac36f5369263) @@ -129,7 +129,6 @@ public function broadcastViewUpdate(updateType, data){ - //getMonitor().getMV().clearView(); setChanged(); //send an update @@ -310,7 +309,6 @@ return _orgResources[key]; } - public function get treeDP():XML{ return _treeDP;