Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	10 Oct 2016 00:31:05 -0000	1.1.2.1
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	26 Oct 2016 04:18:48 -0000	1.1.2.2
@@ -155,6 +155,14 @@
             insert="true"
             column="self_review"
         />
+
+        <property
+            name="notifyUsersOfResults"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="notify_users_of_results"
+        />
         
         <set 
         	name="ratingCriterias" 
Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.7.2.8 -r1.7.2.9
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	14 Oct 2016 03:43:01 -0000	1.7.2.8
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	26 Oct 2016 04:18:48 -0000	1.7.2.9
@@ -119,7 +119,7 @@
 label.step=Step {0} of {1}
 label.mark=Mark
 label.rank=Rank
-label.authoring.self.review=Allow Self Review
+label.self.review=Allow Self Review
 label.monitoring.num.of.comments={0} Comments
 label.monitoring.instructions.rank.all.learners=Learners needed to rank ALL the learners.
 label.monitoring.instructions.rank.some.learners=Learners needed to rank {0} learners.
@@ -132,4 +132,15 @@
 label.monitoring.number.learners=Number of learners
 label.monitoring.number.learners.finished=Number of learners finished
 label.monitoring.view=View {0}
-label.close=Close
\ No newline at end of file
+label.close=Close
+event.sent.results.subject=LAMS: {0} results were released 
+event.sent.results.body=<p>{0}<br/><br/>Your results are:</p><div>{1}</div><p>This message was send automatically, please do not reply to it.</p>
+event.sent.results.criteria.comment=<p><strong>{0}</strong>:<ul>{1}</ul></p>
+event.sent.results.criteria.star=<p><strong>{0}</strong> (Star): {1}</p><UL>{2}</UL>
+event.sent.results.criteria.hedge=<p><strong>{0}</strong> (Mark Hedging): {1} out of {2}</p>
+event.sent.results.criteria.rank=<p><strong>{0}</strong> (Rank): {1} out of {2}</p>
+event.sent.results.criteria.rankAll=<p><strong>{0}</strong> (Rank All): {1}</p>
+event.sent.results.no.results=No results
+msg.results.sent={0} Email(s) Sent
+button.email.results=Email Results
+label.notify.user.of.results=Notify Users of Results
\ No newline at end of file
Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.7.2.4 -r1.7.2.5
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	14 Oct 2016 03:43:01 -0000	1.7.2.4
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	26 Oct 2016 04:18:48 -0000	1.7.2.5
@@ -120,7 +120,7 @@
 label.step=Step {0} of {1}
 label.mark=Mark
 label.rank=Rank
-label.authoring.self.review=Allow Self Review
+label.self.review=Allow Self Review
 label.monitoring.num.of.comments={0} Comments
 label.monitoring.instructions.rank.all.learners=Learners needed to rank ALL the learners.
 label.monitoring.instructions.rank.some.learners=Learners needed to rank {0} learners.
@@ -133,4 +133,15 @@
 label.monitoring.number.learners=Number of learners
 label.monitoring.number.learners.finished=Number of learners finished
 label.monitoring.view=View {0}
-label.close=Close
\ No newline at end of file
+label.close=Close
+event.sent.results.subject=LAMS: {0} results were released 
+event.sent.results.body=<p>{0}<br/><br/>Your results are:</p><div>{1}</div><p>This message was send automatically, please do not reply to it.</p>
+event.sent.results.criteria.comment=<p><strong>{0}</strong>:<ul>{1}</ul></p>
+event.sent.results.criteria.star=<p><strong>{0}</strong> (Star): {1}<ul>{2}</ul></p>
+event.sent.results.criteria.hedge=<p><strong>{0}</strong> (Mark Hedging): {1} out of {2}</p>
+event.sent.results.criteria.rank=<p><strong>{0}</strong> (Rank): {1} out of {2}</p>
+event.sent.results.criteria.rankAll=<p><strong>{0}</strong> (Rank All): {1}</p>
+event.sent.results.no.results=No results
+msg.results.sent={0} Email(s) Sent
+button.email.results=Email Results
+label.notify.user.of.results=Notify Users of Results
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	23 Oct 2015 00:30:36 -0000	1.2.2.1
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	26 Oct 2016 04:18:49 -0000	1.2.2.2
@@ -65,7 +65,8 @@
    		<property name="messageService"><ref bean="peerreviewMessageService"/></property>
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		<property name="ratingService"><ref bean="ratingService"/></property> 
-    </bean>
+ 		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
+     </bean>
 
     <bean id="peerreviewService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	10 Oct 2016 00:31:05 -0000	1.2.2.3
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	26 Oct 2016 04:18:49 -0000	1.2.2.4
@@ -82,6 +82,8 @@
     
     private boolean selfReview;
 
+    private boolean notifyUsersOfResults;
+
     // **********************************************************
     // Function method for Peerreview
     // **********************************************************
@@ -392,4 +394,12 @@
     public void setSelfReview(boolean selfReview) {
         this.selfReview = selfReview;
     }
+    
+    public boolean isNotifyUsersOfResults() {
+        return notifyUsersOfResults;
+    }
+
+    public void setNotifyUsersOfResults(boolean notifyUsersOfResults) {
+        this.notifyUsersOfResults = notifyUsersOfResults;
+    }
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java,v
diff -u -r1.4.2.7 -r1.4.2.8
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	21 Oct 2016 04:22:30 -0000	1.4.2.7
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	26 Oct 2016 04:18:49 -0000	1.4.2.8
@@ -30,14 +30,12 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.rating.ToolRatingManager;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
-import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
@@ -272,4 +270,10 @@
      */
     List<Object[]> getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, String searchString);
 
- }
+    /** Send an email with the user's results to each user in the session */
+    int emailReportToSessionUsers(Long toolContentId, Long sessionId);
+
+    /** Send an email with the user's results to the specified user in the session */
+    int emailReportToUser(Long toolContentId, Long sessionId, Long userId);
+
+}
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java,v
diff -u -r1.7.2.14 -r1.7.2.15
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	21 Oct 2016 04:22:30 -0000	1.7.2.14
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	26 Oct 2016 04:18:49 -0000	1.7.2.15
@@ -23,13 +23,13 @@
 
 package org.lamsfoundation.lams.tool.peerreview.service;
 
+import java.security.InvalidParameterException;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -45,6 +45,8 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.events.AbstractDeliveryMethod;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -54,6 +56,7 @@
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
+import org.lamsfoundation.lams.rating.dto.StyledRatingDTO;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.rating.service.IRatingService;
@@ -72,7 +75,6 @@
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewUserDAO;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
-import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
@@ -115,6 +117,8 @@
     private ICoreNotebookService coreNotebookService;
 
     private IRatingService ratingService;
+    
+    private IEventNotificationService eventNotificationService;
 
     private SortedSet<Long> creatingUsersForSessionIds;
 
@@ -431,7 +435,112 @@
 	
 	return rawData;
     }
-    
+
+    @Override
+    public int emailReportToSessionUsers(Long toolContentId, Long sessionId) {
+	List<PeerreviewUser> users = peerreviewUserDao.getBySessionID(sessionId);
+	Peerreview peerreview = getPeerreviewByContentId(toolContentId);
+	String subject = getResultsEmailSubject(peerreview);
+	List<RatingCriteria> criterias = getRatingCriterias(toolContentId);
+	int numEmailsSent = 0;
+	for (PeerreviewUser user : users) {
+	    if (emailReport(toolContentId, sessionId, user, peerreview, criterias, subject) != 1) {
+		log.error("Unable to email to all users in session " + sessionId + ". Have processed " + numEmailsSent
+			+ " so far.");
+		return -1;
+	    }
+	    numEmailsSent++;
+	}
+	return numEmailsSent;
+    }
+
+    @Override
+    public int emailReportToUser(Long toolContentId, Long sessionId, Long userId) {
+
+	PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndSessionID(userId, sessionId);
+	Peerreview peerreview = getPeerreviewByContentId(toolContentId);
+	return emailReport(toolContentId, sessionId, user, peerreview, getRatingCriterias(toolContentId),
+		getResultsEmailSubject(peerreview));
+    }
+
+    private String getResultsEmailSubject(Peerreview peerreview) {
+	return getLocalisedMessage("event.sent.results.subject", new Object[] { peerreview.getTitle() });
+    }
+
+    private int emailReport(Long toolContentId, Long sessionId, PeerreviewUser user, Peerreview peerreview, List<RatingCriteria> ratingCriterias, String subject) {
+
+	int userId = user.getUserId().intValue();
+	String name = StringEscapeUtils.escapeCsv(user.getFirstName()+" "+user.getLastName());
+	
+	    StringBuilder notificationMessage = new StringBuilder();
+
+	    for (RatingCriteria criteria : ratingCriterias) {
+		int sorting = PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC;
+		if (criteria.isRankingStyleRating())
+		    sorting = PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC;
+		StyledCriteriaRatingDTO dto = getUsersRatingsCommentsByCriteriaIdDTO(toolContentId, sessionId, criteria,
+			user.getUserId(), false, sorting, null, true, false);
+		generateRatingEntryForEmail(notificationMessage, criteria, dto);
+	    }
+
+	    eventNotificationService.sendMessage(null, 
+		    userId, 
+		    IEventNotificationService.DELIVERY_METHOD_MAIL,
+		    subject, 
+		    getLocalisedMessage("event.sent.results.body", new Object[]{name, notificationMessage.toString()}), 
+		    true);
+
+	    return 1;
+
+    }
+
+    private void generateRatingEntryForEmail(StringBuilder notificationMessage, RatingCriteria criteria,
+	    StyledCriteriaRatingDTO dto) {
+	if (dto.getRatingDtos().size() >= 1) {
+	    if (criteria.isCommentRating()) {
+		StringBuilder comments = new StringBuilder();
+		for (StyledRatingDTO ratingDto : dto.getRatingDtos()) {
+		    if (ratingDto.getComment() != null)
+			comments.append("<li>").append(ratingDto.getComment()).append("</li>");
+		}
+		notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.comment", new Object[] {
+			dto.getRatingCriteria().getTitle(), comments.toString() }));
+	    } else {
+		String avgRating = dto.getRatingDtos().get(0).getAverageRating().length() > 0 ? dto.getRatingDtos()
+			.get(0).getAverageRating() : "0";
+		StringBuilder comments = null;
+		if (criteria.isStarStyleRating()) {
+		    if (criteria.isCommentsEnabled()) {
+			comments = new StringBuilder();
+			for (StyledRatingDTO ratingDto : dto.getRatingDtos()) {
+			    if (ratingDto.getComment() != null)
+				comments.append("<li>").append(ratingDto.getComment()).append("</li>");
+			}
+		    }
+		    notificationMessage.append(getLocalisedMessage(
+			    "event.sent.results.criteria.star",
+			    new Object[] { dto.getRatingCriteria().getTitle(), avgRating,
+				    comments != null ? comments.toString() : "" }));
+		} else if (criteria.isRankingStyleRating()) {
+		    if (criteria.getMaxRating() > 0) {
+			notificationMessage
+				.append(getLocalisedMessage("event.sent.results.criteria.rank", new Object[] {
+					dto.getRatingCriteria().getTitle(), avgRating, criteria.getMaxRating() }));
+		    } else {
+			notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.rankAll",
+				new Object[] { dto.getRatingCriteria().getTitle(), avgRating }));
+		    }
+		} else { // hedge style rating
+		    notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.hedge", new Object[] {
+			    dto.getRatingCriteria().getTitle(), avgRating, criteria.getMaxRating() }));
+		}
+	    }
+	} else {
+	    notificationMessage.append(dto.getRatingCriteria().getTitle()).append(
+		    getLocalisedMessage("event.sent.results.no.results", null));
+	}
+	notificationMessage.append("\n");
+    }
     // *****************************************************************************
     // private methods
     // *****************************************************************************
@@ -842,6 +951,10 @@
 
     // ****************** REST methods *************************
 
+    public void setEventNotificationService(IEventNotificationService eventNotificationService) {
+        this.eventNotificationService = eventNotificationService;
+    }
+
     /**
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions, peerreview,
      * user fields firstName, lastName and loginName Peerreview must contain a JSONArray of JSONObject objects, which
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java,v
diff -u -r1.2.2.7 -r1.2.2.8
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java	21 Oct 2016 04:22:43 -0000	1.2.2.7
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java	26 Oct 2016 04:18:49 -0000	1.2.2.8
@@ -55,6 +55,7 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -90,6 +91,12 @@
 	if (param.equals("getReflections")) {
 	    return getReflections(mapping, form, request, response);
 	}
+	if (param.equals("sendResultsToUser")) {
+	    return sendResultsToUser(mapping, form, request, response);
+	}
+	if (param.equals("sendResultsToSessionUsers")) {
+	    return sendResultsToSessionUsers(mapping, form, request, response);
+	}
 
 	return mapping.findForward(PeerreviewConstants.ERROR);
     }
@@ -127,6 +134,7 @@
 	
 	List<RatingCriteria> criterias = service.getRatingCriterias(contentId);
 	request.setAttribute(PeerreviewConstants.ATTR_CRITERIAS, criterias);
+	
 	return mapping.findForward(PeerreviewConstants.SUCCESS);
     }
 
@@ -203,6 +211,7 @@
 
 	JSONArray rows = new JSONArray();
 
+	String emailResultsText = service.getLocalisedMessage("button.email.results", null);
 	if (criteria.isCommentRating()) {
 	    // special db lookup just for this - gets the user's & how many comments left for them
 	    List<Object[]> rawRows = service.getCommentsCounts(toolContentId, toolSessionId, criteria, page, size,
@@ -218,8 +227,11 @@
 		int numComments = numCommentsNumber != null ? numCommentsNumber.intValue() : 0;
 		if (numComments > 0) {
 		    cell.put("rating", service.getLocalisedMessage("label.monitoring.num.of.comments", new Object[] { numComments }));
+		    cell.put("email", generateResultsButton(toolSessionId, rawRow[0], emailResultsText));
 		} else {
 		    cell.put("rating", "");
+		    cell.put("email", "");
+
 		}
 
 		JSONObject row = new JSONObject();
@@ -251,8 +263,10 @@
 			starString += msg;
 			starString += "</div>";
 			rawRow.put("rating", starString);
+			rawRow.put("email", generateResultsButton(toolSessionId, (Long) rawRow.get("itemId"), emailResultsText));
 		    } else {
 			rawRow.put("rating", averageRating);
+			rawRow.put("email", generateResultsButton(toolSessionId, (Long) rawRow.get("itemId"), emailResultsText));
 		    }
 		}
 		JSONObject row = new JSONObject();
@@ -268,6 +282,17 @@
 	return null;
     }
 
+    private String generateResultsButton(Object toolSessionId, Object userId, String emailResultsText) {
+	return new StringBuilder("<a href=\"javascript:sendResultsForLearner(")
+		.append(toolSessionId)
+		.append(", ")
+		.append(userId)
+		.append(")\" class=\"btn btn-default btn-xs email-button\">")
+		.append(emailResultsText)
+		.append("</a>")
+		.toString();
+    }
+
     private ActionForward getSubgridData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws JSONException, IOException {
 	IPeerreviewService service = getPeerreviewService();
@@ -314,7 +339,9 @@
 		    JSONArray userData = new JSONArray();
 		    userData.put(i);
 		    userData.put(ratingDetails[4]);
-		    userData.put(StringEscapeUtils.escapeHtml(comment));
+		    String commentText = StringEscapeUtils.escapeHtml(comment);
+		    commentText = StringUtils.replace(commentText, "&lt;BR&gt;", "<BR/>");
+		    userData.put(commentText);
 		    userData.put("Comments");
 
 		    JSONObject userRow = new JSONObject();
@@ -392,7 +419,7 @@
 		sorting = PeerreviewConstants.SORT_BY_NOTEBOOK_ENTRY_ASC;
 	    }
 	}
-	
+
 	String searchString = WebUtil.readStrParam(request, "itemDescription", true);
 
 	// setting date format to ISO8601 for jquery.timeago 
@@ -451,7 +478,42 @@
 	return null;
     }
 
-    
+    private ActionForward sendResultsToUser(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
+	return sendResults(mapping, request, response, true);
+    }
+
+    private ActionForward sendResultsToSessionUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
+	return sendResults(mapping, request, response, false);
+    }
+
+    private ActionForward sendResults(ActionMapping mapping, HttpServletRequest request,
+		    HttpServletResponse response, boolean oneUserOnly) throws JSONException, IOException {
+
+	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+	Long contentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+	Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+	IPeerreviewService service = getPeerreviewService();
+	int numEmailsSent = 0;
+	
+	if ( oneUserOnly) {
+	    Long userId = WebUtil.readLongParam(request, PeerreviewConstants.PARAM_USERID);
+	    numEmailsSent = service.emailReportToUser(contentId, toolSessionId, userId);
+	} else {
+	    numEmailsSent = service.emailReportToSessionUsers(contentId, toolSessionId);
+	}
+
+	response.setContentType("text/html;charset=utf-8");
+	response.getWriter().write(service.getLocalisedMessage("msg.results.sent", new Object[] { numEmailsSent }));
+	return null;
+    }
+
     // *************************************************************************************
     // Private method
     // *************************************************************************************
Index: lams_tool_preview/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_tool_preview/web/WEB-INF/struts-config.xml	17 Oct 2016 08:16:59 -0000	1.1.2.5
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	26 Oct 2016 04:18:49 -0000	1.1.2.6
@@ -193,6 +193,15 @@
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
 			parameter="getReflections" >
 		</action>
+		<action path="/monitoring/sendResultsToUser"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="sendResultsToUser" >
+		</action>
+		<action path="/monitoring/sendResultsToSessionUsers"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="sendResultsToSessionUsers" >
+		</action>
+		
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.ClearSessionAction">
Index: lams_tool_preview/web/includes/css/learning.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/includes/css/learning.css,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_tool_preview/web/includes/css/learning.css	10 Oct 2016 00:31:05 -0000	1.1.2.5
+++ lams_tool_preview/web/includes/css/learning.css	26 Oct 2016 04:18:49 -0000	1.1.2.6
@@ -51,8 +51,19 @@
 
 .ui-jqgrid td {
 	border-style: none !important;
+	padding: 0px 4px 4px 4px;
 }
 
+.ui-jqgrid tr.jqgrow td {
+	padding: 8px 8px 8px 8px;
+	white-space: normal !important;
+}
+
+.ui-jqgrid .ui-jqgrid-view {
+	font-size: 14px;
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+
 .divrankx {
     width: 300px;
     height: 30px;
@@ -77,3 +88,6 @@
   	background-color: #337ab7;
 }
 
+.email-button {
+	margin: 2px;
+}
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/advance.jsp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_preview/web/pages/authoring/advance.jsp	10 Oct 2016 00:31:04 -0000	1.1.2.3
+++ lams_tool_preview/web/pages/authoring/advance.jsp	26 Oct 2016 04:18:48 -0000	1.1.2.4
@@ -32,10 +32,17 @@
 
 	<div class="checkbox">
 	<label for="self-review"><html:checkbox property="peerreview.selfReview" styleId="self-review"/>
-	<fmt:message key="label.authoring.self.review" />
+	<fmt:message key="label.self.review" />
 	</label>
 	</div>
 
+	<div class="checkbox">
+	<label for="notify-users-of-results"><html:checkbox property="peerreview.notifyUsersOfResults" styleId="notify-users-of-results"/>
+	<fmt:message key="label.notify.user.of.results" />
+	</label>
+	</div>
+
+
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.activity.completion">
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/Attic/star.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/learning/star.jsp	10 Oct 2016 00:31:04 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/learning/star.jsp	26 Oct 2016 04:18:49 -0000	1.1.2.2
@@ -73,8 +73,6 @@
 			    			$("#no-users-info").show();
 			    		}
 
-						debugger;
-
 						for (i = 0; i < data.rows.length; i++){
 							var userData = data.rows[i];
 							var itemId = userData["itemId"];
@@ -178,7 +176,6 @@
 	}
 	
 	function onRatingSuccessCallback() {
-		debugger;
 		var numItems = $("#count-rated-items").html();
 		if ( ${criteriaRatings.ratingCriteria.minimumRates} <= 0 || numItems >=  ${criteriaRatings.ratingCriteria.minimumRates} )
 			$("#finishButton").css("visibility", "visible");
Index: lams_tool_preview/web/pages/monitoring/advanceoptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/monitoring/advanceoptions.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/monitoring/advanceoptions.jsp	17 May 2016 04:37:37 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/monitoring/advanceoptions.jsp	26 Oct 2016 04:18:49 -0000	1.1.2.2
@@ -23,46 +23,46 @@
 	
 	<tr>
 		<td>
-			<fmt:message key="label.minimum" />
+			<fmt:message key="label.show.ratings.left.for.user" />
 		</td>
 		
 		<td>
 			<c:choose>
-				<c:when test="${sessionMap.peerreview.minimumRates == 0}">
-					<fmt:message key="label.no.minimum" />
+				<c:when test="${sessionMap.peerreview.showRatingsLeftForUser}">
+					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
-					${sessionMap.imageGallery.minimumRates}
+					<fmt:message key="label.off" />
 				</c:otherwise>
 			</c:choose>	
 		</td>
 	</tr>
-		
+	
 	<tr>
 		<td>
-			<fmt:message key="label.maximum" />
+			<fmt:message key="label.self.review" />
 		</td>
-			
+		
 		<td>
 			<c:choose>
-				<c:when test="${sessionMap.peerreview.maximumRates == 0}">
-					<fmt:message key="label.no.maximum" />
+				<c:when test="${sessionMap.peerreview.selfReview}">
+					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
-					${sessionMap.imageGallery.maximumRates}
+					<fmt:message key="label.off" />
 				</c:otherwise>
 			</c:choose>	
 		</td>
 	</tr>
-	
+		
 	<tr>
 		<td>
-			<fmt:message key="label.show.ratings.left.for.user" />
+			<fmt:message key="label.notify.user.of.results" />
 		</td>
-		
+			
 		<td>
 			<c:choose>
-				<c:when test="${sessionMap.peerreview.showRatingsLeftForUser}">
+				<c:when test="${sessionMap.peerreview.notifyUsersOfResults}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/monitoring/Attic/criteria.jsp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	21 Oct 2016 04:23:27 -0000	1.1.2.3
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	26 Oct 2016 04:18:49 -0000	1.1.2.4
@@ -11,22 +11,6 @@
 	</title>
 	<%@ include file="/common/header.jsp"%>
 
-	<style media="screen,projection" type="text/css">
-		 .ui-jqgrid {
-			border-left-style: none !important;
-			border-right-style: none !important;
-			border-bottom-style: none !important;
-		}
-		
-		.ui-jqgrid tr {
-			border-left-style: none !important;
-		}
-		
-		.ui-jqgrid td {
-			border-style: none !important;
-		}
-	</style>
-
 	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/monitoring/Attic/criteriapart.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	21 Oct 2016 04:23:27 -0000	1.1.2.2
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	26 Oct 2016 04:18:48 -0000	1.1.2.3
@@ -28,11 +28,15 @@
 			   	colNames:[
 						'itemId',
 						'<fmt:message key="label.user.name" />',
-						'${heading}'				],
+						'${heading}'
+						<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">, ''</c:if>
+				],
 			   	colModel:[
 			   		{name:'itemId', index:'itemId', width:0, hidden: true},
 			   		{name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false }},
 			   		{name:'rating', index:'rating', width:100, align:"center", search:false}
+					<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">, {name:'email', index:'email', width:100, align:"center", search:false}</c:if>
+			   		
 			   	],
 			   	rowNum:10,
 			   	rowList:[10,20,30,40,50,100],
@@ -78,10 +82,10 @@
 							'criteriaId'
 							],
 						colModel:[
-						   {name:'id', index:'id', hidden:true},
-						   {name:'userName',index:'userName'},
-						   {name:'rating', index:'rating', width:140, align:"center"},
-						   {name:'criteriaId', hidden:true}
+						   {name:'id', index:'id', width:0, hidden:true},
+						   {name:'userName', index:'userName', width:100 },
+						   {name:'rating', index:'rating', width:200, align:"center"},
+						   {name:'criteriaId', width:0, hidden:true}
 						],
 						loadError: function(xhr,st,err) {
 					    	jQuery("#"+subgridTableId).clearGridData();
@@ -115,6 +119,27 @@
         
 	});
 	
+	function sendResultsForLearner(sessionId, userId) {
+		var url = "<c:url value="/monitoring/sendResultsToUser.do"/>";
+		$("#messageArea2").html("");
+		$("#messageArea2_Busy").show();
+		$("#messageArea2").load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}",
+				toolContentID: ${sessionMap.toolContentID},
+				toolSessionId: sessionId, 
+				userID: userId,
+				reqID: (new Date()).getTime()
+			},
+			function() {
+				$("#messageArea2_Busy").hide();
+			}
+		);
+		return false;
+	}
+
+
 </script>
 
 <!--For send results feature-->
Index: lams_tool_preview/web/pages/monitoring/reflections.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/monitoring/reflections.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_tool_preview/web/pages/monitoring/reflections.jsp	21 Oct 2016 04:23:27 -0000	1.1.2.4
+++ lams_tool_preview/web/pages/monitoring/reflections.jsp	26 Oct 2016 04:18:49 -0000	1.1.2.5
@@ -25,8 +25,6 @@
 	
 	$(document).ready(function(){
 
-			debugger;
-			
 			jQuery("#group${toolSessionId}").jqGrid({
 			   	url: "<c:url value='/monitoring/getReflections.do'/>?toolSessionId=${toolSessionId}&sessionMapID=${sessionMapID}",
 				datatype: "json",
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/monitoring/summary.jsp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- lams_tool_preview/web/pages/monitoring/summary.jsp	14 Oct 2016 03:43:01 -0000	1.5.2.4
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	26 Oct 2016 04:18:49 -0000	1.5.2.5
@@ -8,22 +8,6 @@
 <link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 <link rel="stylesheet" href="<html:rewrite page='/includes/css/learning.css'/>">
 
-<style media="screen,projection" type="text/css">
-	 .ui-jqgrid {
-		border-left-style: none !important;
-		border-right-style: none !important;
-		border-bottom-style: none !important;
-	}
-	
-	.ui-jqgrid tr {
-		border-left-style: none !important;
-	}
-	
-	.ui-jqgrid td {
-		border-style: none !important;
-	}
-</style>
-
 <script type="text/javascript">
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/";
@@ -38,6 +22,25 @@
 	COMMENT_TEXTAREA_TIP_LABEL = '',
 	WARN_COMMENTS_IS_BLANK_LABEL = '',
 	WARN_MIN_NUMBER_WORDS_LABEL = '';
+	
+	function sendResults(sessionId) {
+		var url = "<c:url value="/monitoring/sendResultsToSessionUsers.do"/>";
+		$("#messageArea").html("");
+		$("#messageArea_Busy").show();
+		$("#messageArea").load(
+			url,
+			{
+				sessionMapID: "${sessionMapID}",
+				toolContentID: ${sessionMap.toolContentID},
+				toolSessionId: sessionId, 
+				reqID: (new Date()).getTime()
+			},
+			function() {
+				$("#messageArea_Busy").hide();
+			}
+		);
+		return false;
+	}
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
@@ -59,6 +62,10 @@
 		</lams:Alert>
 	</c:if>
 	
+	<!--For send results feature-->
+	<i class="fa fa-spinner" style="display:none" id="messageArea_Busy"></i>
+	<div class="voffset5" id="messageArea"></div>
+	
 </div>
 
 <c:if test="${sessionMap.isGroupedActivity}">
@@ -81,7 +88,7 @@
 	</c:if>
 	
 	<c:choose>
-		<c:when test="${not empty criterias && fn:length(criterias) eq 1 && not sessionMap.peerreview.reflectOnActivity}">
+		<c:when test="${not empty criterias && fn:length(criterias) eq 1}">
 			<c:forEach var="criteria" items="${criterias}">
 			<h4>${criteria.title}</h4>
 			<c:set var="toolSessionId" value="${groupSummary.sessionId}" scope="request"/>
@@ -96,14 +103,23 @@
 				<a href="javascript:launchPopup('${url}')" class="btn btn-default voffset5 loffset5">
 					<fmt:message key="label.monitoring.view"><fmt:param>${criteria.title}</fmt:param></fmt:message></a>
 			</c:forEach>
-			<c:if test="${sessionMap.peerreview.reflectOnActivity}">
-				<c:set var='url'>reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}</c:set>
-				<a href="javascript:launchPopup('${url}')" class="btn btn-default voffset5 loffset5"><fmt:message key="title.reflection"/></a>
-			</c:if>
 			<div class="voffset5">&nbsp;</div>
 		</c:otherwise>
 	</c:choose>
 
+	<c:if test="${sessionMap.peerreview.reflectOnActivity || sessionMap.peerreview.notifyUsersOfResults}">
+	<div id="btns${groupSummary.sessionId}">
+		<c:if test="${sessionMap.peerreview.reflectOnActivity}">
+			<c:set var='url'>reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}</c:set>
+			<a href="javascript:launchPopup('${url}')" class="btn btn-default voffset5"><fmt:message key="title.reflection"/></a>
+		<c:set var="offset" value=" loffset5"/>
+		</c:if>
+		<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">
+			<a href="javascript:sendResults(${groupSummary.sessionId})" class="btn btn-default voffset5 ${offset}">Send Results To Learners</a>
+		</c:if>
+	</div>
+	</c:if>
+	
 	<c:if test="${sessionMap.isGroupedActivity}">
 		</div> <!-- end collapse area  -->
 		</div> <!-- end collapse panel  -->