Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -r3ad974a50e8f8ea860adfb727bd1bf12831cac94 --- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision eba4bfd253009e2910ee42d7852a05004f14b26d) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3ad974a50e8f8ea860adfb727bd1bf12831cac94) @@ -124,6 +124,7 @@ monitor.summary.date.restriction.removed = Deadline has been removed monitoring.user.submittedFiles = Submitted files output.desc.submitted.items.output.definition.sbmt = Files submitted in the Submit Files tool +output.desc.manual.grading = Manual grading button.submit = Finish label.monitoring.file.delete = Delete mark file label.file.options = File options Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java =================================================================== diff -u -r4654c7f895cb17f331b95703cedca34e1ab106be -r3ad974a50e8f8ea860adfb727bd1bf12831cac94 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java (.../SbmtConstants.java) (revision 4654c7f895cb17f331b95703cedca34e1ab106be) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java (.../SbmtConstants.java) (revision 3ad974a50e8f8ea860adfb727bd1bf12831cac94) @@ -21,8 +21,6 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.sbmt; public interface SbmtConstants { @@ -70,33 +68,33 @@ public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish"; public static final String PARAM_MIN_UPLOAD = "minUpload"; - + public static final String ATTR_GROUP_USERS = "groupUsers"; - + public static final String ATTR_USE_SEL_LEADER = "useSelectLeaderToolOuput"; - + public static final String ATTR_GROUP_LEADER = "groupLeader"; public static final String ATTR_IS_MAX_LIMIT_UPLOAD_ENABLED = "isMaxLimitUploadEnabled"; public static final String ATTR_MAX_LIMIT_UPLOAD_NUMBER = "maxLimitUploadNumber"; - + public static final String ATTR_MIN_LIMIT_UPLOAD_NUMBER = "minLimitUploadNumber"; public static final String ATTR_MAX_LIMIT_REACHED = "maxLimitReached"; public static final String ATTR_USER_FINISHED = "userFinished"; - public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; - + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; + public static final String ATTR_IS_MARKS_RELEASED = "isMarksReleased"; - + public static final String ATTR_SUBMIT_FILES = "submittedFilesMap"; - + public static final String ATTR_IS_USER_LEADER = "isUserLeader"; - + public static final String ATTR_HAS_EDIT_RIGHT = "hasEditRight"; - + public static final String PARAM_WAITING_MESSAGE_KEY = "waitingMessageKey"; public static final String ATTR_UPLOAD_MAX_FILE_SIZE = "uploadMaxFileSize"; @@ -112,9 +110,10 @@ public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARKED_FILE = "notify_learners_on_marked_file"; public static final String SUBMITTED_ITEMS_DEFINITION_NAME = "submitted.items.output.definition.sbmt"; + public static final String MANUAL_GRADING_DEFINITION_NAME = "manual.grading"; public static final String AUDIT_LOG_MODULE_NAME = "Submit Files"; - + public static final int SORT_BY_NO = 1; public static final int SORT_BY_USERNAME_ASC = 2; public static final int SORT_BY_USERNAME_DESC = 3; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java =================================================================== diff -u -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d -r3ad974a50e8f8ea860adfb727bd1bf12831cac94 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java (.../SubmitFilesOutputFactory.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java (.../SubmitFilesOutputFactory.java) (revision 3ad974a50e8f8ea860adfb727bd1bf12831cac94) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.sbmt.service; import java.util.List; @@ -44,10 +43,15 @@ @Override public SortedMap getToolOutputDefinitions(Object toolContentObject, int definitionType) throws ToolException { - TreeMap definitionMap = new TreeMap(); + TreeMap definitionMap = new TreeMap<>(); Class arrayOfSimpleUrlArrayClass = SimpleURL[][].class; switch (definitionType) { case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION: + ToolOutputDefinition manualGradingDefinition = buildRangeDefinition( + SbmtConstants.MANUAL_GRADING_DEFINITION_NAME, 0L, 100L, true); + manualGradingDefinition.setWeightable(true); + manualGradingDefinition.setShowConditionNameOnly(true); + definitionMap.put(SbmtConstants.MANUAL_GRADING_DEFINITION_NAME, manualGradingDefinition); break; case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW: ToolOutputDefinition itemsSubmittedDefinition = buildComplexOutputDefinition( @@ -64,12 +68,14 @@ public SortedMap getToolOutput(List names, ISubmitFilesService submitFilesService, Long toolSessionId, Long learnerId) { - TreeMap outputs = new TreeMap(); + TreeMap outputs = new TreeMap<>(); // tool output cache - TreeMap baseOutputs = new TreeMap(); + TreeMap baseOutputs = new TreeMap<>(); if (names == null) { outputs.put(SbmtConstants.SUBMITTED_ITEMS_DEFINITION_NAME, getToolOutput( SbmtConstants.SUBMITTED_ITEMS_DEFINITION_NAME, submitFilesService, toolSessionId, learnerId)); + outputs.put(SbmtConstants.MANUAL_GRADING_DEFINITION_NAME, getToolOutput( + SbmtConstants.MANUAL_GRADING_DEFINITION_NAME, submitFilesService, toolSessionId, learnerId)); } else { for (String name : names) { String[] nameParts = splitConditionName(name); @@ -123,8 +129,11 @@ return new ToolOutput(SbmtConstants.SUBMITTED_ITEMS_DEFINITION_NAME, getI18NText(SbmtConstants.SUBMITTED_ITEMS_DEFINITION_NAME, true), usersAndUrls, false); } + } else if (SbmtConstants.MANUAL_GRADING_DEFINITION_NAME.equals(nameParts[0])) { + return new ToolOutput(SbmtConstants.MANUAL_GRADING_DEFINITION_NAME, + getI18NText(SbmtConstants.MANUAL_GRADING_DEFINITION_NAME, true), 0L); } } return null; } -} +} \ No newline at end of file