Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r32d1d2ae1e17adb6839a95ecd2331a08168d11a8 -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 32d1d2ae1e17adb6839a95ecd2331a08168d11a8)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -662,6 +662,12 @@
 authoring.fla.liveedit.readonly.remove.parent.error  =The activity can not be removed. Its parent activity is read-only.
 authoring.fla.liveedit.readonly.remove.child.error  =The activity can not be removed. It has read-only child activities.
 authoring.fla.liveedit.readonly.remove.transition.error  =The transition can not be removed. It is read-only.
+authoring.fla.weights.menu =Weights
+authoring.fla.weights.activity =Activity
+authoring.fla.weights.output =Output
+authoring.fla.weights.weight =Weight
+authoring.fla.weights.sum =Sum
+authoring.fla.weights.sum.error =Output weights do not sum up to 100%. Adjust them in Weights dialog.
 ckeditor.math.math  =Math
 ckeditor.math.functions  =Functions
 ckeditor.math.greek  =Greek
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -781,7 +781,7 @@
 
 	    String weight = (String) JsonUtil.opt(activityDetails, AuthoringJsonTags.TOOL_OUTPUT_WEIGHT);
 	    if (StringUtils.isNotBlank(weight)) {
-		evaluation.setWeight(Float.valueOf(weight));
+		evaluation.setWeight(Integer.valueOf(weight));
 	    }
 	    toolActivity.setEvaluation(evaluation);
 	} else {
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r087c5569b40b1b84ca0d5fbfcacb2ea8551fc744 -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 087c5569b40b1b84ca0d5fbfcacb2ea8551fc744)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -130,6 +130,8 @@
 				RESOURCE_MODIFY_ERROR : decoderDiv.html('<c:out value="${RESOURCE_MODIFY_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.fla.folder.move.to.child.error" var="FOLDER_MOVE_TO_CHILD_ERROR_VAR"/>
 				FOLDER_MOVE_TO_CHILD_ERROR : decoderDiv.html('<c:out value="${FOLDER_MOVE_TO_CHILD_ERROR_VAR}" />').text(),
+				<fmt:message key="authoring.fla.weights.sum.error" var="WEIGHTS_SUM_ERROR_VAR"/>
+				WEIGHTS_SUM_ERROR : decoderDiv.html('<c:out value="${WEIGHTS_SUM_ERROR_VAR}" />').text(),
 				
 				// HandlerLib
 				<fmt:message key="authoring.fla.transition.from.exists.error" var="TRANSITION_FROM_EXISTS_ERROR_VAR"/>
@@ -376,7 +378,12 @@
 		    <li id="annotateRegionButton" onClick="javascript:MenuLib.addAnnotationRegion()"><a href="#"><fmt:message key="authoring.fla.page.menu.annotate.region" /></a></li>
 		  </ul>
 		</div>
-				
+		
+		<button id="weightButton" class="btn btn-default desktopButton" onClick="javascript:MenuLib.openWeights()">
+			<i class="fa fa-balance-scale"></i> 
+			<span><fmt:message key="authoring.fla.weights.menu" /></span>
+		</button>	
+		
 		<button id="arrangeButton" class="btn btn-default desktopButton" onClick="javascript:GeneralLib.arrangeActivities()">
 			<i class="fa fa-th"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.arrange" /></span>
@@ -436,7 +443,7 @@
 						 onClick="javascript:MenuLib.toggleDescriptionDiv()">
 						<span id="ldDescriptionFieldTitle"><fmt:message key="authoring.fla.page.ld.title" /></span>
 						<span id="ldDescriptionFieldModified"></span>
-						<span id="ldDescriptionHideTip">▼</span>
+						<span id="ldDescriptionHideTip">?</span>
 					</div>
 					<div id="ldDescriptionDetails">
 						<div class="ldDescriptionLabel"><fmt:message key="authoring.fla.page.ld.description" /></div>
@@ -1056,8 +1063,8 @@
 			</div>
 		 </div>
 	</div>
+
 	
-	
 	<!-- EXPORT CANVAS AS IMAGE DIALOG -->
 	<div id="exportImageDialogContents" class="dialogContents exportDialog">
 		<a href="#"><fmt:message key="authoring.fla.page.download.image" /></a>
@@ -1069,5 +1076,27 @@
 		<span><fmt:message key="authoring.fla.page.download.wait" /><br /><fmt:message key="authoring.fla.page.download.close" /></span>
 		<iframe></iframe>
 	</div>
+	
+		
+	<!-- OUTPUT WEIGHTS DIALOG -->
+	<div id="weightsDialogContents" class="dialogContents">
+		<table>
+			<thead>
+				<tr>
+					<td><fmt:message key="authoring.fla.weights.activity" /></td>
+					<td><fmt:message key="authoring.fla.weights.output" /></td>
+					<td><fmt:message key="authoring.fla.weights.weight" /></td>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+			<tfoot>
+				<tr>
+					<td colspan="2"><fmt:message key="authoring.fla.weights.sum" /></td>
+					<td id="sumWeightCell"></td>
+				</tr>
+			</tfoot>
+		</table>
+	</div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -370,6 +370,34 @@
 	background-color: $brand-primary-light;
 }
 
+div#weightsDialogContents table {
+	width: 100%;
+}
+
+div#weightsDialogContents thead, div#weightsDialogContents tfoot {
+	font-weight: bold;
+}
+
+div#weightsDialogContents {
+	padding: 5px;
+}
+
+div#weightsDialogContents tr {
+	margin-bottom: 5px;
+}
+
+div#weightsDialogContents tr.selected {
+	background-color: $brand-primary-light;
+}
+
+div#weightsDialogContents td.incorrect {
+	color: $brand-danger;
+}
+
+div#weightsDialogContents input {
+	width: 30px;
+}
+
 /**** Main authoring styles ****/
 
 div#toolbar {
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -257,8 +257,11 @@
 		this.authorURL = authorURL;
 		this.title = title;
 		this.readOnly = readOnly;
-		this.gradebookToolOutputDefinitionName = evaluation ? evaluation[0] :  "<NONE>";
-		this.gradebookToolOutputWeight = evaluation && evaluation.length > 1 ? evaluation[1] : null;
+		if (evaluation) {
+			this.gradebookToolOutputDefinitionName = evaluation[0];
+			this.gradebookToolOutputWeight = evaluation.length > 1 ? evaluation[1] : null;
+		}
+		
 		this.transitions = {
 			'from' : [],
 			'to'   : []
@@ -926,6 +929,20 @@
 				if (object.loadPropertiesDialogContent) {
 					PropertyLib.openPropertiesDialog(object);
 				}
+				
+				/* This will become useful if weights dialog get non-modal
+				if (object instanceof ActivityDefs.ToolActivity
+						&& object.gradebookToolOutputDefinitionName
+						&& layout.weightsDialog.hasClass('in')) {
+					$('tbody tr', layout.weightsDialog).each(function(){
+						if ($(this).data('activity') == object) {
+							$(this).addClass('selected');
+						} else {
+							$(this).removeClass('selected');
+						}
+					});
+				}
+				*/
 			}
 		}
 	},
@@ -1289,7 +1306,6 @@
 		if (!activity.toolID) {
 			return;
 		}
-			
 		$.ajax({
 			url : LAMS_URL + 'authoring/author.do',
 			data : {
@@ -1302,14 +1318,20 @@
 			dataType : 'json',
 			success : function(response) {
 				activity.outputDefinitions = response;
-				if (!activity.gradebookToolOutputDefinitionName) {
-					$.each(activity.outputDefinitions, function() {
+				$.each(activity.outputDefinitions, function() {
+					if (activity.gradebookToolOutputDefinitionName) {
+						if (this.name == activity.gradebookToolOutputDefinitionName) {
+							activity.gradebookToolOutputDefinitionDescription = this.description;
+							return false;
+						}
+					} else {
 						if (this.isDefaultGradebookMark){
 							activity.gradebookToolOutputDefinitionName = this.name;
+							activity.gradebookToolOutputDefinitionDescription = this.description;
 							return false;
 						}
-					});
-				}
+					}
+				});
 			}
 		});
 	},
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -996,6 +996,98 @@
 
 		layout.dialogs.push(layout.infoDialog);
 		
+		
+		var weightsDialogContents = $('#weightsDialogContents');
+		layout.weightsDialog = showDialog('weightsDialog',{
+			'autoOpen'      : false,
+			'modal'			: true,
+			'resizable'     : false,
+			'draggable'     : true,
+			'width'			: 500,
+			'close' 		: null,
+			'data' 			: {
+				'prepareForOpen' : function(){
+					var tbody = $('tbody', weightsDialogContents).empty();
+					if (layout.activities.length == 0) {
+						tbody.append($('<tr />').append($('<td colspan="3" />').text('No activities with selected gradebook output')));
+						$('#sumWeightCell', layout.weightsDialog).empty();
+						return;
+					}
+					$.each(layout.activities, function(){
+						if (this.gradebookToolOutputDefinitionName) {
+							var activity = this,
+								row = $('<tr />').appendTo(tbody).data('activity', activity).hover(
+									function(){
+										var row = $(this);
+										row.siblings().each(function(){
+											$(this).removeClass('selected');
+										});
+										row.addClass('selected');
+										ActivityLib.removeSelectEffect();
+										ActivityLib.addSelectEffect(row.data('activity'), false);
+									},
+									function(){
+										$(this).removeClass('selected');
+										ActivityLib.removeSelectEffect($(this).data('activity'));
+									}),
+								weight = $('<input maxlength="3" />');
+							$('<td />').text(activity.title).appendTo(row);
+							$('<td />').text(activity.gradebookToolOutputDefinitionDescription).appendTo(row);
+							$('<td />').append(weight).appendTo(row);
+							weight.spinner({
+								'min'    : 0,
+								'max'    : 100,
+								'change' : function(){
+									activity.gradebookToolOutputWeight = $(this).val();
+									layout.weightsDialog.data('sumWeights')();
+								},
+								'spin'  : function(event, ui) {
+									activity.gradebookToolOutputWeight = ui.value;
+									layout.weightsDialog.data('sumWeights')();
+								}
+							}).val(activity.gradebookToolOutputWeight);
+						}
+					});
+					
+					layout.weightsDialog.data('sumWeights')(true);
+				},
+				
+				'sumWeights' : function(firstRun){
+					var sum = null;
+					$('tbody tr', layout.weightsDialog).each(function(){
+						var weight = $('input', this);
+						if (!firstRun && !weight.spinner('isValid')) {
+							weight.val(null);
+							return true;
+						}
+						var value = $(this).data('activity').gradebookToolOutputWeight;
+						if (value) {
+							if (sum == null) {
+								sum = 0;
+							}
+							sum += +value;
+						}
+					});
+					
+					var sumCell = $('#sumWeightCell', layout.weightsDialog);
+					if (sum == null) {
+						sumCell.empty();
+					} else {
+						sumCell.text(sum + '%');
+						if (sum == 100) {
+							sumCell.removeClass('incorrect');
+						} else {
+							sumCell.addClass('incorrect');
+						}
+					}
+				}
+			}
+		});
+		
+		$('.modal-body', layout.weightsDialog).empty().append(weightsDialogContents.show());
+		
+		layout.dialogs.push(layout.weightsDialog);
+		
 		// license widgets init
 		$('#ldDescriptionLicenseSelect').change(function(){
 			var option = $('option:selected', this);
@@ -2014,17 +2106,32 @@
 			annotations = [],
 			layoutActivityDefs = [],
 			systemGate = null,
-			error = null;
-	
+			error = null,
+			weightsSum = null;
+		
 		$.each(layout.activities, function(){
 			if (this.parentActivity	&& (this.parentActivity instanceof ActivityDefs.BranchingActivity
 							|| this.parentActivity instanceof ActivityDefs.BranchActivity)){
 				// remove previously set parent activities as they will be re-set from the start
 				this.parentActivity = null;
 				this.orderID = null;
 			}
+			
+			if (this.gradebookToolOutputWeight || this.gradebookToolOutputWeight == 0) {
+				if (weightsSum == null) {
+					weightsSum = 0;
+				}
+				weightsSum += +this.gradebookToolOutputWeight;
+			}
 		});
 		
+		if (weightsSum != null && weightsSum != 100) {
+			if (displayErrors) {
+				alert(LABELS.WEIGHTS_SUM_ERROR);
+			}
+			return false;
+		}
+		
 		$.each(layout.activities, function(){
 			// add all branch activities for iteration and saving
 			if (this instanceof ActivityDefs.BranchingEdgeActivity){
@@ -2091,7 +2198,9 @@
 									}
 									// the branch is shared between two branchings
 									// it should have been detected when adding a transition
-									alert(LABELS.CROSS_BRANCHING_ERROR);
+									if (displayErrors) {
+										alert(LABELS.CROSS_BRANCHING_ERROR);
+									}
 									return false;
 								}
 								// a nested branching encountered when crawling, just jump over it
@@ -2107,7 +2216,9 @@
 						} while (activity);
 						
 						if (error) {
-							alert(branchingActivity.title + LABELS.END_MATCH_ERROR);
+							if (displayErrors) {
+								alert(branchingActivity.title + LABELS.END_MATCH_ERROR);
+							}
 							return false;
 						}
 					});
@@ -2329,7 +2440,8 @@
 				'stopAfterActivity'		 : activity.stopAfterActivity ? true : false,
 				'toolActivityUIID'		 : activity.input ? activity.input.uiid : null,
 				'gradebookToolOutputDefinitionName' : activity.gradebookToolOutputDefinitionName == '<NONE>' ?
-														null : activity.gradebookToolOutputDefinitionName 
+														null : activity.gradebookToolOutputDefinitionName,
+				'gradebookToolOutputWeight' : activity.gradebookToolOutputWeight
 			});
 	
 			var activityTransitions = activity instanceof ActivityDefs.BranchingActivity ?
@@ -2473,8 +2585,11 @@
 	 * Stores the sequece in database.
 	 */
 	saveLearningDesign : function(folderID, learningDesignID, title) {
-		var ld = GeneralLib.prepareLearningDesignData(true),
-			systemGate = ld.systemGate,
+		var ld = GeneralLib.prepareLearningDesignData(true);
+		if (!ld) {
+			return false;
+		}
+		var systemGate = ld.systemGate,
 			// final success/failure of the save
 			result = false;
 		
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -re322fdcc0251b15c0bfe94669febaee9237c680a -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision e322fdcc0251b15c0bfe94669febaee9237c680a)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -534,7 +534,12 @@
 		});
 	},
 	
+	openWeights : function(){
+		layout.weightsDialog.data('prepareForOpen')();
+		layout.weightsDialog.modal('show');
+	},
 	
+	
 	/**
 	 * Make a copy of an existing activity.
 	 */
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -ra81f6b5590b7a34440a39bfd564b164d9263b6a5 -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision a81f6b5590b7a34440a39bfd564b164d9263b6a5)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -711,6 +711,14 @@
 				var selectedGradebookToolOutputDefinition = $('.propertiesContentFieldGradebook option:selected', content);
 				if (selectedGradebookToolOutputDefinition.length > 0){
 					activity.gradebookToolOutputDefinitionName = selectedGradebookToolOutputDefinition.val();
+					if (activity.gradebookToolOutputDefinitionName) {
+						$.each(activity.outputDefinitions, function(){
+							if (this.name == activity.gradebookToolOutputDefinitionName) {
+								activity.gradebookToolOutputDefinitionDescription = this.description;
+								return false;
+							}
+						});
+					}
 				}
 				
 				if (redrawNeeded) {
@@ -1546,7 +1554,7 @@
 	
 	
 	/**
-	 * Fill outpu definitions of given activity for Gradebook.
+	 * Fill output definitions of given activity for Gradebook.
 	 */
 	fillOutputDefinitionsDropdown : function(activity) {
 		// find all tools that support input and fill dropdown menu with their titles
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml	(.../ActivityEvaluation.hbm.xml)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml	(.../ActivityEvaluation.hbm.xml)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -37,7 +37,7 @@
 
         <property
             name="weight"
-            type="java.lang.Float"
+            type="java.lang.Integer"
             column="weight"
         />
     </class>
Fisheye: Tag 64e6623bc68b11257c7f5d71f3953154f80b6fde refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170829.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170908.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170908.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170908.sql	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -0,0 +1,22 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- Add column for weighted outputs
+
+ALTER TABLE lams_activity_evaluation ADD COLUMN weight TINYINT DEFAULT NULL,
+									 DROP PRIMARY KEY,
+									 ADD PRIMARY KEY (activity_id),
+									 DROP COLUMN activity_evaluation_id;
+
+DELETE FROM lams_configuration WHERE config_key LIKE '%ClientVersion';
+
+UPDATE lams_configuration SET config_value = '3.0.1' WHERE config_key = 'ServerVersionNumber';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java	(.../ActivityEvaluation.java)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java	(.../ActivityEvaluation.java)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -33,7 +33,7 @@
     private Long activityId;
     private ToolActivity activity;
     private String toolOutputDefinition;
-    private Float weight;
+    private Integer weight;
 
     public Long getActivityId() {
 	return activityId;
@@ -59,11 +59,11 @@
 	this.toolOutputDefinition = toolOutputDefinition;
     }
 
-    public Float getWeight() {
+    public Integer getWeight() {
 	return weight;
     }
 
-    public void setWeight(Float weight) {
+    public void setWeight(Integer weight) {
 	this.weight = weight;
     }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -430,7 +430,7 @@
 	    ActivityEvaluation eval = toolActivity.getEvaluation();
 	    evaluation.add(eval.getToolOutputDefinition());
 	    if (eval.getWeight() != null) {
-		String.valueOf(eval.getWeight());
+		evaluation.add(String.valueOf(eval.getWeight()));
 	    }
 	}
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r64e6623bc68b11257c7f5d71f3953154f80b6fde
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 463716d6023591c9c35eeb5057a16c903289029e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
@@ -1226,7 +1226,7 @@
 		ActivityEvaluation activityEvaluation = new ActivityEvaluation();
 		activityEvaluation.setToolOutputDefinition(eval.get(0));
 		if (eval.size() > 1) {
-		    activityEvaluation.setWeight(Float.valueOf(eval.get(1)));
+		    activityEvaluation.setWeight(Integer.valueOf(eval.get(1)));
 		}
 		activityEvaluation.setActivity((ToolActivity) act);
 		((ToolActivity) act).setEvaluation(activityEvaluation);