SAK-32000 Notify to students about the instructor's comments (sakaipr…

…oject#3752)
DaweiXia · Jan 18, 2017 · 1eef090 · 1eef090
1 parent dc1d397
commit 1eef090
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java b/...assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
@@ -2982,6 +2982,11 @@ private String htmlContentReleaseGrade(AssignmentSubmission s)
 		String linkToToolInSite = "<a href=\"" + developerHelperService.getToolViewURL( "sakai.assignment.grades", null, null, null ) + "\">" + siteTitle + "</a>";
 		buffer.append(rb.getFormattedMessage("noti.releasegrade.text", new String[]{a.getTitle(), linkToToolInSite}));
 
+		// Instructor's comments
+		buffer.append(newline + newline);
+		buffer.append(rb.getString("gen.instrcomment") + newline);
+		buffer.append(s.getFeedbackComment() + newline);
+
 		return buffer.toString();
 	}
 	private String htmlContentReleaseResubmission(AssignmentSubmission s){
@@ -3017,8 +3022,13 @@ private String htmlContentReleaseResubmission(AssignmentSubmission s){
 		else {
 		    buffer.append(rb.getFormattedMessage("noti.releaseresubmission.noresubmit.text", new String[]{a.getTitle(), linkToToolInSite}));
 		}
-
-	 	return buffer.toString();
+
+		// Instructor's comments
+		buffer.append(newline + newline);
+		buffer.append(rb.getString("gen.instrcomment") + newline);
+		buffer.append(s.getFeedbackComment() + newline);
+
+		return buffer.toString();
 	}
 
 	private String htmlContentAttachments(AssignmentSubmission s){