Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java,v
diff -u -r1.20.2.8 -r1.20.2.9
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	4 Apr 2017 12:27:05 -0000	1.20.2.8
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	17 May 2017 01:26:55 -0000	1.20.2.9
@@ -122,7 +122,7 @@
      */
     Set<ImageGalleryItem> getImagesForGroup(ImageGallery imageGallery, Long sessionId);
 
-    ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId);
+    ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long toolSessionId, Long imageUid, Long userId);
 
     /**
      * Save/update current ImageGalleryItem.
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java,v
diff -u -r1.7.2.4 -r1.7.2.5
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	11 May 2016 07:15:19 -0000	1.7.2.4
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	17 May 2017 01:26:55 -0000	1.7.2.5
@@ -211,7 +211,7 @@
 
 	    boolean isCommentsByOtherUsersRequired = user == null;
 	    Long userId = user == null ? -1L : user.getUserId();
-	    List<ItemRatingDTO> ratingCriteriaDtos = imageGalleryService.getRatingCriteriaDtos(contentId, itemIds,
+	    List<ItemRatingDTO> ratingCriteriaDtos = imageGalleryService.getRatingCriteriaDtos(contentId, session.getSessionId(), itemIds,
 		    isCommentsByOtherUsersRequired, userId);
 
 	    if (user != null) {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v
diff -u -r1.31.2.24 -r1.31.2.25
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	4 Apr 2017 12:27:05 -0000	1.31.2.24
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	17 May 2017 01:26:55 -0000	1.31.2.25
@@ -344,19 +344,19 @@
     }
 
     @Override
-    public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId) {
+    public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long toolSessionId, Long imageUid, Long userId) {
 
 	LinkedList<Long> itemIds = new LinkedList<Long>();
 	itemIds.add(imageUid);
-	ItemRatingDTO ratingCriteria = getRatingCriteriaDtos(contentId, itemIds, true, userId).get(0);
+	ItemRatingDTO ratingCriteria = getRatingCriteriaDtos(contentId, toolSessionId, itemIds, true, userId).get(0);
 
 	return ratingCriteria;
     }
 
     @Override
-    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
-	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId);
+	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
     }
 
     @Override
@@ -411,7 +411,7 @@
 		final boolean IS_COMMENTS_BY_OTHER_USERS_REQUIRED = true;
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TODO calculate average ratings based on one
 		// session data
-		itemRatingDtos = getRatingCriteriaDtos(contentId, itemIds, IS_COMMENTS_BY_OTHER_USERS_REQUIRED,
+		itemRatingDtos = getRatingCriteriaDtos(contentId, session.getSessionId(), itemIds, IS_COMMENTS_BY_OTHER_USERS_REQUIRED,
 			USER_ID);
 	    }
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java,v
diff -u -r1.27.2.14 -r1.27.2.15
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	30 Mar 2017 13:35:34 -0000	1.27.2.14
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	17 May 2017 01:26:55 -0000	1.27.2.15
@@ -434,9 +434,11 @@
 	int commentsMinWordsLimit = 0;
 	boolean isCommentsEnabled = false;
 	int countRatedImages = 0;
+	Long toolSessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID);
+	
 	if (imageGallery.isAllowRank()) {
 
-	    ItemRatingDTO itemRatingDto = service.getRatingCriteriaDtos(imageGallery.getContentId(), imageUid, userId);
+	    ItemRatingDTO itemRatingDto = service.getRatingCriteriaDtos(imageGallery.getContentId(), toolSessionId, imageUid, userId);
 	    sessionMap.put(AttributeNames.ATTR_ITEM_RATING_DTO, itemRatingDto);
 
 	    if (itemRatingDto != null) {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java,v
diff -u -r1.9.2.7 -r1.9.2.8
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	30 Mar 2017 13:35:34 -0000	1.9.2.7
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	17 May 2017 01:26:55 -0000	1.9.2.8
@@ -144,14 +144,15 @@
 	ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY);
 	Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID));
 	ImageGalleryItem image = getImageGalleryService().getImageGalleryItemByUid(imageUid);
-
+	Long toolSessionId = WebUtil.readLongParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
+	
 	if (imageGallery.isAllowVote()) {
 	    List<List<UserImageContributionDTO>> imageSummary = getImageGalleryService().getImageSummary(contentId,
 		    imageUid);
 	    request.setAttribute(ImageGalleryConstants.ATTR_IMAGE_SUMMARY, imageSummary);
 
 	} else if (imageGallery.isAllowRank()) {
-	    ItemRatingDTO itemRatingDto = getImageGalleryService().getRatingCriteriaDtos(contentId, imageUid, -1L);
+	    ItemRatingDTO itemRatingDto = getImageGalleryService().getRatingCriteriaDtos(contentId, toolSessionId, imageUid, -1L);
 	    request.setAttribute("itemRatingDto", itemRatingDto);
 	}
 
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/parts/commentsarea.jsp,v
diff -u -r1.12.2.11 -r1.12.2.12
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	28 Mar 2017 10:36:35 -0000	1.12.2.11
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	17 May 2017 01:26:55 -0000	1.12.2.12
@@ -9,6 +9,7 @@
 <c:set var="imageGallery" value="${sessionMap.imageGallery}" />
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="isImageSelected" value="${not empty sessionMap.currentImage}" />
+<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <c:if test="${isImageSelected}">
@@ -26,7 +27,9 @@
 		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>';
+		WARN_MIN_NUMBER_WORDS_LABEL = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>',
+		ALLOW_RERATE = false,
+		SESSION_ID = ${toolSessionID};
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 </c:if>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/summary.jsp,v
diff -u -r1.16.2.8 -r1.16.2.9
--- lams_tool_images/web/pages/monitoring/summary.jsp	30 Mar 2017 13:35:34 -0000	1.16.2.8
+++ lams_tool_images/web/pages/monitoring/summary.jsp	17 May 2017 01:26:55 -0000	1.16.2.9
@@ -94,7 +94,7 @@
 						   	<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false
 						</c:set>
 						<c:set var="url" >
-							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&KeepThis=true&TB_iframe=true&modal=true
+							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&KeepThis=true&TB_iframe=true&modal=true&toolSessionID=${sessionId}
 						</c:set>				
 						<a href="${url}" class="thickbox" title="<fmt:message key='label.monitoring.imagesummary.image.summary' />" style="border-style: none;"> 
 							<c:set var="title">
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.111.2.32 -r1.111.2.33
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	4 Apr 2017 12:27:07 -0000	1.111.2.32
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	17 May 2017 01:27:07 -0000	1.111.2.33
@@ -863,9 +863,9 @@
     }
 
     @Override
-    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
-	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId);
+	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
     }
 
     @Override
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.53.2.30 -r1.53.2.31
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	25 Apr 2017 01:10:57 -0000	1.53.2.30
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	17 May 2017 01:27:07 -0000	1.53.2.31
@@ -374,7 +374,7 @@
 	    generalLearnerFlowDTO.setHttpSessionID(httpSessionID);
 
 	    /** Set up the data for the view all answers screen */
-	    QaLearningAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, httpSessionID, user,
+	    QaLearningAction.refreshSummaryData(request, qaContent, qaSession, QaLearningAction.qaService, httpSessionID, user,
 		    generalLearnerFlowDTO);
 
 	    generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
@@ -456,7 +456,7 @@
 	qaLearningForm.resetUserActions();
 	qaLearningForm.setSubmitAnswersContent(null);
 
-	QaLearningAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, httpSessionID, user,
+	QaLearningAction.refreshSummaryData(request, qaContent, qaSession, QaLearningAction.qaService, httpSessionID, user,
 		generalLearnerFlowDTO);
 
 	generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
@@ -798,7 +798,7 @@
 	generalLearnerFlowDTO.setNotebookEntry(entryText);
 	generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString());
 
-	QaLearningAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, httpSessionID, qaQueUsr,
+	QaLearningAction.refreshSummaryData(request, qaContent, qaSession, QaLearningAction.qaService, httpSessionID, qaQueUsr,
 		generalLearnerFlowDTO);
 
 	boolean isLearnerFinished = qaQueUsr.isLearnerFinished();
@@ -928,7 +928,7 @@
      * User id is needed if isUserNamesVisible is false && learnerRequest is true, as it is required to work out if the
      * data being analysed is the current user.
      */
-    public static void refreshSummaryData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
+    public static void refreshSummaryData(HttpServletRequest request, QaContent qaContent, QaSession qaSession, IQaService qaService,
 	    String httpSessionID, QaQueUsr user, GeneralLearnerFlowDTO generalLearnerFlowDTO) {
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -963,7 +963,7 @@
 		    itemIds.add(responseIter.getResponseId());
 		}
 
-		List<ItemRatingDTO> itemRatingDtos = qaService.getRatingCriteriaDtos(qaContent.getQaContentId(), itemIds,
+		List<ItemRatingDTO> itemRatingDtos = qaService.getRatingCriteriaDtos(qaContent.getQaContentId(), qaSession.getQaSessionId(), itemIds,
 			true, userId);
 		sessionMap.put(AttributeNames.ATTR_ITEM_RATING_DTOS, itemRatingDtos);
 
@@ -991,6 +991,9 @@
 		countRatedQuestions = qaService.getCountItemsRatedByUser(qaContent.getQaContentId(), userId.intValue());
 	    }
 	}
+	
+	request.setAttribute(TOOL_SESSION_ID, qaSession.getQaSessionId());
+	
 	sessionMap.put("commentsMinWordsLimit", commentsMinWordsLimit);
 	sessionMap.put("isCommentsEnabled", isCommentsEnabled);
 	sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedQuestions);
@@ -1010,7 +1013,7 @@
 	HttpSession ss = SessionManager.getSession();
 	UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	TimeZone userTimeZone = userDto.getTimeZone();
-
+	
 	boolean isAllowRateAnswers = WebUtil.readBooleanParam(request, "isAllowRateAnswers");
 	boolean isAllowRichEditor = WebUtil.readBooleanParam(request, "isAllowRichEditor");
 	boolean isOnlyLeadersIncluded = WebUtil.readBooleanParam(request, "isOnlyLeadersIncluded", false);
@@ -1064,7 +1067,7 @@
 
 	    //all comments required only for monitoring
 	    boolean isCommentsByOtherUsersRequired = isMonitoring;
-	    itemRatingDtos = QaLearningAction.qaService.getRatingCriteriaDtos(qaContentId, itemIds,
+	    itemRatingDtos = QaLearningAction.qaService.getRatingCriteriaDtos(qaContentId, qaSessionId, itemIds,
 		    isCommentsByOtherUsersRequired, userId);
 
 	    // store how many items are rated
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.86.2.13 -r1.86.2.14
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	17 Nov 2016 11:44:50 -0000	1.86.2.13
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	17 May 2017 01:27:07 -0000	1.86.2.14
@@ -272,7 +272,7 @@
 	    generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString());
 	    generalLearnerFlowDTO.setTeacherViewOnly(new Boolean(true).toString());
 
-	    QaLearningAction.refreshSummaryData(request, qaContent, qaService, sessionMapId, user,
+	    QaLearningAction.refreshSummaryData(request, qaContent, qaSession, qaService, sessionMapId, user,
 		    generalLearnerFlowDTO);
 	    request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
@@ -306,7 +306,7 @@
 		     */
 		    generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
 
-		    QaLearningAction.refreshSummaryData(request, qaContent, qaService, sessionMapId, user,
+		    QaLearningAction.refreshSummaryData(request, qaContent, qaSession, qaService, sessionMapId, user,
 			    generalLearnerFlowDTO);
 
 		    if (user.isLearnerFinished()) {
@@ -357,7 +357,7 @@
 		     */
 		    generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
 
-		    QaLearningAction.refreshSummaryData(request, qaContent, qaService, sessionMapId, user,
+		    QaLearningAction.refreshSummaryData(request, qaContent, qaSession, qaService, sessionMapId, user,
 			    generalLearnerFlowDTO);
 
 		    if (user.isLearnerFinished()) {
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.53.2.22 -r1.53.2.23
--- lams_tool_laqa/web/learning/LearnerRep.jsp	16 Feb 2017 04:10:15 -0000	1.53.2.22
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	17 May 2017 01:27:07 -0000	1.53.2.23
@@ -35,7 +35,9 @@
 		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>";
+		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>",
+		ALLOW_RERATE = false,
+		SESSION_ID = ${toolSessionID};
 	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.32.2.22 -r1.32.2.23
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	16 Feb 2017 04:10:15 -0000	1.32.2.22
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	17 May 2017 01:27:07 -0000	1.32.2.23
@@ -24,6 +24,7 @@
 
 	<script src="${lams}includes/javascript/jquery.timeago.js" type="text/javascript"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
+	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script type="text/javascript">
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/";
@@ -36,9 +37,10 @@
 		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>";
+		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>",
+		ALLOW_RERATE = false,
+		SESSION_ID = ${toolSessionID};
 	</script>
-	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Attic/Resource.hbm.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	7 Mar 2017 06:07:36 -0000	1.1.2.2
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	17 May 2017 01:27:00 -0000	1.1.2.3
@@ -185,6 +185,25 @@
             column="file_upload_notify"
         />
 
+        <set
+            name="ratingCriterias"
+            lazy="true"
+            inverse="false"
+            cascade="all"
+            sort="unsorted"
+            order-by="order_id asc"
+        >
+
+            <key
+                column="tool_content_id"
+				property-ref="contentId"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.rating.model.RatingCriteria"
+            />
+		</set>		
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Resource.xml
Index: lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItem.hbm.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	7 Mar 2017 06:07:36 -0000	1.1.2.2
+++ lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	17 May 2017 01:27:00 -0000	1.1.2.3
@@ -187,6 +187,15 @@
             column="order_id"
         />
 
+        <property
+            name="allowRating"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="is_allow_rating"
+        />
+
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ResourceItem.xml
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.35.2.11 -r1.35.2.12
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	2 Mar 2017 07:29:20 -0000	1.35.2.11
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	17 May 2017 01:27:00 -0000	1.35.2.12
@@ -172,6 +172,8 @@
 event.file.upload  ={0} uploaded a file \"{1}\"
 label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
 error.file.type.zip  =File must be a zip file.
-
-
+label.enable.rating=Enable Rating
+label.rating=Rating
+label.average.rating  =Average rating {0}/{1} votes
+label.your.rating  =Your rating {0}, average rating {1}/{2} votes
 #======= End labels: Exported 166 labels for en AU =====
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.42.2.4 -r1.42.2.5
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	11 May 2016 07:35:30 -0000	1.42.2.4
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	17 May 2017 01:27:00 -0000	1.42.2.5
@@ -90,6 +90,8 @@
 
     public static final String ATTR_RUN_AUTO = "runAuto";
 
+    public static final String ATTR_RATE_ITEMS = "rateItems";
+
     public static final String ATTR_RESOURCE_ITEM_UID = "itemUid";
 
     public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v
diff -u -r1.22.2.7 -r1.22.2.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	21 Apr 2016 09:13:15 -0000	1.22.2.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	17 May 2017 01:27:00 -0000	1.22.2.8
@@ -93,6 +93,7 @@
 		<property name="eventNotificationService">
 			<ref bean="eventNotificationService"/>
 		</property>
+		<property name="ratingService"><ref bean="ratingService"/></property>
 		<property name="resourceOutputFactory"><ref bean="resourceOutputFactory"/></property>
     </bean>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170419.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java	11 May 2016 07:35:29 -0000	1.1.2.5
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java	17 May 2017 01:27:00 -0000	1.1.2.6
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 
 /**
@@ -54,6 +55,8 @@
     private List<String> itemInstructions = new ArrayList<String>();
     private String username;
     private int viewNumber;
+    private boolean allowRating;
+    private ItemRatingDTO ratingDTO;
 
     // true: initial group item, false, belong to some group.
     private boolean isInitGroup;
@@ -78,6 +81,7 @@
 	    this.itemHide = item.isHide();
 	    this.itemTitle = item.getTitle();
 	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
+	    this.setAllowRating(item.isAllowRating());
 	} else {
 	    this.itemUid = new Long(-1);
 	}
@@ -154,4 +158,20 @@
     public void setItemInstructions(List<String> itemInstructions) {
 	this.itemInstructions = itemInstructions;
     }
+
+    public ItemRatingDTO getRatingDTO() {
+	return ratingDTO;
+    }
+
+    public void setRatingDTO(ItemRatingDTO ratingDTO) {
+	this.ratingDTO = ratingDTO;
+    }
+
+    public boolean isAllowRating() {
+	return allowRating;
+    }
+
+    public void setAllowRating(boolean allowRating) {
+	this.allowRating = allowRating;
+    }
 }
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java	11 May 2016 07:35:29 -0000	1.1.2.4
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java	17 May 2017 01:27:00 -0000	1.1.2.5
@@ -31,6 +31,7 @@
     private Long sessionId;
     private String sessionName;
     private List<ResourceItemDTO> items;
+    private boolean allowRating;
 
     public SessionDTO() {
 	items = new LinkedList<ResourceItemDTO>();
@@ -59,4 +60,12 @@
     public void setItems(List<ResourceItemDTO> items) {
 	this.items = items;
     }
+
+    public boolean isAllowRating() {
+	return allowRating;
+    }
+
+    public void setAllowRating(boolean allowRating) {
+	this.allowRating = allowRating;
+    }
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java,v
diff -u -r1.21.2.5 -r1.21.2.6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	11 May 2016 07:35:29 -0000	1.21.2.5
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	17 May 2017 01:27:00 -0000	1.21.2.6
@@ -31,6 +31,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 
 /**
  * Resource
@@ -88,6 +89,8 @@
 
     private String reflectInstructions;
 
+    private Set<LearnerItemRatingCriteria> ratingCriterias;
+
     // *************** NON Persist Fields ********************
 
     private String miniViewNumberStr;
@@ -116,6 +119,15 @@
 		item.setCreateBy(toContent.getCreatedBy());
 	    }
 	}
+	
+	// reset contentId
+	if (toContent.getRatingCriterias() != null) {
+	    Set<LearnerItemRatingCriteria> criterias = toContent.getRatingCriterias();
+	    for (LearnerItemRatingCriteria criteria : criterias) {
+		criteria.setToolContentId(contentId);
+	    }
+	}
+
 	return toContent;
     }
 
@@ -141,6 +153,19 @@
 	    if (createdBy != null) {
 		resource.setCreatedBy((ResourceUser) createdBy.clone());
 	    }
+	    
+	    // clone ratingCriterias as well
+	    if (ratingCriterias != null) {
+		Set<LearnerItemRatingCriteria> newCriterias = new HashSet<LearnerItemRatingCriteria>();
+		for (LearnerItemRatingCriteria criteria : ratingCriterias) {
+		    LearnerItemRatingCriteria newCriteria = (LearnerItemRatingCriteria) criteria.clone();
+		    // just clone old file without duplicate it in repository
+		    newCriterias.add(newCriteria);
+		}
+		resource.ratingCriterias = newCriterias;
+	    }
+
+	    
 	} catch (CloneNotSupportedException e) {
 	    Resource.log.error("When clone " + Resource.class + " failed");
 	}
@@ -460,4 +485,17 @@
     public void setNotifyTeachersOnFileUpload(boolean notifyTeachersOnFileUpload) {
 	this.notifyTeachersOnFileUpload = notifyTeachersOnFileUpload;
     }
+    
+    /**
+    *
+    * @return
+    */
+   public Set<LearnerItemRatingCriteria> getRatingCriterias() {
+	return ratingCriterias;
+   }
+
+   public void setRatingCriterias(Set<LearnerItemRatingCriteria> ratingCriterias) {
+	this.ratingCriterias = ratingCriterias;
+   }
+
 }
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java,v
diff -u -r1.17.2.3 -r1.17.2.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	11 May 2016 07:35:29 -0000	1.17.2.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	17 May 2017 01:27:00 -0000	1.17.2.4
@@ -29,6 +29,7 @@
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 
 /**
  * Resource
@@ -76,10 +77,13 @@
 
     private Date createDate;
     private ResourceUser createBy;
+    
+    private boolean allowRating;
 
     // ***********************************************
     // DTO fields:
     private boolean complete;
+    private ItemRatingDTO ratingDTO;
 
     @Override
     public Object clone() {
@@ -356,4 +360,21 @@
     public boolean isComplete() {
 	return complete;
     }
+
+    public ItemRatingDTO getRatingDTO() {
+	return ratingDTO;
+    }
+
+    public void setRatingDTO(ItemRatingDTO ratingDTO) {
+	this.ratingDTO = ratingDTO;
+    }
+
+    public boolean isAllowRating() {
+	return allowRating;
+    }
+
+    public void setAllowRating(boolean allowRating) {
+	this.allowRating = allowRating;
+    }
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java,v
diff -u -r1.30.2.7 -r1.30.2.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	4 Apr 2017 12:26:30 -0000	1.30.2.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	17 May 2017 01:27:00 -0000	1.30.2.8
@@ -23,12 +23,16 @@
 
 package org.lamsfoundation.lams.tool.rsrc.service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.SortedSet;
 
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.rating.RatingException;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO;
@@ -277,4 +281,11 @@
     void auditLogStartEditingActivityInMonitor(long toolContentID);
     
     void evict(Object object);
+
+    /** Create an anonymous star rating criteria */
+    LearnerItemRatingCriteria createRatingCriteria(Long toolContentId) throws RatingException;
+    /** Delete an anonymous star rating criteria */
+    int deleteRatingCriteria(Long toolContentId);
+    /** Get the actual ratings and the criteria for display */
+    List<ItemRatingDTO> getRatingCriteriaDtos(Long toolContentId, Long toolSessionId, Collection<Long> itemIds, Long userId);
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.77.2.18 -r1.77.2.19
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	4 Apr 2017 12:26:31 -0000	1.77.2.18
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	17 May 2017 01:27:00 -0000	1.77.2.19
@@ -30,7 +30,9 @@
 import java.io.InputStream;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -66,6 +68,11 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rating.RatingException;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
+import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -147,6 +154,8 @@
 
     private IEventNotificationService eventNotificationService;
 
+    private IRatingService ratingService;
+
     private ResourceOutputFactory resourceOutputFactory;
 
     @Override
@@ -439,18 +448,43 @@
 	    // add this session's resource items
 	    items.addAll(session.getResourceItems());
 
+	    // item ids of items that could be rated.
+	    List<Long> itemsToRate = new ArrayList<Long>();
+
 	    // get all item which is accessed by users in this session
 	    Map<Long, Integer> visitCountMap = resourceItemVisitDao.getSummary(contentId, session.getSessionId());
-
 	    for (ResourceItem item : items) {
 		ResourceItemDTO resourceItemDTO = new ResourceItemDTO(item);
 		// set viewNumber according visit log
 		if (visitCountMap.containsKey(item.getUid())) {
 		    resourceItemDTO.setViewNumber(visitCountMap.get(item.getUid()).intValue());
 		}
 		group.getItems().add(resourceItemDTO);
+		if ( item.isAllowRating() ) {
+		    itemsToRate.add(item.getUid());
+		}
 	    }
+	    
+	    List<ItemRatingDTO> itemRatingDtos = null;
+	    if ( itemsToRate.size() > 0 ) {
+		itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, session.getSessionId(), itemsToRate, false, -1L);
+		group.setAllowRating(true);
+	    } else {
+		group.setAllowRating(false);
+	    }
 
+	    for (ResourceItemDTO item: group.getItems()) {
+		if (item.isAllowRating()) {
+		    // find corresponding itemRatingDto
+		    for ( ItemRatingDTO ratingDTO : itemRatingDtos ) {
+			if ( item.getItemUid().equals(ratingDTO.getItemId()) ) {
+			    item.setRatingDTO(ratingDTO);
+			    break;
+			}
+		    }
+		}
+	    }
+
 	    groupList.add(group);
 	}
 
@@ -827,10 +861,20 @@
 	    toolContentObj.setCreatedBy(user);
 
 	    // reset all resourceItem createBy user
+	    boolean useRatings = false;
 	    Set<ResourceItem> items = toolContentObj.getResourceItems();
 	    for (ResourceItem item : items) {
 		item.setCreateBy(user);
+		useRatings = useRatings || item.isAllowRating();
 	    }
+	    
+	    Set<LearnerItemRatingCriteria> criterias = toolContentObj.getRatingCriterias();
+	    if (criterias != null) {
+		for (LearnerItemRatingCriteria criteria : criterias) {
+		    criteria.setToolContentId(toolContentId);
+		}
+	    } 
+
 	    resourceDao.saveObject(toolContentObj);
 	} catch (ImportToolContentException e) {
 	    throw new ToolException(e);
@@ -1060,6 +1104,26 @@
 	return getResourceOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
 
+    @Override
+    public LearnerItemRatingCriteria createRatingCriteria(Long toolContentId) throws RatingException {
+	List<RatingCriteria> ratingCriterias = ratingService.getCriteriasByToolContentId(toolContentId);
+	if ( ratingCriterias == null || ratingCriterias.size() == 0 ) {
+	    return ratingService.saveLearnerItemRatingCriteria(toolContentId, null, 1, RatingCriteria.RATING_STYLE_STAR, false, 0);
+	} else {
+	    return (LearnerItemRatingCriteria) ratingCriterias.get(0);
+	}
+    }
+
+    @Override
+    public int deleteRatingCriteria(Long toolContentId) {
+	return ratingService.deleteAllRatingCriterias(toolContentId);
+    }
+    
+    @Override
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long toolContentId, Long toolSessionId, Collection<Long> itemIds, Long userId) {
+	return ratingService.getRatingCriteriaDtos(toolContentId, toolSessionId, itemIds, false, userId);
+    }
+
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
@@ -1143,6 +1207,14 @@
 	this.eventNotificationService = eventNotificationService;
     }
 
+    public IRatingService getRatingService() {
+	return ratingService;
+    }
+
+    public void setRatingService(IRatingService ratingService) {
+	this.ratingService = ratingService;
+    }
+
     public ResourceOutputFactory getResourceOutputFactory() {
 	return resourceOutputFactory;
     }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.62.2.8 -r1.62.2.9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	4 Apr 2017 12:26:30 -0000	1.62.2.8
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	17 May 2017 01:27:00 -0000	1.62.2.9
@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -57,6 +58,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
@@ -520,7 +522,7 @@
 
 	Resource resource = resourceForm.getResource();
 	IResourceService service = getResourceService();
-
+	
 	// **********************************Get Resource PO*********************
 	Resource resourcePO = service.getResourceByContentId(resource.getContentId());
 	if (resourcePO == null) {
@@ -530,15 +532,17 @@
 	    resourcePO.setUpdated(new Timestamp(new Date().getTime()));
 	    
 	} else {
+	    Set<LearnerItemRatingCriteria> criterias = resourcePO.getRatingCriterias();
 	    Long uid = resourcePO.getUid();
 	    PropertyUtils.copyProperties(resourcePO, resource);
 
 	    // copyProperties() above may result in "collection assigned to two objects in a session" exception
 	    service.evict(resource);
 	    resourceForm.setResource(null);
 	    resource = null;
-	    // set back UID
+	    // set back UID && rating criteria
 	    resourcePO.setUid(uid);
+	    resourcePO.setRatingCriterias(criterias);
 
 	    // if it's a Teacher (from monitor) - change define later status
 	    if (mode.isTeacher()) {
@@ -563,6 +567,7 @@
 
 	// ************************* Handle resource items *******************
 	// Handle resource items
+	boolean useRatings = false;
 	Set itemList = new LinkedHashSet();
 	SortedSet topics = getResourceItemList(sessionMap);
 	Iterator iter = topics.iterator();
@@ -573,10 +578,11 @@
 		// user.
 		item.setCreateBy(resourceUser);
 		itemList.add(item);
+		useRatings = useRatings || item.isAllowRating();
 	    }
 	}
 	resourcePO.setResourceItems(itemList);
-	// delete instructino file from database.
+	// delete instruction file from database.
 	List delResourceItemList = getDeletedResourceItemList(sessionMap);
 	iter = delResourceItemList.iterator();
 	while (iter.hasNext()) {
@@ -601,8 +607,20 @@
 	}
 	// **********************************************
 	// finally persist resourcePO again
+	    
 	service.saveOrUpdateResource(resourcePO);
 
+	// Set up rating criteria. Do not delete existing criteria as this will destroy ratings already done
+	// if the monitor edits the activity and turns of the criteria temporarily.
+	if ( useRatings ) {
+	    if ( resourcePO.getRatingCriterias() == null || resourcePO.getRatingCriterias().size() == 0 ) {
+		LearnerItemRatingCriteria newCriteria = service.createRatingCriteria(resourcePO.getContentId());
+		if ( resourcePO.getRatingCriterias() == null ) {
+		    resourcePO.setRatingCriterias(new HashSet<LearnerItemRatingCriteria>());
+		}
+		resourcePO.getRatingCriterias().add(newCriteria);
+	    }
+	}
 	resourceForm.setResource(resourcePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
@@ -759,6 +777,7 @@
 	form.setTitle(item.getTitle());
 	form.setUrl(item.getUrl());
 	form.setOpenUrlNewWindow(item.isOpenUrlNewWindow());
+	form.setAllowRating(item.isAllowRating());
 	if (itemIdx >= 0) {
 	    form.setItemIndex(new Integer(itemIdx).toString());
 	}
@@ -866,7 +885,8 @@
 	item.setTitle(itemForm.getTitle());
 	item.setCreateByAuthor(true);
 	item.setHide(false);
-	// set instrcutions
+	item.setAllowRating(itemForm.isAllowRating());
+	// set instructions
 	Set instructions = new LinkedHashSet();
 	int idx = 0;
 	for (String ins : instructionList) {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.42.2.6 -r1.42.2.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	8 Apr 2017 17:15:59 -0000	1.42.2.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	17 May 2017 01:27:00 -0000	1.42.2.7
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -53,6 +54,7 @@
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
@@ -170,7 +172,7 @@
 	items = service.getResourceItemsBySessionId(sessionId);
 	resource = service.getResourceBySessionId(sessionId);
 
-	// check whehter finish lock is on/off
+	// check whether finish lock is on/off
 	boolean lock = resource.getLockWhenFinished() && (resourceUser != null) && resourceUser.isSessionFinished();
 
 	// check whether there is only one resource item and run auto flag is true or not.
@@ -232,20 +234,35 @@
 	// init resource item list
 	SortedSet<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
 	resourceItemList.clear();
+	Collection<Long> itemsToBeRated = new ArrayList<Long>();
 	if (items != null) {
 	    // remove hidden items.
 	    for (ResourceItem item : items) {
-		// becuase in webpage will use this login name. Here is just
+		// because in webpage will use this login name. Here is just
 		// initial it to avoid session close error in proxy object.
 		if (item.getCreateBy() != null) {
 		    item.getCreateBy().getLoginName();
 		}
 		if (!item.isHide()) {
 		    resourceItemList.add(item);
 		}
+		if ( item.isAllowRating() ) {
+		    itemsToBeRated.add(item.getUid());
+		}
 	    }
 	}
 
+	List<ItemRatingDTO> ratingDTOs = service.getRatingCriteriaDtos(resource.getContentId(), sessionId, itemsToBeRated,
+		resourceUser.getUserId());
+	for (ItemRatingDTO ratingDTO : ratingDTOs) {
+	    for (ResourceItem item : resourceItemList) {
+		if (item.getUid().equals(ratingDTO.getItemId())) {
+		    item.setRatingDTO(ratingDTO);
+		}
+	    }
+	}
+	sessionMap.put(ResourceConstants.ATTR_RATE_ITEMS, itemsToBeRated.size() > 0);
+	
 	// set complete flag for display purpose
 	if (resourceUser != null) {
 	    service.retrieveComplete(resourceItemList, resourceUser);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java,v
diff -u -r1.9.16.3 -r1.9.16.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	11 May 2016 07:35:29 -0000	1.9.16.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	17 May 2017 01:27:00 -0000	1.9.16.4
@@ -51,6 +51,7 @@
     private Long fileVersionId;
     private String fileName;
     private FormFile file;
+    private boolean allowRating;
 
     public String getDescription() {
 	return description;
@@ -155,4 +156,12 @@
     public void setMode(String mode) {
 	this.mode = mode;
     }
+
+    public boolean isAllowRating() {
+	return allowRating;
+    }
+
+    public void setAllowRating(boolean allowRating) {
+	this.allowRating = allowRating;
+    }
 }
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp,v
diff -u -r1.21.2.9 -r1.21.2.10
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	6 Mar 2017 11:21:54 -0000	1.21.2.9
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	17 May 2017 01:27:00 -0000	1.21.2.10
@@ -89,9 +89,12 @@
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
 					</span>
 					<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
-					</div>			
-				</div>
+				</div>			
 	
+				<div class="form-group">
+					<html:checkbox property="allowRating" styleId="allowRating"/>
+					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+				</div>
 			</html:form>
 	
 			<!-- Instructions -->
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp,v
diff -u -r1.18.2.9 -r1.18.2.10
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	6 Mar 2017 11:21:54 -0000	1.18.2.9
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	17 May 2017 01:27:00 -0000	1.18.2.10
@@ -93,6 +93,11 @@
 
 				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 	
+				<div class="form-group">
+					<html:checkbox property="allowRating" styleId="allowRating"/>
+					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+				</div>
+				
 			</html:form>
 
 			<!-- Instructions -->
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.24.2.10 -r1.24.2.11
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	6 Mar 2017 11:21:54 -0000	1.24.2.10
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	17 May 2017 01:27:00 -0000	1.24.2.11
@@ -59,8 +59,13 @@
 				<div class="form-group">
 					<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>:
 					<html:text styleId="url" property="url"  styleClass="form-control"/>
-					<br/><html:checkbox property="openUrlNewWindow" styleId="openUrlNewWindow" styleClass="loffset5"/>
+					<br/>
+					
+					<html:checkbox property="openUrlNewWindow" styleId="openUrlNewWindow" styleClass="loffset5"/>
 					&nbsp;<label for="openUrlNewWindow"><fmt:message key="open.in.new.window" /></label>
+					
+					<html:checkbox property="allowRating" styleId="allowRating" styleClass="loffset5"/>
+					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
 				</div>
 
 			</html:form>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp,v
diff -u -r1.18.2.9 -r1.18.2.10
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	6 Mar 2017 11:21:54 -0000	1.18.2.9
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	17 May 2017 01:27:00 -0000	1.18.2.10
@@ -94,6 +94,11 @@
 
 				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 	
+				<div class="form-group">
+					<html:checkbox property="allowRating" styleId="allowRating"/>
+					&nbsp;<label for="allowRating"><fmt:message key="label.enable.rating" /></label>
+				</div>
+				
 			</html:form>
 		
 			<!-- Instructions -->
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.53.2.9 -r1.53.2.10
--- lams_tool_larsrc/web/pages/learning/learning.jsp	1 Mar 2017 00:29:02 -0000	1.53.2.9
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	17 May 2017 01:27:00 -0000	1.53.2.10
@@ -9,6 +9,7 @@
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jRating.css">
 
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
@@ -25,11 +26,31 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
-	<script type="text/javascript">
 	
+	<c:if test="${sessionMap.rateItems}">
+	<script type="text/javascript">
+		var pathToImageFolder = "${lams}images/css/",
+			LAMS_URL = '${lams}',
+			MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
+			COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
+			COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
+			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			ALLOW_RERATE = true,
+			SESSION_ID = ${toolSessionID}; 
+
+	</script>
+	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	</c:if>
+			
+	<script type="text/javascript">
 		$(document).ready(function(){
+ 			<c:if test="${sessionMap.rateItems}">
+			initializeJRating();
+			</c:if>
 			cancel();
-		});
+ 		});
 
  		function submitResourceForm() {
  			clearFileError();
@@ -50,7 +71,7 @@
 			    		alert(textStatus+": "+errorThrown);
 			    	},
 			    	complete: function(response) {
-			    		hideBusy(itemAttachmentArea_Busy);
+			    		hideBusy('itemAttachmentArea');
 			            $('.btn-disable-on-submit').prop('disabled', false);
 					}
 			    });
@@ -92,7 +113,7 @@
 		
 		function checkNew(){
  		    var reqIDVar = new Date();
-			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();				
+			document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='+reqIDVar.getTime();				
  		    return false;
 		}
 		function viewItem(itemUid){
@@ -179,6 +200,11 @@
 				<th class="text-center">
 					<fmt:message key="label.completed" />
 				</th>
+				<c:if test="${sessionMap.rateItems}">
+				<th class="text-center">
+					<fmt:message key="label.rating" />
+				</th>
+				</c:if>
 			</tr>
 			<c:forEach var="item" items="${sessionMap.resourceList}">
 				<tr>
@@ -200,6 +226,16 @@
 							</c:otherwise>
 						</c:choose>
 					</td>
+					<c:if test="${sessionMap.rateItems}">
+					<td class="text-center">
+						<c:if test="${item.complete && item.allowRating}">
+							<div style="display: inline-block">
+							<lams:Rating itemRatingDto="${item.ratingDTO}" 
+								disabled="${mode == 'teacher' || mode == 'author' || finishedLock}" allowRetries="true" />
+							</div>
+						</c:if>
+					</td>					
+					</c:if>
 				</tr>
 			</c:forEach>
 
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/success.jsp,v
diff -u -r1.11.14.2 -r1.11.14.3
--- lams_tool_larsrc/web/pages/learning/success.jsp	16 Mar 2016 01:57:43 -0000	1.11.14.2
+++ lams_tool_larsrc/web/pages/learning/success.jsp	17 May 2017 01:27:00 -0000	1.11.14.3
@@ -8,17 +8,20 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 	</lams:head>
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<c:set var="mode" value="${sessionMap.mode}" />
+	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+	
 	<body class="stripes">
+		<!--  If successful reload all the resources and ratings. -->
  		<script type="text/javascript">
-			var reqIDVar = new Date();
-			window.location.href  = "${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
-		</script>
-		<lams:Page type="learner">
+ 			var reqIDVar = new Date();
+ 			document.location.href = '<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID='+reqIDVar.getTime();	
+ 		</script>
 		<div style="align:center">
-			<!--  this should never be seen! -->
-			<a href="${tool}/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime()" type="button" class="btn btn-primary">
+			<!--  Should never be seen -->
+			<a href="<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}" type="button" class="btn btn-primary">
 					<i class="fa fa-xm fa-refresh"></i> <fmt:message key="label.check.for.new" /></a>
 		</div>
-		</lams:Page>
 	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/summary.jsp,v
diff -u -r1.23.2.4 -r1.23.2.5
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	1 Mar 2017 00:29:02 -0000	1.23.2.4
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	17 May 2017 01:27:00 -0000	1.23.2.5
@@ -3,7 +3,8 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+<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" />
 <style media="screen,projection" type="text/css">
 	 .ui-jqgrid {
@@ -21,12 +22,23 @@
 	}
 </style>
 
+<script type="text/javascript">
+	var pathToImageFolder = "${lams}images/css/",
+		LAMS_URL = '${lams}',
+		MAX_RATES = MAX_RATINGS_FOR_ITEM = MIN_RATES = COUNT_RATED_ITEMS = 0, // no restrictions
+		COMMENTS_MIN_WORDS_LIMIT = 0, // comments not used,
+		COMMENT_TEXTAREA_TIP_LABEL = WARN_COMMENTS_IS_BLANK_LABEL = WARN_MIN_NUMBER_WORDS_LABEL = '',
+		ALLOW_RERATE = false; 
+</script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/rating.js"></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>
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	$(document).ready(function(){
-		
+
 		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
 		
 			jQuery("#group${groupSummary.sessionId}").jqGrid({
@@ -41,6 +53,9 @@
 						"<fmt:message key="monitoring.label.type" />",
 					    "<fmt:message key="monitoring.label.suggest" />",
 					    "<fmt:message key="monitoring.label.views" />",
+						<c:if test="${groupSummary.allowRating}">
+					    "<fmt:message key="label.rating" />",
+					   	</c:if>
 					    "<fmt:message key="monitoring.label.actions" />" 
 				],
 			   	colModel:[
@@ -50,6 +65,9 @@
 			   		{name:'type', index:'type', width:90, align:"center"},
 			   		{name:'suggest', index:'suggest', width:160, align:"center"},
 			   		{name:'viewNumber', index:'viewNumber', width:100, align:"center", sorttype:"int"},
+					<c:if test="${groupSummary.allowRating}">
+					{name:'rating', index:'rating', width:200, align:"center"},
+				   	</c:if>
 			   		{name:'actions', index:'actions', width:120, align:"center"}		
 			   	],
 			   	// caption: "${groupSummary.sessionName}",
@@ -125,19 +143,32 @@
 					<c:out value="${item.itemTitle}" escapeXml="true"/>
 				</c:set>
 				
+				<c:if test="${groupSummary.allowRating}">
+				<c:set var="ratingHTML"><div class="rating-stars-holder"></c:set>
+				<c:forEach var="criteriaDto" items="${item.ratingDTO.criteriaDtos}">
+					<c:set var="ratingHTML">${ratingHTML}<div class="rating-stars-new rating-stars-disabled" data-average="${criteriaDto.averageRating}" data-id="${criteriaDto.ratingCriteria.ratingCriteriaId}-${item.itemUid}"></div><div class="rating-stars-caption"><fmt:message key="label.average.rating"><fmt:param>${criteriaDto.averageRating}</fmt:param><fmt:param>${criteriaDto.numberOfVotes}</fmt:param></fmt:message></div></c:set>
+				</c:forEach>
+				<c:set var="ratingHTML">${ratingHTML}</div></c:set>
+				</c:if>
+				
    	     		jQuery("#group${groupSummary.sessionId}").addRowData(${i.index + 1}, {
    	   	     		id:		"${i.index + 1}",
    	   	     		itemUid:	"${item.itemUid}",
    	   	     		title:	"<a href='#nogo' onclick='javascript:viewItem(${item.itemUid}); return false;'>${itemTitle}</a>",
    	   	     		type:	"${itemTypeLabel}",
    	   	     		suggest:	"${item.username}",
    	   	     		viewNumber:"	${item.viewNumber}",
+					<c:if test="${groupSummary.allowRating}">
+					rating: '${ratingHTML}',
+				   	</c:if>
    	   	     		actions:	"${changeItemVisibility}"
    	   	   	    });
 	        </c:forEach>
 			
 		</c:forEach>
-        
+
+		initializeJRating();
+
 		//jqgrid autowidth (http://stackoverflow.com/a/1610197)
 		$(window).bind('resize', function() {
 			var grid;
@@ -150,7 +181,6 @@
 		    }
 		});
 		setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
-		
 	});
 	
 	function changeItemVisibility(linkObject, itemUid, isHideItem) {
@@ -230,6 +260,8 @@
 	
 </c:forEach>
 
+ 
+
 <c:if test="${sessionMap.isGroupedActivity}">
 </div> <!--  end accordianSessions --> 
 </c:if>
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.13 -r1.4.2.14
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	4 Apr 2017 12:27:18 -0000	1.4.2.13
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	17 May 2017 01:27:03 -0000	1.4.2.14
@@ -242,21 +242,21 @@
     List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId);
     
     /** Save the ratings for ranking and hedging. */
-    int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings);
+    int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Map<Long, Float> newRatings);
 
     /** Save a comment made on a comment only page.  */
-    void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment);
+    void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment);
 
     /** Get the details for a single criteria */
     RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId);
     
     /**
      * It's a modification of org.lamsfoundation.lams.rating.ToolRatingManager.getRatingCriteriaDtos(Long contentId,
-     * Collection<Long> itemIds, boolean isCommentsByOtherUsersRequired, Long userId) method, added additional parameter
+     * Long toolSessionId, Collection<Long> itemIds, boolean isCommentsByOtherUsersRequired, Long userId) method, added additional parameter
      * isCountUsersRatedEachItem.
      *
      */
-    List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem);
 
     /** 
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.22 -r1.7.2.23
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	4 Apr 2017 12:27:18 -0000	1.7.2.22
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	17 May 2017 01:27:03 -0000	1.7.2.23
@@ -332,13 +332,13 @@
     }
 
     @Override
-    public int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings) {
-	return ratingService.rateItems(ratingCriteria, userId, newRatings);
+    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Map<Long, Float> newRatings) {
+	return ratingService.rateItems(ratingCriteria, toolSessionId, userId, newRatings);
     }
 
     @Override
-    public void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment) {
-	ratingService.commentItem(ratingCriteria, userId, itemId, comment);
+    public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment) {
+	ratingService.commentItem(ratingCriteria, toolSessionId, userId, itemId, comment);
     }
 
     @Override
@@ -385,7 +385,7 @@
 	}
 	// if !getByUser -> is get current user's ratings from other users ->
 	// convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped
-	return ratingService.convertToStyledJSON(criteria, currentUserId, !getByUser || getAllUsers, rawData,
+	return ratingService.convertToStyledJSON(criteria, toolSessionId, currentUserId, !getByUser || getAllUsers, rawData,
 		needRatesPerUser);
     }
 
@@ -589,7 +589,7 @@
 
 	ArrayList<Long> itemIds = new ArrayList<Long>(1);
 	itemIds.add(userId);
-	Map<Long, Long> numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, itemIds, -1);
+	Map<Long, Long> numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, toolSessionId, itemIds, -1);
 	Long numRatingsForUser = numRatingsForUserMap.get(userId);
 	retValue[0] = numRatingsForUser != null ? numRatingsForUser.intValue() : 0;
 
@@ -882,20 +882,20 @@
     }
 
     @Override
-    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
-	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId);
+	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
     }
 
     @Override
-    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem) {
-	List<ItemRatingDTO> itemRatingDTOs = getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired,
+	List<ItemRatingDTO> itemRatingDTOs = getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
 		userId);
 
 	if (isCountUsersRatedEachItem) {
-	    Map<Long, Long> itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, itemIds,
-		    userId.intValue());
+	    Map<Long, Long> itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, toolSessionId, 
+		    itemIds, userId.intValue());
 
 	    for (ItemRatingDTO itemRatingDTO : itemRatingDTOs) {
 		Long itemId = itemRatingDTO.getItemId();
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/Attic/SpreadsheetBuilder.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java	14 Feb 2017 12:35:27 -0000	1.1.2.2
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java	17 May 2017 01:27:03 -0000	1.1.2.3
@@ -110,7 +110,7 @@
 
 	// Process all the criterias and build up rows for each rated user. Store in temporary map.
 	List<ItemRatingDTO> ratingDtos = service.getRatingCriteriaDtos(session.getPeerreview().getContentId(), 
-		userNames.keySet(), true, -1L);
+		session.getSessionId(), userNames.keySet(), true, -1L);
 	for (ItemRatingDTO ratingDto : ratingDtos) {
 	    Double userMarkSum = 0D;
 	    userRow = new ExcelCell[fullColumnCount];
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java,v
diff -u -r1.5.2.11 -r1.5.2.12
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	16 Feb 2017 16:19:01 -0000	1.5.2.11
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	17 May 2017 01:27:03 -0000	1.5.2.12
@@ -671,7 +671,7 @@
 			countCommentsSaved++;
 			// save the comment to the database.
 			if ( comment.length() > 0 )
-			    service.commentItem(criteria, userId, itemId, comment);
+			    service.commentItem(criteria, toolSessionId, userId, itemId, comment);
 		    }
 		}
 	    }
@@ -780,7 +780,7 @@
 			(ratings.size() >= service.getCountUsersBySession(toolSessionId, peerreview.isSelfReview() ? -1 : user.getUserId())));
 	    }
 
-	    service.rateItems(criteria, userId, ratings);
+	    service.rateItems(criteria, toolSessionId, userId, ratings);
 	    if (!valid) {
 		request.setAttribute("notcomplete", true);
 		return doEdit(mapping, request, service, sessionMap, toolSessionId, peerreview, criteria);
@@ -789,7 +789,7 @@
 	    if (criteria.isHedgeStyleRating() && criteria.isCommentsEnabled()) {
 		String justify = request.getParameter("justify");
 		if ( justify != null && justify.length() > 0)
-		    service.commentItem(criteria, userId, criteria.getRatingCriteriaId(), justify);
+		    service.commentItem(criteria, toolSessionId, userId, criteria.getRatingCriteriaId(), justify);
 	    }
 
 	}
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/Attic/comment.jsp,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_tool_preview/web/pages/learning/comment.jsp	16 Feb 2017 16:19:01 -0000	1.1.2.5
+++ lams_tool_preview/web/pages/learning/comment.jsp	17 May 2017 01:27:03 -0000	1.1.2.6
@@ -22,8 +22,10 @@
 		COMMENTS_MIN_WORDS_LIMIT = ${criteriaRatings.ratingCriteria.commentsMinWordsLimit},
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>";
-		
+		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>",
+		ALLOW_RERATE = true,
+		SESSION_ID = ${toolSessionId}; 
+
 		var	commentsSaved = true,
 			commentsLocked = false;
 			commentsOnOtherPages = ${countRatedItems};
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.11 -r1.1.2.12
--- lams_tool_preview/web/pages/learning/star.jsp	27 Apr 2017 11:32:07 -0000	1.1.2.11
+++ lams_tool_preview/web/pages/learning/star.jsp	17 May 2017 01:27:03 -0000	1.1.2.12
@@ -23,7 +23,8 @@
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
 		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>",
-		ALLOW_RERATE = true;
+		ALLOW_RERATE = true,
+		SESSION_ID = ${toolSessionId};
 	</script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>