Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r148241ef71d53c340db44d23458316416e8f3c0f
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision a61b6ad192148c0ae514f37a9b488c3a15535ee9)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 148241ef71d53c340db44d23458316416e8f3c0f)
@@ -1579,15 +1579,17 @@
 			optionsFound = true;
 			
 			var suffix = '';
-			switch(this.type) {
-				case 'OUTPUT_BOOLEAN' :
-					suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
-					break;
-                                                            
-				case 'OUTPUT_LONG' :
-					suffix = LABELS.RANGE_OUTPUT_SUFFIX;
-					break;
-			};
+			if (!this.showConditionNameOnly) {
+				switch(this.type) {
+					case 'OUTPUT_BOOLEAN' :
+						suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
+						break;
+	                                                            
+					case 'OUTPUT_LONG' :
+						suffix = LABELS.RANGE_OUTPUT_SUFFIX;
+						break;
+				};
+			}
 			
 			var option = $('<option />')
 						   .text(this.description + ' ' + suffix)
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r955d3cf3aaf3ffc011e780393e684b43748eaf8e -r148241ef71d53c340db44d23458316416e8f3c0f
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 955d3cf3aaf3ffc011e780393e684b43748eaf8e)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 148241ef71d53c340db44d23458316416e8f3c0f)
@@ -22,10 +22,12 @@
 package org.lamsfoundation.lams.gradebook.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -119,9 +121,8 @@
 public class GradebookService implements IGradebookFullService {
     private static Logger logger = Logger.getLogger(GradebookService.class);
 
-    private static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10";
-    public static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11";
-    public static final String TOOL_SIGNATURE_MCQ = "lamc11";
+    private static final Set<String> LESSON_EXPORT_TOOL_ACTIVITIES = new HashSet<>(
+	    Arrays.asList("laasse10", "lascrt11", "lamc11", "ladoku11"));
 
     // Services
     private ILamsCoreToolService toolService;
@@ -1216,8 +1217,7 @@
 	for (ToolActivity activity : activityToUserDTOMap.keySet()) {
 	    String toolSignature = activity.getTool().getToolSignature();
 	    //check whether toolActivity has a NumericToolOutput
-	    if (activity.getEvaluation() != null && (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)
-		    || TOOL_SIGNATURE_MCQ.equals(toolSignature) || TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature))) {
+	    if (activity.getEvaluation() != null && LESSON_EXPORT_TOOL_ACTIVITIES.contains(toolSignature)) {
 		filteredActivityToUserDTOMap.put(activity, activityToUserDTOMap.get(activity));
 	    }
 	}
Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r662ae6c0c70336a2bd3391a2111d874e97def9e1 -r148241ef71d53c340db44d23458316416e8f3c0f
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 662ae6c0c70336a2bd3391a2111d874e97def9e1)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 148241ef71d53c340db44d23458316416e8f3c0f)
@@ -92,3 +92,4 @@
 outcome.authoring.existing = Added outcomes
 outcome.authoring.existing.none = none
 outcome.authoring.create.new = [create new]
+output.desc.manual.grading = Manual grading
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r148241ef71d53c340db44d23458316416e8f3c0f
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java	(.../DokumaranConstants.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java	(.../DokumaranConstants.java)	(revision 148241ef71d53c340db44d23458316416e8f3c0f)
@@ -119,5 +119,5 @@
 
     public static final String ATTR_USER_UID = "userUid";
 
-    public static final String SHARED_ITEMS_DEFINITION_NAME = "shared.items.output.definition.dokumaran";
+    public static final String MANUAL_GRADING_DEFINITION_NAME = "manual.grading";
 }
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r148241ef71d53c340db44d23458316416e8f3c0f
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java	(.../DokumaranOutputFactory.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java	(.../DokumaranOutputFactory.java)	(revision 148241ef71d53c340db44d23458316416e8f3c0f)
@@ -20,15 +20,13 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.dokumaran.service;
 
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
 import org.lamsfoundation.lams.tool.OutputFactory;
-import org.lamsfoundation.lams.tool.SimpleURL;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
@@ -42,15 +40,16 @@
     @Override
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Object toolContentObject,
 	    int definitionType) throws ToolException {
-	TreeMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
-	Class simpleUrlArrayClass = SimpleURL[].class;
+	TreeMap<String, ToolOutputDefinition> definitionMap = new TreeMap<>();
 	switch (definitionType) {
 	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+		ToolOutputDefinition manualGradingDefinition = buildLongOutputDefinition(
+			DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME);
+		manualGradingDefinition.setWeightable(true);
+		manualGradingDefinition.setShowConditionNameOnly(true);
+		definitionMap.put(DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, manualGradingDefinition);
 		break;
 	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
-		ToolOutputDefinition sharedItemsDefinition = buildComplexOutputDefinition(
-			DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME, simpleUrlArrayClass);
-		definitionMap.put(DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME, sharedItemsDefinition);
 		break;
 	}
 	return definitionMap;
@@ -63,13 +62,14 @@
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, IDokumaranService dokumaranService,
 	    Long toolSessionId, Long learnerId) {
 
-	TreeMap<String, ToolOutput> outputs = new TreeMap<String, ToolOutput>();
-	// tool output cache
-	TreeMap<String, ToolOutput> baseOutputs = new TreeMap<String, ToolOutput>();
+	TreeMap<String, ToolOutput> outputs = new TreeMap<>();
+
 	if (names == null) {
-	    outputs.put(DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME, getToolOutput(
-		    DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME, dokumaranService, toolSessionId, learnerId));
+	    outputs.put(DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, getToolOutput(
+		    DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, dokumaranService, toolSessionId, learnerId));
 	} else {
+	    // tool output cache
+	    TreeMap<String, ToolOutput> baseOutputs = new TreeMap<>();
 	    for (String name : names) {
 		String[] nameParts = splitConditionName(name);
 		if (baseOutputs.get(nameParts[0]) != null) {
@@ -88,42 +88,14 @@
 
     }
 
-    public ToolOutput getToolOutput(String name, IDokumaranService dokumaranService, Long toolSessionId, Long learnerId) {
+    public ToolOutput getToolOutput(String name, IDokumaranService dokumaranService, Long toolSessionId,
+	    Long learnerId) {
 	if (name != null) {
 	    String[] nameParts = splitConditionName(name);
-//	    if (DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME.equals(nameParts[0])) {
-//		List<DokumaranItem> items = dokumaranService.getDokumaranItemsBySessionId(toolSessionId);
-//		List<DokumaranItem> uploadedItems = new ArrayList<DokumaranItem>(items.size());
-//		for (DokumaranItem item : items) {
-//		    if (!item.isCreateByAuthor()) {
-//			uploadedItems.add(item);
-//		    }
-//		}
-//		SimpleURL[] uploadedItemUrls = new SimpleURL[uploadedItems.size()];
-//		int uploadedItemIndex = 0;
-//		if (!uploadedItems.isEmpty()) {
-//		    String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
-//		    for (DokumaranItem uploadedItem : uploadedItems) {
-//
-//			String path = uploadedItem.getUrl();
-//			if (path == null) {
-//			    path = serverUrl + "download/?uuid=" + uploadedItem.getFileUuid() + "&preferDownload=false&"
-//				    + AttributeNames.PARAM_TOOL_CONTENT_HANDLER_NAME + "="
-//				    + DokumaranConstants.TOOL_CONTENT_HANDLER_NAME;
-//
-//			}
-//			path = "javascript:var dummy = window.open('" + path + "','" + uploadedItem.getTitle()
-//				+ "','resizable,scrollbars')";
-//			SimpleURL url = new SimpleURL(uploadedItem.getTitle(), path);
-//			uploadedItemUrls[uploadedItemIndex] = url;
-//			uploadedItemIndex++;
-//		    }
-//		    return new ToolOutput(DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME,
-//			    getI18NText(DokumaranConstants.SHARED_ITEMS_DEFINITION_NAME, true), uploadedItemUrls, false);
-//		}
-//
-//	    }
-
+	    if (DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME.equals(nameParts[0])) {
+		return new ToolOutput(DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME,
+			getI18NText(DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, true), 0L);
+	    }
 	}
 	return null;
     }