Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r76c9c0dde6a383076c1cb2f0f15eb6d245fe0293 -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r76c9c0dde6a383076c1cb2f0f15eb6d245fe0293 -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -r75ccded90a0064358457a15705aa8605e0553867 -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 75ccded90a0064358457a15705aa8605e0553867)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02)
@@ -57,6 +57,7 @@
 	
 	private var _gradebookToolOutputDefinitionName:String;
 	
+	private var _activityEvaluations:Array;
 	private var _competenceMappings:Array; // competences to which this activity is mapped
 	
 	private var _toolOutputDefinitions:Hashtable;
@@ -144,10 +145,17 @@
 			
 			if(StringUtils.isWDDXNull(dto.extLmsId)) { _extLmsId = null }
 			else { _extLmsId = dto.extLmsId; }
-			 
-			if(StringUtils.isWDDXNull(dto.gradebookToolOutputDefinitionName)) { _gradebookToolOutputDefinitionName = null }
-			else { _gradebookToolOutputDefinitionName = dto.gradebookToolOutputDefinitionName; }
 			
+			if(!StringUtils.isWDDXNull(dto.activityEvaluations)) {
+				_activityEvaluations = new Array();
+				for (var i=0; i<dto.activityEvaluations.length; i++) {
+					_activityEvaluations.push(dto.activityEvaluations[i]);
+				}
+				if (_activityEvaluations[0] != null) { // currently only one output sent to gradebook
+					_gradebookToolOutputDefinitionName = _activityEvaluations[0];
+				}
+			}
+			
 			//TODO: Have the backend send this to flash for all tool activities in the design on startup
 			if(!StringUtils.isWDDXNull(dto.toolOutputDefinitions)) {
 				for (var i=0; i<dto.toolOutputDefinitions.length; i++) {
@@ -270,6 +278,12 @@
 		return n;
 	}
 	
+	public function addEvaluation(dto:Object):Void {
+		if (!_toolOutputDefinitions.containsKey(dto.name)) {
+			_toolOutputDefinitions.put(dto.name, dto);
+		}
+	}
+	
 	public function addDefinition(dto:Object):Void {
 		if (!_toolOutputDefinitions.containsKey(dto.name)) {
 			_toolOutputDefinitions.put(dto.name, dto);
@@ -284,6 +298,10 @@
 		return _toolOutputDefinitions.values();
 	}
 	
+	public function get activityEvaluations():Array {
+		return _activityEvaluations;
+	}
+	
 	public function get competenceMappings():Array {
 		return _competenceMappings	
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -rb9e8f17d008c33688177197dfc30c6f3cb794cf6 -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision b9e8f17d008c33688177197dfc30c6f3cb794cf6)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02)
@@ -373,7 +373,6 @@
 				actType = "Tool"
 				actToAdd = ToolActivity(actToCopy.clone());
 				actToAdd.activityUIID = _ddm.newUIID();
-				canvasModel.getCanvas().getToolOutputDefinitions(ToolActivity(actToAdd), false);
 				break;
 
 			case(Activity.OPTIONAL_ACTIVITY_TYPE):
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r75ccded90a0064358457a15705aa8605e0553867 -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 75ccded90a0064358457a15705aa8605e0553867)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02)
@@ -406,6 +406,7 @@
 				showToolActivityProperties(ToolActivity(a));
 				showAppliedGroupingProperties(a);
 				
+				loadGradebookOuputDataIfNotLoaded(ToolActivity(a));
 				showActivityOutputProperties(a);
 			}
 			
@@ -783,6 +784,18 @@
 		}	
 	}
 	
+	private function loadGradebookOuputDataIfNotLoaded(ta:ToolActivity) {
+		if (ta.supportsOutputs) {
+			if (outputToGradebook_cmb.labelFunction == null) {
+				outputToGradebook_cmb.labelFunction = function(itemObj) {
+					return (itemObj.type == null) ? Dictionary.getValue("to_conditions_dlg_defin_item_header_lbl") : Dictionary.getValue("to_conditions_dlg_defin_item_fn_lbl", [itemObj.description, ToolOutputConditionsDialog.getOutputType(itemObj.type)]);
+				}
+			}
+			if (ta.definitions == null || ta.definitions.length <= 0) {
+				_canvasModel.getCanvas().getToolOutputDefinitions(ta, false);
+			}
+		}
+	}
 	
 	private function setGradebookOutput(evt:Object) {
 		
@@ -809,13 +822,7 @@
 						outputToGradebook_cmb.selectedIndex = i;
 					}
 				}
-			} else if(toolAct.supportsOutputs) {
-				if (outputToGradebook_cmb.labelFunction == null) {
-					outputToGradebook_cmb.labelFunction = function(itemObj) {
-						return (itemObj.type == null) ? Dictionary.getValue("to_conditions_dlg_defin_item_header_lbl") : Dictionary.getValue("to_conditions_dlg_defin_item_fn_lbl", [itemObj.description, ToolOutputConditionsDialog.getOutputType(itemObj.type)]);
-					}
-				}
-			} else {
+			}else if (!toolAct.supportsOutputs) {
 				gradebook_lbl.visible = false;
 				outputToGradebook_cmb.visible = false;
 			}