Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as =================================================================== diff -u -r52b11b6d98099727913addf29dfc48df41e83ffd -r4f86eb076cd60f65046d56234985443e639c5089 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 52b11b6d98099727913addf29dfc48df41e83ffd) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 4f86eb076cd60f65046d56234985443e639c5089) @@ -515,6 +515,7 @@ } else if(mdto.condition != null) { var condition:ToolOutputCondition = new ToolOutputCondition(); condition.populateFromDTO(mdto.condition); + condition.toolActivity = ToolActivity(getActivityByUIID(mdto.condition.toolActivityUIID)); newMappingEntry = new ToolOutputBranchActivityEntry(mdto.entryID, mdto.entryUIID, condition, SequenceActivity(getActivityByUIID(mdto.sequenceActivityUIID)), BranchingActivity(getActivityByUIID(mdto.branchingActivityUIID))); } @@ -758,9 +759,16 @@ design.branchMappings = new Array(); var classMappingEntries = _branchMappings.values(); - if(classMappingEntries.length > 0) - for(var i=0; i 0) { + for(var i=0; i end_value) { LFMessage.showMessageAlert(Dictionary.getValue("to_condition_invalid_value_direction", [Dictionary.getValue("to_condition_start_value"), Dictionary.getValue("to_condition_end_value")]), null); return false; @@ -371,10 +371,6 @@ for(var i=0; i<_condition_item_dgd.dataProvider.length; i++) { var condition:ToolOutputCondition = ToolOutputCondition(_condition_item_dgd.dataProvider[i].data); - Debugger.log("condition: " + condition, Debugger.CRITICAL, "validateLongCondition", "ToolOutputconditiosDialog"); - Debugger.log("startValue: " + start_value + " / " + condition.startValue, Debugger.CRITICAL, "validateLongCondition", "ToolOutputconditiosDialog"); - Debugger.log("endValue: " + end_value + " / " + condition.endValue, Debugger.CRITICAL, "validateLongCondition", "ToolOutputconditiosDialog"); - if(condition.exactMatchValue != null) { if(start_value == condition.exactMatchValue) { LFMessage.showMessageAlert(Dictionary.getValue("to_condition_invalid_value_range", [Dictionary.getValue("to_condition_start_value")]), null); @@ -407,9 +403,12 @@ if(_selectedIndex == _toolOutputDefin_cmb.selectedIndex) return; - if(app.getCanvas().ddm.hasBranchMappingsForConditionSet(_condition_item_dgd.dataProvider) && evt != null) + Debugger.log("has mappings: " + app.getCanvas().ddm.hasBranchMappingsForConditionSet(_condition_item_dgd.dataProvider), Debugger.CRITICAL, "itemChanged", "ToolOutputConditionsDialog"); + Debugger.log("dp length: " + _condition_item_dgd.dataProvider.length, Debugger.CRITICAL, "itemChanged", "ToolOutputConditionsDialog"); + + if(app.getCanvas().ddm.hasBranchMappingsForConditionSet(_condition_item_dgd.dataProvider) && evt != null) { LFMessage.showMessageConfirm(Dictionary.getValue("branch_mapping_dlg_condition_linked_msg", [Dictionary.getValue("branch_mapping_dlg_condition_linked_all")]), Proxy.create(this, removeAllItems, true), Proxy.create(this, returnDefinitionState), Dictionary.getValue("al_continue"), null); - else if(evt != null) removeAllItems(true); + } else if(evt != null) removeAllItems(true); else selectDefinition(); } @@ -464,8 +463,8 @@ _condition_to_lbl.visible = false; if(_condition_item_dgd.dataProvider.length <= 0) { - addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, true)); - addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, false)); + addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, true)); + addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, false)); } break; @@ -479,13 +478,8 @@ } private function returnDefinitionState() { - Debugger.log("_selectedIndex: " + _selectedIndex, Debugger.CRITICAL, "returnDefinitionState", "ToolOutputConditionsDialog"); - //_toolOutputDefin_cmb.selectedItem = _toolOutputDefin_cmb.getItemAt(_selectedIndex); _toolOutputDefin_cmb.selectedIndex = _selectedIndex; _selectedDefinition = _toolOutputDefin_cmb.dataProvider[_selectedIndex]; - - Debugger.log("_selectedItem: " + _toolOutputDefin_cmb.selectedItem, Debugger.CRITICAL, "returnDefinitionState", "ToolOutputConditionsDialog"); - } private function itemEdited(evt:Object):Void { @@ -529,7 +523,8 @@ private function cancel(){ // remove any entries - removeAllItems(); + app.getCanvas().ddm.conditions.clear(); + _condition_item_dgd.removeAll(); _container.deletePopUp(); } @@ -606,5 +601,11 @@ public function set branchingActivity(a:BranchingActivity) { _branchingActivity = a; - } + } + + public function set toolActivity(a:ToolActivity) { + _toolActivity = a; + definitions = _toolActivity.definitions; + } + } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -rb365bfb0ceb516dcf01316100cf218de71fb324e -r4f86eb076cd60f65046d56234985443e639c5089 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision b365bfb0ceb516dcf01316100cf218de71fb324e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 4f86eb076cd60f65046d56234985443e639c5089) @@ -674,7 +674,7 @@ private function ToolOutputConditionsDialogLoaded(evt:Object, ta:ToolActivity) { evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity); - evt.target.scrollContent.definitions = ta.definitions; + evt.target.scrollContent.toolActivity = ta; evt.target.scrollContent.setupContent(); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r9422db882c1a9a8f9cbb15479c13df10428a0e13 -r4f86eb076cd60f65046d56234985443e639c5089 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 9422db882c1a9a8f9cbb15479c13df10428a0e13) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 4f86eb076cd60f65046d56234985443e639c5089) @@ -881,7 +881,6 @@ } _canvasModel.selectedItem.activity.toolActivityUIID = null; - //_canvasModel.selectedItem.activity.defineLater = null; showGroupBasedBranchingControls(true, !_canvasModel.selectedItem.activity.readOnly); showAppliedGroupingControls(true, !_canvasModel.selectedItem.activity.readOnly); @@ -897,8 +896,13 @@ showGroupBasedBranchingControls(false); showAppliedGroupingControls(false); - if(toolActs_cmb.visible) + if(toolActs_cmb.visible) { toolActs_cmb.dataProvider = _canvasModel.getDownstreamToolActivities(); + for(var i in toolActs_cmb.dataProvider) + selectToolActivityItem(i, toolActs_cmb.dataProvider[i].data); + + } + } else { _canvasModel.selectedItem.activity.groupingUIID = null; @@ -912,6 +916,20 @@ _canvasModel.selectedItem.refresh(); setModified(); + } + + private function selectToolActivityItem(index:Number, UIID:Number):Void { + + var mappings:Array = _canvasModel.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_canvasModel.selectedItem.activity.activityUIID).toolBased; + + Debugger.log("Loading Lists: mappings length: " + mappings.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog"); + + for(var i=0; i < mappings.length; i++) { + if(mappings[i].condition.toolActivity.activityUIID == UIID) { + toolActs_cmb.selectedIndex = index; + dispatchEvent({type: "click", target:toolActs_cmb}); + } + } } /** @@ -927,9 +945,9 @@ if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID)) LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, updateGroupingType, g, evt.target.value), Proxy.create(this, populateGroupingProperties, _canvasModel.selectedItem.activity), "Yes", "No", "Warning"); - else { + else updateGroupingType(g, evt.target.value); - } + }