Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r36fbce21c23631074b0bac97053331fa8bb848e1 -r75bae9f675cec296dd7e79715454b0c09b593c21
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r36fbce21c23631074b0bac97053331fa8bb848e1 -r75bae9f675cec296dd7e79715454b0c09b593c21
Binary files differ
Index: lams_flash/src/central/flash/lams_authoring.fla
===================================================================
diff -u -r9d5eeace842b7971ad47f350fef71c0e11a352c0 -r75bae9f675cec296dd7e79715454b0c09b593c21
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -r6ee8cd168d2101e85d6481bb8ea8d8cea125ccf1 -r75bae9f675cec296dd7e79715454b0c09b593c21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 6ee8cd168d2101e85d6481bb8ea8d8cea125ccf1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
@@ -55,6 +55,8 @@
 	private var _supportsRunOffline:Boolean;
 	private var _supportsOutputs:Boolean;
 	
+	private var _gradebookToolOutputName:String;
+	
 	private var _competenceMappings:Array; // competences to which this activity is mapped
 	
 	private var _toolOutputDefinitions:Hashtable;
@@ -236,12 +238,21 @@
 		n.supportsOutputs = _supportsOutputs;
 		n.extLmsId = _extLmsId;
 		
+		n.gradebookToolOutputName = _gradebookToolOutputName;
+		
+		var numDefinitions:Number = definitions.length;
+		if (numDefinitions > 0) {
+			for (var i=0; i<numDefinitions; i++) {
+				n.addDefinition(definitions[i]);
+			}
+		}
+		
 		n.competenceMappings = new Array();
 		
 		if (competenceMappings.length > 0) {
 			for (var i=0; i<competenceMappings.length; i++) {
-				n.competenceMappings.push(competenceMappings[i]);
-			}
+				n.competenceMappings.push(competenceMappings[i]);
+			}
 		}
 		
 		return n;
@@ -284,7 +295,7 @@
 	}
 	
 	public function set competenceMappings(cMappings:Array) {
-		_competenceMappings = cMappings;
+		_competenceMappings = cMappings;
 	}
 
 	/**
@@ -521,5 +532,23 @@
 	public function get extLmsId ():String {
 		return _extLmsId;
 	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @param   n the name of the tooloutput 
+	 * @return  
+	 */
+	public function set gradebookToolOutputName (n:String):Void {
+		_gradebookToolOutputName = n;
+	}
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get gradebookToolOutputName ():String {
+		return _gradebookToolOutputName;
+	}	
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r6a7dac4d3b037cda4dd56f36ddbd455e8526bdb7 -r75bae9f675cec296dd7e79715454b0c09b593c21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 6a7dac4d3b037cda4dd56f36ddbd455e8526bdb7)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
@@ -371,6 +371,7 @@
 				actType = "Tool"
 				actToAdd = ToolActivity(actToCopy.clone());
 				actToAdd.activityUIID = _ddm.newUIID();
+				canvasModel.getCanvas().getToolOutputDefinitions(ToolActivity(actToAdd), false);
 				break;
 
 			case(Activity.OPTIONAL_ACTIVITY_TYPE):
@@ -628,26 +629,26 @@
 		
 	}
 	
-	public function getToolOutputDefinitions(ta:ToolActivity) {
+	public function getToolOutputDefinitions(ta:ToolActivity, launchDefinitionDialog:Boolean) {
 		var callback:Function; 
        
 		if(ta.toolContentID) {
-			callback = Proxy.create(this, setToolOutputDefinitions, ta);
+			callback = Proxy.create(this, setToolOutputDefinitions, ta, launchDefinitionDialog);
 			Application.getInstance().getComms().getRequest('authoring/author.do?method=getToolOutputDefinitions&toolContentID='+ta.toolContentID, callback, false);
 		} else {
-			callback = Proxy.create(this, setToolContentForDefinitions, ta);
+			callback = Proxy.create(this, setToolContentForDefinitions, ta, launchDefinitionDialog);
 			canvasModel.getNewToolContentID(ta, callback);
 		}
 			
 	}
 	
-	public function setToolContentForDefinitions(toolContentID:Number, ta:ToolActivity):Void {
+	public function setToolContentForDefinitions(toolContentID:Number, ta:ToolActivity, launchDefinitionDialog:Boolean):Void {
 		ta.toolContentID = toolContentID;
 		
-		getToolOutputDefinitions(ta);
+		getToolOutputDefinitions(ta, launchDefinitionDialog);
 	}
 	
-	public function setToolOutputDefinitions(r:Object, toolActivity:ToolActivity) {
+	public function setToolOutputDefinitions(r:Object, toolActivity:ToolActivity, launchDefinitionDialog:Boolean) {
 		if(r instanceof LFError){
 			Cursor.showCursor(Application.C_DEFAULT);
 			r.showErrorAlert();
@@ -659,8 +660,14 @@
 				toolActivity.addDefinition(r[i]);
 			}
 		}
-				
-		canvasModel.broadcastViewUpdate("OPEN_CONDITIONS_DIALOG", toolActivity);
+		
+		if (launchDefinitionDialog) {
+			canvasModel.broadcastViewUpdate("OPEN_CONDITIONS_DIALOG", toolActivity);
+		} else {
+			Debugger.log("sending TOOLACT_OUTPUT_TYPES_LOADED update", Debugger.GEN, "setToolOutputDefinitions", "Canvas");
+			canvasModel.broadcastViewUpdate("TOOLACT_OUTPUT_TYPES_LOADED", toolActivity);
+		}
+		
 		Debugger.log("total def: " + toolActivity.definitions.length, Debugger.CRITICAL, "setToolOutputDefinitions", "Canvas");
 				
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r7b490643c46055810ef746bf38ca08afd9538277 -r75bae9f675cec296dd7e79715454b0c09b593c21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 7b490643c46055810ef746bf38ca08afd9538277)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
@@ -1078,7 +1078,6 @@
         } else {
             //TODO DI 25/05/05 raise wrong event type error 
         }
-		
     }
 	
 	public function openToolOutputConditionsDialog(ta:ToolActivity){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -r75bae9f675cec296dd7e79715454b0c09b593c21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 64f42c88ebf08393b1c53bbd00c3cd4fec211c10)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
@@ -24,6 +24,7 @@
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.authoring.cmpt.*;
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
+import org.lamsfoundation.lams.authoring.br.ToolOutputConditionsDialog;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.util.*
 import org.lamsfoundation.lams.common.dict.*
@@ -139,6 +140,8 @@
 		
 		_pi_defaultBranch_cb.addEventListener("click", Delegate.create(this, onDefaultBranchSelect));
 		
+		outputToGradebook_cmb.addEventListener("change", Delegate.create(this, setGradebookOutput));
+		
 		this.onEnterFrame = setupLabels;
 		
 		this.tabChildren = true;
@@ -182,6 +185,7 @@
 		defineLater_chk.label = Dictionary.getValue('pi_definelater');
 		runOffline_chk.label = Dictionary.getValue('pi_runoffline');
 				
+		gradebook_lbl.text = "Gradebook Output";
 		//Complex Activity
 		//min_lbl.text = Dictionary.getValue('pi_min_act');
 		//max_lbl.text = Dictionary.getValue('pi_max_act');
@@ -282,7 +286,9 @@
             case 'SELECTED_ITEM' :
                 updateItemProperties(cm);
                 break;
-                   
+			case 'TOOLACT_OUTPUT_TYPES_LOADED' :
+				showActivityOutputProperties(event.data); // event.data is a ToolActivity instance in this case
+				break;
             default :
 		}
 
@@ -399,6 +405,8 @@
 				showGateControls(false);
 				showToolActivityProperties(ToolActivity(a));
 				showAppliedGroupingProperties(a);
+				
+				showActivityOutputProperties(a);
 			}
 			
 			delimitLine._visible = true;
@@ -757,7 +765,6 @@
 	private function showAppliedGroupingProperties(a:Activity){
 		//update the grouping drop down values
 		appliedGroupingActivity_cmb.dataProvider = getGroupingActivitiesDP();
-		_global.breakpoint();
 
 		var appliedGroupingAct:GroupingActivity = _canvasModel.getCanvas().ddm.getGroupingActivityByGroupingUIID(a.groupingUIID);
 		Debugger.log('a.groupingUIID='+a.groupingUIID+', appliedGroupingAct.activityUIID :'+appliedGroupingAct.activityUIID ,Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
@@ -775,6 +782,50 @@
 			}
 		}	
 	}
-
+	
+	
+	private function setGradebookOutput(evt:Object) {
+		
+		if (_canvasModel.selectedItem.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE) {
+			
+			var toolAct:ToolActivity = ToolActivity(_canvasModel.selectedItem.activity);
+			if (evt.target.selectedIndex > 0) {
+				toolAct.gradebookToolOutputName = evt.target.selectedItem.name;
+			} else {
+				toolAct.gradebookToolOutputName = null;
+			}
+		}
+	}
+	
+	private function showActivityOutputProperties(a) {
+		
+		if (a.activityTypeID == Activity.TOOL_ACTIVITY_TYPE) {
+			var toolAct:ToolActivity = ToolActivity(a);
+			outputToGradebook_cmb.dataProvider = (toolAct.supportsOutputs == true) ? getToolActivityOutputTypes(toolAct) : null;
+			
+			if (toolAct.gradebookToolOutputName != null) {
+				for (var i=0; i<outputToGradebook_cmb.dataProvider.length; i++) {
+					if (outputToGradebook_cmb.dataProvider[i].name == toolAct.gradebookToolOutputName) {
+						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 {
+				gradebook_lbl.visible = false;
+				outputToGradebook_cmb.visible = false;
+			}
+		}
+	}
+	
+	private function getToolActivityOutputTypes(toolAct:ToolActivity):Array {
+		var _definitions:Array = toolAct.definitions;
+		_definitions.splice(0,0, new ToolOutputDefinition()); // add an empty toolOutputDefinition for first entry where itemObj.type = null
+		return _definitions;
+	}
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r6b45584aaab74017fadc92838765de69ae712185 -r75bae9f675cec296dd7e79715454b0c09b593c21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 6b45584aaab74017fadc92838765de69ae712185)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
@@ -99,6 +99,10 @@
 	private var endHours_stp:NumericStepper;
 	private var endMins_stp:NumericStepper;
 	
+	//gradebook
+	private var gradebook_lbl:Label;
+	private var outputToGradebook_cmb:ComboBox;
+	
 	//branches
 	private var branchType_lbl:Label;
 	private var branchType_cmb:ComboBox;
@@ -267,6 +271,9 @@
 		
 		_map_competence_btn.visible = v;
 		
+		gradebook_lbl.visible = v;
+		outputToGradebook_cmb.visible = v;
+		
 		if(e != null) {
 			grouping_lbl.enabled = e;
 			currentGrouping_lbl.enabled = e;
@@ -275,6 +282,8 @@
 			editGrouping_btn.enabled = e;
 			
 			_map_competence_btn.enabled = e;
+			
+			outputToGradebook_cmb.enabled = e;
 		}
 	}
 	
@@ -897,6 +906,7 @@
 		endMins_stp.setStyle('styleName', styleObj);
 		minAct_stp.setStyle('styleName', styleObj);
 		maxAct_stp.setStyle('styleName', styleObj);
+		gradebook_lbl.setStyle('styleName', styleObj);
 		
 		_pi_defaultBranch_cb.setStyle('styleName', styleObj);
 		_define_monitor_cb.setStyle('styleName', styleObj);
@@ -908,6 +918,7 @@
 		appliedGroupingActivity_cmb.setStyle('styleName', styleObj);
 		toolActs_cmb.setStyle('styleName', styleObj);
 		noSeqAct_cmb.setStyle('styleName', styleObj);
+		outputToGradebook_cmb.setStyle('styleName', styleObj);
 		
 		styleObj = _tm.getStyleObject('numericstepper');
 		days_stp.setStyle('styleName', styleObj);
@@ -1332,7 +1343,7 @@
 	private function onConditionsSetupClick(evt:Object){
 		// show tool outputs to branch mappings dialog
 		var ta:ToolActivity = ToolActivity(_canvasModel.getCanvas().ddm.getActivityByUIID(_canvasModel.selectedItem.activity.toolActivityUIID));
-		_canvasModel.getCanvas().getToolOutputDefinitions(ta);
+		_canvasModel.getCanvas().getToolOutputDefinitions(ta, true);
 		
 		setModified();
 	}