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 -r1.1.2.1
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml	24 Jul 2015 00:34:29 -0000	1.1
+++ 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
@@ -147,6 +147,14 @@
         	insert="true" 
         	column="maximum_rates_per_user"
         />
+
+        <property
+            name="selfReview"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="self_review"
+        />
         
         <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.5 -r1.7.2.6
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	1 Jul 2016 02:09:32 -0000	1.7.2.5
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	10 Oct 2016 00:31:04 -0000	1.7.2.6
@@ -66,14 +66,14 @@
 label.rate.limits.reminder.min = You must rate at least {0} users.
 label.rate.limits.reminder.max = You can only rate up to {0} users.
 js.warning.max.min.limit = There is an error with the minimum and/or maximum set for ratings. Please check and try again. 
-label.minimum  =Minimum:
-label.maximum  =Maximum:
+label.minimum  =Minimum Number of Ratings:
+label.maximum  =Maximum Number of Ratings:
 label.no.minimum  =No minimum
 label.no.maximum  =No maximum
 label.minimum.number.words  =Minimum number of words in a comment {0}
 warning.minimum.number.words  =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s).
 label.comment.textarea.tip  =Type your comment here then click on the green tick.
-label.max.number.marks.each.user  =Max number of reviews per user
+label.max.number.marks.each.user  =Max number of reviews per user (applies only to Star Ratings)
 label.move.up  =Move Up
 label.move.down  =Move Down
 label.allow.comments  =Allow learners to comment on other learners
@@ -92,4 +92,31 @@
 creating.users.message  =Please wait while the learners\' details are set up ready for you to review their responses.
 error.max.ratings.per.user=Unable to save the review - the maximum number of ratings may have been reached. The page will now be refreshed.
 label.review.options=Review Options
-label.activity.completion=End of Activity
\ No newline at end of file
+label.activity.completion=End of Activity
+label.rating.style.star=Star Rating
+label.rating.style.ranking=Ranking
+label.rating.style.hedging=Hedging
+label.rating.all=ALL
+label.rating.author.justify=Ask for hedging justification?
+label.rating.learner.hedge.assign.marks=Assign marks to answers. Max possible mark: 10
+label.rating.learner.justify=Please, justify your mark allocation.
+label.rating.max.hedge=Total Hedge Mark
+error.rating.hedge.total.add.up=Marks for criteria {0} must add up to {1}
+error.rating.rank.all=You must rank all the learners for criteria {0}
+label.justify.hedging.marks=Justify your mark allocation.
+label.assign.marks=Assign up to {0} marks altogether, sharing marks across learners. Current total: {1}.
+error.assign.marks=The marks must add up to {0}. 
+label.assign.ranks=Fill the boxes with the top {0} entries, by dragging the learners' name onto the box.
+error.assign.ranks=The marks must add up to {0}. 
+label.assign.rankAll=Order the learners in ranking order, from first to last, by dragging learners from the right hand column to the left column. Dragging a name on top of another will put the new name first. All learners must be ranked. 
+error.assign.rankAll=All learners must be ranked. 
+label.ranked=Ranked
+label.unranked=Unranked
+label.addlearnerhere=Add learner here....
+label.alllearnersadded=All learners added
+label.next=Next
+label.previous=Previous
+label.step=Step {0} of {1}
+label.mark=Mark
+label.rank=Rank
+label.authoring.self.review=Allow Self Review
\ 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.1 -r1.7.2.2
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	9 Mar 2016 03:01:20 -0000	1.7.2.1
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	10 Oct 2016 00:31:04 -0000	1.7.2.2
@@ -67,14 +67,14 @@
 label.rate.limits.reminder.min = You must rate at least {0} users.
 label.rate.limits.reminder.max = You can only rate up to {0} users.
 js.warning.max.min.limit = There is an error with the minimum and/or maximum set for ratings. Please check and try again. 
-label.minimum  =Minimum:
-label.maximum  =Maximum:
+label.minimum  =Minimum Number of Ratings:
+label.maximum  =Maximum Number of Ratings:
 label.no.minimum  =No minimum
 label.no.maximum  =No maximum
 label.minimum.number.words  =Minimum number of words in a comment {0}
 warning.minimum.number.words  =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s).
 label.comment.textarea.tip  =Type your comment here then click on the green tick.
-label.max.number.marks.each.user  =Max number of reviews per user
+label.max.number.marks.each.user  =Max number of reviews per user (applies only to Star Ratings)
 label.move.up  =Move Up
 label.move.down  =Move Down
 label.allow.comments  =Allow learners to comment on other learners
@@ -93,3 +93,31 @@
 creating.users.message  =Please wait while the learners\' details are set up ready for you to review their responses.
 error.max.ratings.per.user=Unable to save the review - the maximum number of ratings may have been reached. The page will now be refreshed.
 export.tool.export.not.supported=This tool does not support export portfolio.
+label.rating.rank=Rank
+label.rating.style.star=Star Rating
+label.rating.style.ranking=Ranking
+label.rating.style.hedging=Hedging
+label.rating.all=ALL
+label.rating.author.justify=Ask for hedging justification?
+label.rating.learner.hedge.assign.marks=Assign marks to answers. Max possible mark: 10
+label.rating.learner.justify=Please, justify your mark allocation.
+label.rating.max.hedge=Total Hedge Mark
+error.rating.hedge.total.add.up=Marks for criteria {0} must add up to {1}
+error.rating.rank.all=You must rank all the learners for criteria {0}
+label.justify.hedging.marks=Justify your mark allocation.
+label.assign.marks=Assign up to {0} marks altogether, sharing marks across learners. Current total: {1}.
+error.assign.marks=The marks must add up to {0}. 
+label.assign.ranks=Fill the boxes with the top {0} entries, by dragging the learners' name onto the box.
+error.assign.ranks=You must complete all {0} boxes. 
+label.assign.rankAll=Order the learners in ranking order, from first to last, by dragging learners from the right hand column to the left column. Dragging a name on top of another will put the new name first. All learners must be ranked. 
+error.assign.rankAll=All learners must be ranked. 
+label.ranked=Ranked
+label.unranked=Unranked
+label.addlearnerhere=Add learner here....
+label.alllearnersadded=All learners added
+label.next=Next
+label.previous=Previous
+label.step=Step {0} of {1}
+label.mark=Mark
+label.rank=Rank
+label.authoring.self.review=Allow Self Review
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java	11 May 2016 07:37:53 -0000	1.3.2.2
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java	10 Oct 2016 00:31:05 -0000	1.3.2.3
@@ -35,7 +35,13 @@
     public static final int SORT_BY_NO = 0;
     public static final int SORT_BY_USERNAME_ASC = 1;
     public static final int SORT_BY_USERNAME_DESC = 2;
-
+    public static final int SORT_BY_AVERAGE_RESULT_ASC = 3;
+    public static final int SORT_BY_AVERAGE_RESULT_DESC = 4;
+    
+    public static final int GET_RESULTS_FOR_ALL_USERS_BY_THIS_USER = 0; // used for the edit screens
+    public static final int GET_RESULTS_FOR_ALL_USERS_BY_ALL_USERS = 1; // used for "everyone's results" on the results screen
+    public static final int GET_RESULTS_BY_ALL_USERS_FOR_THIS_USER = 2; //used for "current user's results" on the results screen
+    
     // for action forward name
     public static final String SUCCESS = "success";
 
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java	11 May 2016 07:37:53 -0000	1.2.2.3
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java	10 Oct 2016 00:31:04 -0000	1.2.2.4
@@ -25,6 +25,8 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
+import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
 
@@ -44,8 +46,13 @@
 
     List<PeerreviewUser> getUsersForTablesorter(final Long toolSessionId, final Long excludeUserId, int page, int size,
 	    int sorting);
-
+    
+    List<Object[]> getRatingsComments(Long toolContentId, RatingCriteria criteria, Long userId, Integer page,
+	    Integer size, int sorting, boolean getByUser, IRatingService coreRatingService);
+	    
     int getCountUsersBySession(Long toolSessionId);
 
     int createUsersForSession(PeerreviewSession session);
+    
+
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java,v
diff -u -r1.2.2.4 -r1.2.2.5
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	11 May 2016 07:37:53 -0000	1.2.2.4
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	10 Oct 2016 00:31:04 -0000	1.2.2.5
@@ -25,8 +25,11 @@
 
 import java.util.List;
 
+import org.hibernate.Query;
 import org.hibernate.SQLQuery;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
+import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewUserDAO;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
@@ -52,7 +55,7 @@
     private static final String GET_COUNT_USERS_FOR_SESSION = "SELECT COUNT(*) FROM " + PeerreviewUser.class.getName()
 	    + " AS r WHERE r.session.sessionId=?";
 
-    private static final String LOAD_USERS_FOR_SESSION_LIMIT = "FROM user in class PeerreviewUser "
+    private static final String LOAD_USERS_FOR_SESSION_LIMIT_OLD = "FROM user in class PeerreviewUser "
 	    + "WHERE user.session.sessionId=:toolSessionId AND user.userId!=:excludeUserId order by ";
 
     @Override
@@ -124,11 +127,14 @@
 		break;
 	}
 
-	return getSession().createQuery(LOAD_USERS_FOR_SESSION_LIMIT + sortingOrder)
+	return getSession().createQuery(LOAD_USERS_FOR_SESSION_LIMIT_OLD + sortingOrder)
 		.setLong("toolSessionId", toolSessionId.longValue()).setLong("excludeUserId", excludeUserId.longValue())
 		.setFirstResult(page * size).setMaxResults(size).list();
     }
 
+    private static final String LOAD_USERS_FOR_SESSION_LIMIT = "FROM user in class PeerreviewUser "
+	    + "WHERE user.session.sessionId=:toolSessionId AND user.userId!=:excludeUserId order by ";
+
     private static final String CREATE_USERS = "INSERT into tl_laprev11_user (user_id, login_name, first_name, last_name, session_finished, session_uid) "
 	    + " SELECT user.user_id, user.login, user.first_name, user.last_name, 0, :session_uid "
 	    + " FROM lams_user user " + " JOIN lams_user_group ug ON ug.user_id = user.user_id "
@@ -145,4 +151,59 @@
 	query.setLong("session_uid", session.getUid()).setLong("tool_session_id", session.getSessionId());
 	return query.executeUpdate();
     }
+    
+    // column order is very important. The potential itemId must be first, followed by rating.*,
+    // and the user's first name and last name must be the last two columns or the DTO conversion will fail.
+    // See PeerreviewServiceImpl.getUsersRatingsCommentsByCriteriaId
+    private static final String FIND_USER_RATINGS_COMMENTS1 = "SELECT user.user_id, rating.*, user.first_name, user.last_name "
+	    + " FROM tl_laprev11_peerreview p "
+	    + " JOIN tl_laprev11_session sess ON p.content_id = :toolContentId AND p.uid = sess.peerreview_uid  "
+	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid "
+	    + " LEFT JOIN ( ";
+    private static final String FIND_USER_RATINGS_COMMENTS2 = " ) rating ON user.user_id = rating.item_id ";
+    
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<Object[]> getRatingsComments(Long toolContentId, RatingCriteria criteria, Long userId, Integer page,
+    Integer size, int sorting, boolean getByUser, IRatingService coreRatingService) {
+	String sortingOrder = "";
+	switch (sorting) {
+	    case PeerreviewConstants.SORT_BY_NO:
+		sortingOrder = "ORDER BY user.user_id";
+		break;
+	    case PeerreviewConstants.SORT_BY_USERNAME_ASC:
+		sortingOrder = "ORDER BY user.first_name ASC";
+		break;
+	    case PeerreviewConstants.SORT_BY_USERNAME_DESC:
+		sortingOrder = "ORDER BY user.first_name DESC";
+		break;
+	    case PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC:
+		sortingOrder = criteria.isCommentRating() ? "ORDER BY rating.comment ASC" : "ORDER BY rating.average_rating ASC";
+		break;
+	    case PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC:
+		sortingOrder = criteria.isCommentRating() ? "ORDER BY rating.comment DESC" : "ORDER BY rating.average_rating DESC";
+	}
+
+    	StringBuilder bldr =  new StringBuilder(FIND_USER_RATINGS_COMMENTS1);
+    	bldr.append(coreRatingService.getRatingSelectJoinSQL(criteria.getRatingStyle(), getByUser));
+    	bldr.append(FIND_USER_RATINGS_COMMENTS2);
+    	if ( ! getByUser) 
+    	    bldr.append("WHERE user.user_id = :userId ");
+    	
+    	bldr.append(sortingOrder);
+    	
+	String queryString = bldr.toString();
+	Query query = getSession().createSQLQuery(queryString)
+		.setLong("toolContentId", toolContentId)
+		.setLong("ratingCriteriaId", criteria.getRatingCriteriaId());
+	if ( queryString.contains(":userId") ) {
+		query.setLong("userId", userId);
+	}
+	if ( page != null && size != null ) {
+	    query.setFirstResult(page * size).setMaxResults(size);
+	}
+	return (List<Object[]>) query.list();
+    }
+
 }
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161004.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.2 -r1.2.2.3
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	11 May 2016 07:37:53 -0000	1.2.2.2
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	10 Oct 2016 00:31:05 -0000	1.2.2.3
@@ -79,6 +79,8 @@
     private boolean reflectOnActivity;
 
     private String reflectInstructions;
+    
+    private boolean selfReview;
 
     // **********************************************************
     // Function method for Peerreview
@@ -382,4 +384,12 @@
     public void setReflectOnActivity(boolean reflectOnActivity) {
 	this.reflectOnActivity = reflectOnActivity;
     }
+
+    public boolean isSelfReview() {
+        return selfReview;
+    }
+
+    public void setSelfReview(boolean selfReview) {
+        this.selfReview = selfReview;
+    }
 }
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.2 -r1.4.2.3
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	11 May 2016 07:37:53 -0000	1.4.2.2
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	10 Oct 2016 00:31:05 -0000	1.4.2.3
@@ -25,10 +25,15 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
+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.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.ReflectDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
@@ -42,6 +47,12 @@
  */
 public interface IPeerreviewService extends ToolRatingManager {
 
+    // TODO remove!
+    int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings);
+    void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment);
+    RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId);
+
+    
     /**
      * Get <code>Peerreview</code> by toolContentID.
      *
@@ -69,6 +80,8 @@
     List<PeerreviewUser> getUsersBySession(Long toolSessionId);
 
     List<PeerreviewUser> getUsersByContent(Long toolContentId);
+    
+    List<Long> getUserIdsBySessionID(Long sessionId);
 
     /**
      * Get user by given userID and toolContentID.
@@ -215,6 +228,8 @@
 
     int getCommentsMinWordsLimit(Long toolContentId);
 
+    List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId);
+    
     /**
      * Returns item DTO with all corresponding ratings and comments. Doesn't contain average and total amount of rates.
      *
@@ -233,5 +248,23 @@
     List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem);
 
+    /** 
+     * Gets all the users in the session and any existing ratings for a given criteria. If you want to use the tablesorter
+     * set skipRatings to true and it will just get the main criteria details, then on the jsp page call a tablesorter
+     * function that call getUsersRatingsCommentsByCriteriaJSON, with the page and size are included. 
+     * Self rating === getAllUsers
+     * If you want the ratings done *by* the user XYZ, set getByUser to true and currentUser id to XYZ's user id.
+     * If you want the ratings done *for* user XYZ,  set getByUser to true and currentUser id to XYZ's user id.
+     * user, set getByUser to false and set currentUserId to the current user id. 
+     */
+    StyledCriteriaRatingDTO getUsersRatingsCommentsByCriteriaIdDTO(Long toolContentId, RatingCriteria criteria, 
+	    Long currentUserId, boolean skipRatings, int sorting, boolean getAllUsers, boolean getByUser);
+
+    /** 
+     * Gets all the users in the session and any existing ratings for a given criteria in JSON format. 
+     */
+    JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, RatingCriteria criteria, Long currentUserId, 
+	    Integer page, Integer size, int sorting, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException ;
+
     String getLocalisedMessage(String key, Object[] args);
 }
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.8 -r1.7.2.9
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	15 Jun 2016 08:07:25 -0000	1.7.2.8
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	10 Oct 2016 00:31:05 -0000	1.7.2.9
@@ -38,7 +38,9 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.log4j.Logger;
+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.learning.service.ILearnerService;
@@ -49,6 +51,7 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 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.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.rating.service.IRatingService;
@@ -160,6 +163,11 @@
     }
 
     @Override
+    public List<Long> getUserIdsBySessionID(Long sessionId) {
+	return peerreviewUserDao.getUserIdsBySessionID(sessionId);
+    }
+
+    @Override
     public void saveOrUpdatePeerreview(Peerreview peerreview) {
 	peerreviewDao.saveObject(peerreview);
     }
@@ -342,6 +350,61 @@
 	}
     }
 
+    @Override
+    public int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings) {
+	return ratingService.rateItems(ratingCriteria, userId, newRatings);
+    }
+
+    @Override
+    public void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment)
+    {
+	ratingService.commentItem(ratingCriteria, userId, itemId, comment);
+    }
+
+    @Override
+    public RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId) {
+	return ratingService.getCriteriaByCriteriaId(ratingCriteriaId);
+    }
+
+    @Override
+    public StyledCriteriaRatingDTO getUsersRatingsCommentsByCriteriaIdDTO(Long toolContentId, RatingCriteria criteria, 
+	    Long currentUserId, boolean skipRatings, int sorting, boolean getAllUsers, boolean getByUser) {
+	
+	if ( skipRatings ) {
+	    return ratingService.convertToStyledDTO(criteria, currentUserId, getAllUsers, null);
+	}
+	
+	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, criteria, 
+		currentUserId, null, null, sorting, getByUser, ratingService);
+
+	for ( Object[] raw : rawData ) {
+	    int len = raw.length;
+	    StringBuilder description = new StringBuilder((String)raw[len-2] ).append(" ").append((String)raw[len-1]);	    
+	    raw[len-1] = (Object) StringEscapeUtils.escapeCsv(description.toString());
+	}
+	// 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.convertToStyledDTO(criteria, currentUserId, !getByUser || getAllUsers, rawData);
+    }
+
+    @Override
+    public JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, RatingCriteria criteria, Long currentUserId, 
+	    Integer page, Integer size, int sorting, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException {
+
+	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, criteria, 
+		currentUserId, page, size, sorting, getByUser, ratingService);
+	
+	for ( Object[] raw : rawData ) {
+	    int len = raw.length;
+	    StringBuilder description = new StringBuilder((String)raw[len-2] ).append(" ").append((String)raw[len-1]);	    
+	    raw[len-1] = (Object) StringEscapeUtils.escapeCsv(description.toString());
+	}
+	// 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, needRatesPerUser);
+    }
+
+    
     // *****************************************************************************
     // private methods
     // *****************************************************************************
@@ -630,6 +693,11 @@
     }
 
     @Override
+    public List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId) {
+	return ratingService.getCriteriasByToolContentId(toolContentId);
+    }
+    
+    @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
 	return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId);
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.2 -r1.5.2.3
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	11 May 2016 07:37:53 -0000	1.5.2.2
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	10 Oct 2016 00:31:05 -0000	1.5.2.3
@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -55,6 +56,8 @@
 import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.dto.RatingCommentDTO;
+import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
@@ -86,9 +89,24 @@
 	if (param.equals("start")) {
 	    return start(mapping, form, request, response);
 	}
+	if (param.equals("refresh")) {
+	    return refresh(mapping, form, request, response);
+	}
 	if (param.equals("getUsers")) {
 	    return getUsers(mapping, form, request, response);
 	}
+	if (param.equals("edit")) {
+	    return edit(mapping, form, request, response);
+	}
+	if (param.equals("submitHedging")) {
+	    return submitRankingHedging(mapping, form, request, response);
+	}
+	if (param.equals("submitRanking")) {
+	    return submitRankingHedging(mapping, form, request, response);
+	}
+	if (param.equals("nextPrev")) {
+	    return nextPrev(mapping, form, request, response);
+	}
 	if (param.equals("showResults")) {
 	    return showResults(mapping, form, request, response);
 	}
@@ -104,6 +122,11 @@
 	    return submitReflection(mapping, form, request, response);
 	}
 
+	
+	if (param.equals("getUsersMonitoring")) {
+	    return getUsersMonitoring(mapping, form, request, response);
+	}
+	
 	return mapping.findForward(PeerreviewConstants.ERROR);
     }
 
@@ -114,10 +137,11 @@
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
      * 
      * @throws IOException
+     * @throws ServletException 
      *
      */
     private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
+	    HttpServletResponse response) throws IOException, ServletException {
 
 	IPeerreviewService service = getPeerreviewService();
 
@@ -127,6 +151,7 @@
 
 	// save toolContentID into HTTPSession
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+	
 
 	Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
 
@@ -162,11 +187,46 @@
 	    return mapping.findForward("defineLater");
 	} else {
 	    // goto standard screen
-	    return startRating(mapping, form, request, response, service, sessionMap, sessionId, user, mode);
+	    sessionMap.put(PeerreviewConstants.PARAM_TOOL_SESSION_ID, sessionId);
+	    sessionMap.put(AttributeNames.ATTR_MODE, mode);
+	    sessionMap.put(PeerreviewConstants.ATTR_USER, user);
+	    return startRating(mapping, form, request, response, service, sessionMap, sessionId, user, mode, null, null);
 	}
 
     }
 
+    /**
+     * Same as start but doesn't create a new session map. 
+     * 
+     * @throws IOException
+     * @throws ServletException 
+     *
+     */
+    private ActionForward refresh(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+
+	IPeerreviewService service = getPeerreviewService();
+
+	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, sessionMapID);
+
+	Long sessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID);
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	PeerreviewUser user = (PeerreviewUser) sessionMap.get(PeerreviewConstants.ATTR_USER);
+	    
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(PeerreviewConstants.PARAM_TOOL_SESSION_ID, sessionId);
+
+	Long criteriaId = WebUtil.readLongParam(request, "criteriaId", true);
+	RatingCriteria criteria = criteriaId != null ? service.getCriteriaByCriteriaId(criteriaId) : null;
+	
+	return startRating(mapping, form, request, response, service, sessionMap, sessionId, user, mode, criteria, null);
+
+    }
+    
     private class UserCreateThread implements Runnable {
 	private Long toolSessionId;
 	private IPeerreviewService service;
@@ -198,11 +258,12 @@
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
      * 
      * @throws IOException
+     * @throws ServletException 
      *
      */
     private ActionForward startRating(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response, IPeerreviewService service, SessionMap sessionMap, Long sessionId,
-	    PeerreviewUser user, ToolAccessMode mode) throws IOException {
+	    PeerreviewUser user, ToolAccessMode mode, RatingCriteria currentCriteria, Boolean next) throws IOException, ServletException {
 
 	Peerreview peerreview = service.getPeerreviewBySessionId(sessionId);
 
@@ -219,10 +280,7 @@
 	sessionMap.put(PeerreviewConstants.ATTR_TITLE, peerreview.getTitle());
 	sessionMap.put(PeerreviewConstants.ATTR_RESOURCE_INSTRUCTION, peerreview.getInstructions());
 	sessionMap.put(PeerreviewConstants.ATTR_LOCK_ON_FINISH, peerreview.getLockWhenFinished());
-	sessionMap.put(PeerreviewConstants.ATTR_USER, user);
 
-	sessionMap.put(PeerreviewConstants.PARAM_TOOL_SESSION_ID, sessionId);
-	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	// reflection information
 	sessionMap.put(PeerreviewConstants.ATTR_REFLECTION_ON, peerreview.isReflectOnActivity());
 	sessionMap.put(PeerreviewConstants.ATTR_REFLECTION_INSTRUCTION, peerreview.getReflectInstructions());
@@ -233,17 +291,6 @@
 	    return mapping.findForward("defineLater");
 	}
 
-	// handle rating criterias
-	boolean isCommentsEnabled = service.isCommentsEnabled(peerreview.getContentId());
-	sessionMap.put("isCommentsEnabled", isCommentsEnabled);
-
-	int commentsMinWordsLimit = service.getCommentsMinWordsLimit(peerreview.getContentId());
-	sessionMap.put("commentsMinWordsLimit", commentsMinWordsLimit);
-
-	// store how many items are rated
-	int countRatedUsers = service.getCountItemsRatedByUser(peerreview.getContentId(), user.getUserId().intValue());
-	sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedUsers);
-
 	// set contentInUse flag to true!
 	peerreview.setContentInUse(true);
 	peerreview.setDefineLater(false);
@@ -259,20 +306,72 @@
 	    user.setSessionFinished(false);
 	    service.createUser(user);
 	}
-	sessionMap.put("isDisabled",
-		peerreview.getLockWhenFinished() && user.isSessionFinished() || (mode != null) && mode.isTeacher());
+
+	RatingCriteria newCriteria = null;
+	if (!user.isSessionFinished()) {
+	    // mark user as finished if there are not any criterias or we have processed the last one.
+	    List<RatingCriteria> criterias = service.getCriteriasByToolContentId(peerreview.getContentId());
+	    sessionMap.put("numCriteria", criterias.size());
+
+	    if (criterias.size() > 0) {
+		if (currentCriteria == null) {
+		    // get the first one
+		    newCriteria = criterias.get(0);
+		} else if ( next == null ) {
+		    // reload the current one
+		    newCriteria = currentCriteria;
+		} else if ( next ) {
+		    // get the next one
+		    for (RatingCriteria toCheck : criterias) {
+			if (toCheck.getOrderId() > currentCriteria.getOrderId() ) {
+			    newCriteria = toCheck;
+			    break;
+			}
+		    }
+		} else { 
+		    // get the previous one
+		    RatingCriteria prev = null;
+		    for (RatingCriteria toCheck : criterias) {
+			if ( toCheck.getOrderId() == currentCriteria.getOrderId() ) {
+			    newCriteria = prev != null ? prev : currentCriteria;
+			    break;
+			} else {
+			    prev = toCheck;
+			}
+		    }
+
+		}
+
+	    }
+
+	    if (newCriteria == null) {
+		user.setSessionFinished(true);
+		service.createUser(user);
+	    }
+
+	}
+
+	sessionMap.put("isDisabled", peerreview.getLockWhenFinished() && user.isSessionFinished() || (mode != null)
+	    && mode.isTeacher());
 	sessionMap.put(PeerreviewConstants.ATTR_USER_FINISHED, user.isSessionFinished());
 	sessionMap.put("isSessionCompleted", user.getSession().getStatus() == PeerreviewConstants.COMPLETED);
 
-	// show results page
-	if (user.isSessionFinished() && peerreview.isShowRatingsLeftForUser()) {
-
-	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
+	// finally, work out which page to go to!
+	if (user.isSessionFinished()) {
+	    ActionRedirect redirect;
+	    if ( peerreview.isShowRatingsLeftForUser() || entryText.length() > 0 ) {
+        	    redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
+	    } else if ( peerreview.isReflectOnActivity() ) {
+		// do reflection
+        	    redirect = new ActionRedirect(mapping.findForwardConfig("newReflection"));
+	    } else {
+		// finish
+		redirect = new ActionRedirect(mapping.findForwardConfig("finish"));
+	    }
 	    redirect.addParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    return redirect;
-
 	} else {
-	    return mapping.findForward(PeerreviewConstants.SUCCESS);
+	    return doEdit(mapping, request, service, sessionMap, sessionId, peerreview, newCriteria);
 	}
 
     }
@@ -302,51 +401,26 @@
 	}
 
 	// ratings left by the user
-	List<Long> itemIds = new LinkedList<Long>();
-	List<PeerreviewUser> sessionUsers = service.getUsersBySession(sessionId);
-	for (PeerreviewUser userIter : sessionUsers) {
-	    //excempt user himself
-	    if (!user.getUserId().equals(userIter.getUserId())) {
-		itemIds.add(userIter.getUserId());
-	    }
-	}
+	List<RatingCriteria> ratingCriterias = service.getRatingCriterias(peerreview.getContentId());
+	List<StyledCriteriaRatingDTO> allUsersDtos = new ArrayList<StyledCriteriaRatingDTO>(ratingCriterias.size());
+	List<StyledCriteriaRatingDTO> currentUserDtos = new ArrayList<StyledCriteriaRatingDTO>(ratingCriterias.size());
 
-	//filter out not rated by user
-	List<ItemRatingDTO> itemRatingDtos = service.getRatingCriteriaDtos(peerreview.getContentId(), itemIds, false,
-		user.getUserId());
-	List<ItemRatingDTO> ratedByUser = new ArrayList<ItemRatingDTO>();
-	for (ItemRatingDTO itemRatingDto : itemRatingDtos) {
-	    boolean isRatedByUser = itemRatingDto.getCommentPostedByUser() != null;
+	for (RatingCriteria criteria : ratingCriterias) {
+	    boolean showAllUsers = peerreview.isSelfReview() || criteria.isRankingStyleRating()
+		    || criteria.isHedgeStyleRating() || (mode != null && mode.isTeacher());
+	    int sorting = PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC;
+	    if (criteria.isRankingStyleRating())
+		sorting = PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC;
+	    allUsersDtos.add(service.getUsersRatingsCommentsByCriteriaIdDTO(peerreview.getContentId(), criteria,
+		    user.getUserId(), false, sorting, showAllUsers, true));
+	    currentUserDtos.add(service.getUsersRatingsCommentsByCriteriaIdDTO(peerreview.getContentId(), criteria,
+		    user.getUserId(), false, sorting, showAllUsers, false));
 
-	    for (ItemRatingCriteriaDTO criteriaDto : itemRatingDto.getCriteriaDtos()) {
-		if (StringUtils.isNotBlank(criteriaDto.getUserRating())) {
-		    isRatedByUser = true;
-		}
-	    }
-
-	    if (isRatedByUser) {
-		ratedByUser.add(itemRatingDto);
-	    }
 	}
-	request.setAttribute("itemRatingDtos", ratedByUser);
 
-	// ratings left by others for this user
-	List<Long> userIdList = Collections.singletonList(user.getUserId());
-	List<ItemRatingDTO> userRatingDtos = service.getRatingCriteriaDtos(peerreview.getContentId(), userIdList, true,
-		user.getUserId());
-	ItemRatingDTO userRatingDto = null;
-	if (userRatingDtos.size() == 1) {
-	    userRatingDto = userRatingDtos.get(0);
-	}
-	request.setAttribute("itemRatingDto", userRatingDto);
+	request.setAttribute("allCriteriaRatings", allUsersDtos);
+	request.setAttribute("userRatings", currentUserDtos);
 
-	//user name map
-	HashMap<Long, String> userNameMap = new HashMap<Long, String>();
-	for (PeerreviewUser userIter : sessionUsers) {
-	    userNameMap.put(userIter.getUserId(), userIter.getFirstName() + " " + userIter.getLastName());
-	}
-	request.setAttribute("userNameMap", userNameMap);
-
 	// check whether finish lock is enabled
 	sessionMap.put(PeerreviewConstants.ATTR_FINISH_LOCK, peerreview.getLockWhenFinished());
 
@@ -358,9 +432,9 @@
     }
 
     /**
-     * Refreshes user list.
+     * Refreshes user list. TODO remove once monitoring is done.
      */
-    public ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    public ActionForward getUsersMonitoring(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse res) throws IOException, ServletException, JSONException {
 	IPeerreviewService service = getPeerreviewService();
 
@@ -440,6 +514,7 @@
 		criteriasRow.put("averageRating", criteriaDto.getAverageRating());
 		criteriasRow.put("numberOfVotes", criteriaDto.getNumberOfVotes());
 		criteriasRow.put("userRating", criteriaDto.getUserRating());
+		criteriasRow.put("ratingStyle", criteriaDto.getRatingCriteria().getRatingStyle());
 
 		criteriasRows.put(criteriasRow);
 	    }
@@ -466,8 +541,241 @@
 	res.getWriter().print(new String(responcedata.toString()));
 	return null;
     }
+    /**
+     * Gets a paged set of data for stars or comments. These are directly saved to the database, not through
+     * LearnerAction like Ranking and Hedging. 
+     */
+    public ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException, JSONException {
 
+	IPeerreviewService service = getPeerreviewService();
+	
+	// get back SessionMap
+	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Peerreview peerreview = (Peerreview) sessionMap.get(PeerreviewConstants.ATTR_PEERREVIEW);
+
+	Long toolContentId = WebUtil.readLongParam(request, "toolContentId");
+	Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+	// in case of monitoring we show all results. in case of learning - don't show results from the current user
+	boolean isMonitoring = WebUtil.readBooleanParam(request, "isMonitoring", false);
+	Long userId = isMonitoring ? -1 : WebUtil.readLongParam(request, "userId");
+
+	// paging parameters of tablesorter
+	int size = WebUtil.readIntParam(request, "size");
+	int page = WebUtil.readIntParam(request, "page");
+	Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true);
+
+	int sorting = PeerreviewConstants.SORT_BY_NO;
+	if (isSort1 != null && isSort1.equals(0)) {
+	    sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+	} else if (isSort1 != null && isSort1.equals(1)) {
+	    sorting = PeerreviewConstants.SORT_BY_USERNAME_DESC;
+	}
+
+	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
+	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+	
+	JSONObject responsedata = new JSONObject();
+	responsedata.put("total_rows", service.getCountUsersBySession(toolSessionId, userId));
+	responsedata.put("rows", service.getUsersRatingsCommentsByCriteriaIdJSON(toolContentId, criteria, userId, 
+		page, size, sorting, peerreview.isSelfReview(), true, peerreview.getMaximumRatesPerUser() > 0 ));	
+	    
+	// store how many items are rated - not correct at present. 
+	int countRatedQuestions = service.getCountItemsRatedByUser(toolContentId, userId.intValue());
+	responsedata.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedQuestions);
+
+	res.setContentType("application/json;charset=utf-8");
+	res.getWriter().print(new String(responsedata.toString()));
+	return null;
+    }
+
     /**
+     * Edit / View an indiviual criteria.
+     *
+     * @throws IOException
+     * @throws ServletException 
+     *
+     */
+    public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+
+	IPeerreviewService service = getPeerreviewService();
+
+	// get back SessionMap
+	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, sessionMapID);
+
+	Long toolContentId = WebUtil.readLongParam(request, "toolContentId");
+	Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+	Peerreview peerreview = service.getPeerreviewBySessionId(toolSessionId);
+	
+	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
+	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+
+	return doEdit(mapping, request, service, sessionMap, toolSessionId, peerreview, criteria);
+    }
+
+    private ActionForward doEdit(ActionMapping mapping, HttpServletRequest request, IPeerreviewService service,
+	    SessionMap<String, Object> sessionMap, Long toolSessionId, Peerreview peerreview,
+	    RatingCriteria criteria) throws ServletException {
+	
+	Long toolContentId = peerreview.getContentId();
+	
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	PeerreviewUser user = (PeerreviewUser) sessionMap.get(PeerreviewConstants.ATTR_USER);
+
+	if ((peerreview.getLockWhenFinished() && user.isSessionFinished()) || (mode != null && mode.isTeacher())) {
+	    log.error("Unable to edit ranking/mark  for criteria " + criteria.getRatingCriteriaId()
+		    + " as either the mode is teacher or the user is finished. ToolSessionId " + toolSessionId
+		    + " User " + user + " mode " + mode);
+	    throw new ServletException(
+		    "Unable to edit ranking/mark as either the mode is teacher or the user is finished.");
+
+	}
+
+	Long userId = ( mode != null && mode.isTeacher() ) ? -1 : user.getUserId();
+
+	StyledCriteriaRatingDTO dto = service.getUsersRatingsCommentsByCriteriaIdDTO(toolContentId, criteria, userId, 
+		(criteria.isCommentRating() || criteria.isStarStyleRating()), PeerreviewConstants.SORT_BY_USERNAME_ASC, 
+		peerreview.isSelfReview(), true );
+	
+	// override the min/max for stars based on old settings if needed (original Peer Review kept one setting for all criteria )
+	if ( ( peerreview.getMinimumRates() > 0 || peerreview.getMaximumRates() > 0 ) && 
+	     ( dto.getRatingCriteria().getMinimumRates() == 0 && dto.getRatingCriteria().getMaximumRates() == 0 ) ) {
+	    dto.getRatingCriteria().setMinimumRates(peerreview.getMinimumRates());
+	    dto.getRatingCriteria().setMaximumRates(peerreview.getMaximumRates());
+	}
+
+	request.setAttribute("criteriaRatings", dto);
+	return mapping.findForward(PeerreviewConstants.SUCCESS);
+    }
+
+    /**
+     * Same as submitRankingHedging but doesn't update the records.
+     *
+     * @throws IOException
+     * @throws ServletException 
+     *
+     */
+    public ActionForward nextPrev(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	IPeerreviewService service = getPeerreviewService();
+
+	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
+		sessionMapID);
+
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	PeerreviewUser user = (PeerreviewUser) sessionMap.get(PeerreviewConstants.ATTR_USER);
+	Long toolSessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID);
+
+	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
+	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(PeerreviewConstants.PARAM_TOOL_SESSION_ID, toolSessionId);
+
+	Boolean next = WebUtil.readBooleanParam(request, "next");
+
+	// goto standard screen
+	return startRating(mapping, form, request, response, service, sessionMap, toolSessionId, user, mode, criteria, next);
+    }
+    
+    /**
+     * Submit the ranking / hedging data and go back to the main learning screen.
+     *
+     * @throws IOException
+     * @throws ServletException 
+     *
+     */
+    public ActionForward submitRankingHedging(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+
+	IPeerreviewService service = getPeerreviewService();
+
+	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, sessionMapID);
+
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	PeerreviewUser user = (PeerreviewUser) sessionMap.get(PeerreviewConstants.ATTR_USER);
+	Long toolSessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID);
+
+	Peerreview peerreview = service.getPeerreviewBySessionId(toolSessionId);
+
+	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
+	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+
+	if ( ! ( peerreview.getLockWhenFinished() && user.isSessionFinished() ) ) {
+
+	    Integer userId = user.getUserId().intValue();
+	    Map<Long, Float> ratings = new HashMap<Long, Float>();
+	    boolean valid = false;
+
+	    if (criteria.isHedgeStyleRating()) {
+		int totalMark = 0;
+		// mark1 contains the mark for itemid 1
+		for (String key : request.getParameterMap().keySet()) {
+		    if (key.startsWith("mark")) {
+			String itemIdString = key.substring(4);
+			Long itemId = new Long(itemIdString);
+			Long value = WebUtil.readLongParam(request, key);
+			if ( value > 0 ) {
+			    ratings.put(itemId, value.floatValue());
+			}
+			totalMark += value;
+		    }
+		}
+		valid = (totalMark == criteria.getMaxRating());
+	    } else if (criteria.isRankingStyleRating()) {
+		// rank1 contains the itemid for the learner ranked first.
+		for (String key : request.getParameterMap().keySet()) {
+		    if (key.startsWith("rank")) {
+			String valueString = key.substring(4);
+			Long value = new Long(valueString);
+			Long itemId = WebUtil.readLongParam(request, key, true);
+			if (itemId != null) {
+			    ratings.put(itemId, value.floatValue());
+			}
+		    }
+		}
+		valid = (ratings.size() == criteria.getMaxRating() || (ratings.size() >= service.getCountUsersBySession(
+			toolSessionId, userId.longValue())));
+	    }
+
+	    service.rateItems(criteria, userId, ratings);
+	    if (!valid) {
+		request.setAttribute("notcomplete", true);
+		return doEdit(mapping, request, service, sessionMap, toolSessionId, peerreview, criteria);
+	    }
+
+	    if (criteria.isHedgeStyleRating() && criteria.isCommentsEnabled()) {
+		String justify = request.getParameter("justify");
+		service.commentItem(criteria, userId, criteria.getRatingCriteriaId(), justify);
+	    }
+
+	}
+	
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(PeerreviewConstants.PARAM_TOOL_SESSION_ID, toolSessionId);
+
+	Boolean next = WebUtil.readBooleanParam(request, "next");
+
+	// goto standard screen
+	return startRating(mapping, form, request, response, service, sessionMap, toolSessionId, user, mode, criteria, next);
+    }
+    
+    /**
      * Finish learning session.
      *
      * @param mapping
@@ -487,6 +795,10 @@
 	// get mode and ToolSessionID from sessionMAP
 	Long sessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID);
 
+	return doFinish(mapping, request, sessionId);
+    }
+
+    private ActionForward doFinish(ActionMapping mapping, HttpServletRequest request, Long sessionId) {
 	IPeerreviewService service = getPeerreviewService();
 	// get sessionId from HttpServletRequest
 	String nextActivityUrl = null;
@@ -501,7 +813,7 @@
 	    LearningAction.log.error("Failed get next activity url:" + e.getMessage());
 	}
 
-	return mapping.findForward(PeerreviewConstants.SUCCESS);
+	return mapping.findForward("finish");
     }
 
     /**
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.1 -r1.1.2.2
--- lams_tool_preview/web/WEB-INF/struts-config.xml	16 May 2016 13:28:48 -0000	1.1.2.1
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	10 Oct 2016 00:31:04 -0000	1.1.2.2
@@ -88,11 +88,47 @@
 			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="showResults" path="/learning/showResults.do" />	
+			<forward name="newReflection" path="/learning/newReflection.do" />	
+			<forward name="finish" path="/pages/learning/finish.jsp" />
 		</action>
+		<action path="/learning/refresh"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
+			parameter="refresh" >
+			<forward name="success" path="/pages/learning/learning.jsp" />
+			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
+			<forward name="showResults" path="/learning/showResults.do" />	
+			<forward name="newReflection" path="/learning/newReflection.do" />	
+		</action>
 		<action path="/learning/getUsers"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
 			parameter="getUsers" >	
 		</action>
+		<action path="/learning/edit"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
+			parameter="edit" >
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>	
+		<action path="/learning/submitHedging"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
+			parameter="submitHedging" >
+			<forward name="showResults" path="/learning/showResults.do" />	
+			<forward name="newReflection" path="/learning/newReflection.do" />	
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>	
+		<action path="/learning/submitRanking"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
+			parameter="submitRanking" >
+			<forward name="showResults" path="/learning/showResults.do" />	
+			<forward name="newReflection" path="/learning/newReflection.do" />	
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>	
+		<action path="/learning/nextPrev"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
+			parameter="nextPrev" >
+			<forward name="showResults" path="/learning/showResults.do" />	
+			<forward name="newReflection" path="/learning/newReflection.do" />	
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>	
 		<action path="/learning/showResults"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
 			parameter="showResults" >
@@ -102,7 +138,7 @@
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
 			parameter="finish" >
-			<forward name="success" path="/pages/learning/finish.jsp" />
+			<forward name="finish" path="/pages/learning/finish.jsp" />
 		</action>
 		<!--  ========= Reflection =============== -->
 		<action path="/learning/newReflection"
@@ -122,7 +158,7 @@
 			parameter="submitReflection" 
 			scope="request">
 			<forward name="success" path="/pages/learning/finish.jsp" />
-
+			<forward name="finish" path="/pages/learning/finish.jsp" />
 		</action>
 		<!-- ========== BEGIN: Monitoring Definitions ============================== -->
 		<action path="/monitoring/summary"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag	16 May 2016 13:28:47 -0000	1.2.2.1
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag	10 Oct 2016 00:31:04 -0000	1.2.2.2
@@ -80,13 +80,12 @@
 <c:set var="isCommentsEnabled" value="false"/>
 <c:set var="commentsMinWordsLimit" value="0"/>
 <c:forEach var="criteria" items="${criterias}" varStatus="status">
-	<c:if test="${criteria.commentsEnabled}">
+	<c:if test="${criteria.ratingStyle == 0 && criteria.commentsEnabled}">
 		<c:set var="isCommentsEnabled" value="true"/>
 		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
 	</c:if>
 </c:forEach>
 
-<!-- begin tab content -->
 <script type="text/javascript">
 $(document).ready(function() { 
 	
@@ -253,7 +252,7 @@
 			<table class="table table-condensed table-no-border" id="criterias-table">
 		
 				<c:forEach var="criteria" items="${criterias}" varStatus="status">
-					<c:if test="${!criteria.commentsEnabled}">
+					<c:if test="${criteria.ratingStyle > 0}">
 						<tr>
 							
 							<td class="criteria-info">
@@ -341,7 +340,7 @@
 						<fmt:param> </fmt:param>
 					</fmt:message>
 				</label>
-				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
 			</div>
 		</div>
 	</div>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/StyledRating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	1 Jul 2016 02:09:24 -0000	1.1.2.6
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	10 Oct 2016 00:31:05 -0000	1.1.2.7
@@ -432,10 +432,18 @@
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>AuthoringRatingAllStyleCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>    		
    	<tag-file>
+       <name>StyledRating</name>
+       <path>/WEB-INF/tags/StyledRating.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
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.4 -r1.1.2.5
--- lams_tool_preview/web/includes/css/learning.css	17 May 2016 04:38:52 -0000	1.1.2.4
+++ lams_tool_preview/web/includes/css/learning.css	10 Oct 2016 00:31:05 -0000	1.1.2.5
@@ -1,4 +1,5 @@
-.rating-stars-div {margin-top: 8px;}
+/* .rating-stars-div {margin-top: 8px;}
+ */
 .user-answer {padding: 0 2px;}
 .tablesorter tr.odd:hover .jStar {
 	background-image: url(/lams/images/css/jquery.jRating-stars-grey.png)!important;
@@ -21,6 +22,10 @@
 	background-color: rgba(205, 205, 205, 0.1);
 	border: 1px solid rgba(205, 205, 205, 0.2);
 }
+.criteria-title{
+	margin-top: 10px;
+	font-weight: bold;	
+}
 textarea {
     margin: 10px 0px;
     width: 88%;
@@ -47,3 +52,28 @@
 .ui-jqgrid td {
 	border-style: none !important;
 }
+
+.divrankx {
+    width: 300px;
+    height: 30px;
+    margin: 5px;
+    padding: 5px;
+    border: 1px solid #aaaaaa;
+}
+
+.divrankxlabel {
+    height: 20px;
+    margin: 5px;
+    padding: 5px;
+}
+
+.drop-target {
+  	background-color: #337ab7;
+}
+.draggable {
+	width: 290px;
+}
+.draggable.can-drop {
+  	background-color: #337ab7;
+}
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/includes/javascript/ranking.js'.
Fisheye: No comparison available.  Pass `N' to diff?
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.2 -r1.1.2.3
--- lams_tool_preview/web/pages/authoring/advance.jsp	1 Jul 2016 02:09:24 -0000	1.1.2.2
+++ lams_tool_preview/web/pages/authoring/advance.jsp	10 Oct 2016 00:31:04 -0000	1.1.2.3
@@ -25,10 +25,17 @@
 	</div>
 	
 	<div class="checkbox">
-	<label for="show-ratings-left-for-user"><html:checkbox property="peerreview.showRatingsLeftForUser"styleId="show-ratings-left-for-user"/>
+	<label for="show-ratings-left-for-user"><html:checkbox property="peerreview.showRatingsLeftForUser" styleId="show-ratings-left-for-user"/>
 	<fmt:message key="label.show.ratings.left.for.user" />
 	</label>
 	</div>
+
+	<div class="checkbox">
+	<label for="self-review"><html:checkbox property="peerreview.selfReview" styleId="self-review"/>
+	<fmt:message key="label.authoring.self.review" />
+	</label>
+	</div>
+
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.activity.completion">
Index: lams_tool_preview/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/basic.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/authoring/basic.jsp	16 May 2016 13:28:47 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/authoring/basic.jsp	10 Oct 2016 00:31:04 -0000	1.1.2.2
@@ -13,6 +13,6 @@
 </div>
 
 <div id="criterias-holder">
-	<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
+ 	<lams:AuthoringRatingAllStyleCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
 		formContentPrefix="peerreview"/>
 </div>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/learning/comment.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/learning/hedging.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/learning.jsp,v
diff -u -r1.6.2.6 -r1.6.2.7
--- lams_tool_preview/web/pages/learning/learning.jsp	17 May 2016 04:38:43 -0000	1.6.2.6
+++ lams_tool_preview/web/pages/learning/learning.jsp	10 Oct 2016 00:31:04 -0000	1.6.2.7
@@ -1,240 +1,84 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.rating.model.RatingCriteria" %>
 
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="mode" value="${sessionMap.mode}" />
-<c:set var="toolSessionId" value="${sessionMap.toolSessionId}" />
 <c:set var="peerreview" value="${sessionMap.peerreview}" />
+<c:set var="toolSessionId" value="${sessionMap.toolSessionId}" />
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
-<c:set var="isCommentsEnabled" value="${sessionMap.isCommentsEnabled}" />
+<c:set var="userId" value="${sessionMap.user.userId }"/>
+<c:set var="isComment" value="<%=RatingCriteria.RATING_STYLE_COMMENT%>"/>
+<c:set var="isStar" value="<%=RatingCriteria.RATING_STYLE_STAR%>"/>
+<c:set var="isRanking" value="<%=RatingCriteria.RATING_STYLE_RANKING%>"/>
+<c:set var="isHedging" value="<%=RatingCriteria.RATING_STYLE_HEDGING%>"/>
+<c:set var="numCriteria"  value="${sessionMap.numCriteria}" />
 
 <c:choose>
-	<c:when test="${peerreview.showRatingsLeftForUser}">
+	<c:when test="${peerreview.showRatingsLeftForUser || peerreview.reflectOnActivity}">
 		<c:set var="finishButtonLabel"><fmt:message key="label.continue" /></c:set>
 	</c:when>				
 	<c:otherwise>
 		<c:set var="finishButtonLabel"><fmt:message key="label.finished" /></c:set>
 	</c:otherwise>
 </c:choose>
 
+
+ 
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	
-	<%@ include file="/common/header.jsp"%>
-	<link rel="stylesheet" href="${lams}css/jquery.jRating.css">
-	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
-	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
-	<link rel="stylesheet" href="<html:rewrite page='/includes/css/learning.css'/>">
-	<style media="screen,projection" type="text/css">
-		#no-users-info {display: none;}
-	</style>
-
-	<script type="text/javascript">
-		//var for jquery.jRating.js
-		var pathToImageFolder = "${lams}images/css/";
-
-		//vars for rating.js
-		var MAX_RATES = ${peerreview.maximumRates},
-		MIN_RATES = ${peerreview.minimumRates},
-		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATINGS_FOR_ITEM = ${peerreview.maximumRatesPerUser},
-		LAMS_URL = '${lams}',
-		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>";
-	</script>
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:WebAppURL/>/includes/css/learning.css">
+	
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></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-widgets.js" type="text/javascript"></script>
-	<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
-	<script src="${lams}includes/javascript/common.js" type="text/javascript"></script>
-	<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script> 	
 	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
-	<script type="text/javascript">
 	
-	var 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>',
-	IS_DISABLED =  ${sessionMap.isDisabled};
-	
-	
-	$(document).ready(function(){
-		
-		$(".tablesorter").tablesorter({
-			theme: 'bootstrap',
-		    widthFixed: true,
-		    sortInitialOrder: 'desc',
-		    headerTemplate : '{content} {icon}',
-		    widgets: ['uitheme', 'zebra'],
-	        headers: { 
-	            1: { 
-	                sorter: false 
-	            }, 
-	            2: {
-	                sorter: false 
-	            } 
-	        }
-		});
-		
-		$(".tablesorter").each(function() {
-			$(this).tablesorterPager({
-				savePages: false,
-			    container: $(this).find(".ts-pager"),
-			    output: '{startRow} to {endRow} ({totalRows})',
-				cssPageDisplay: '.pagedisplay',
-				cssPageSize: '.pagesize',
-				cssDisabled: 'disabled',
-				ajaxUrl : "<c:url value='/learning/getUsers.do'/>?page={page}&size={size}&{sortList:column}&sessionMapID=${sessionMapID}&toolContentId=${peerreview.contentId}&toolSessionId=${toolSessionId}&userId=<lams:user property='userID' />",
-				ajaxProcessing: function (data) {
-			    	if (data && data.hasOwnProperty('rows')) {
-			    		var rows = [],
-			            json = {},
-						countRatedItems = data.countRatedItems;
+	<script type="text/javascript">
 
-			    		if (data.rows.length == 0) {
-			    			$(".tablesorter,.pager").hide();
-			    			$("#no-users-info").show();
-			    		}
-			    		
-						for (i = 0; i < data.rows.length; i++){
-							var userData = data.rows[i];
-							var itemId = userData["userId"];
-							var isMaximumRatesPerUserReached = (${peerreview.maximumRatesPerUser} != 0) && (userData.ratesPerUser >= ${peerreview.maximumRatesPerUser});
-							
-							rows += '<tr>';
+		function hideButtons() {
+			$("#buttondiv").css("visibility", "hidden");
+		}	
+		function showButtons() {
+			$("#buttondiv").css("visibility", "visible");
+		}	
 
-							rows += '<td class="username"><span>';
-							rows += userData["userName"];
-							rows += '</span>'
-
-							if (isMaximumRatesPerUserReached) {
-								rows += '<br/><div class="alert alert-warning"><i class="fa fa-exclamation-circle text-muted"></i> <fmt:message key="label.cant.rate" /></div>';
-							}
-
-							rows += '</td>';
-							
-							rows += '<td class="rating">';
-							rows += 	'<div class="rating-stars-holder text-center center-block">';
-
-							// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
-							var hasStartedRating = false;
-							for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
-								hasStartedRating = userData.criteriaDtos[j].userRating != "";
-								if ( hasStartedRating) {
-									idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
-								}
-							}
-							hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
-							
-							var isDisabled = IS_DISABLED || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) && ! hasStartedRating || isMaximumRatesPerUserReached;
-							
-							for (j = 0; j < userData.criteriaDtos.length; j++){
-								var criteriaDto = userData.criteriaDtos[j];
-								var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
-								var averageRating = criteriaDto.averageRating;
-								var numberOfVotes = criteriaDto.numberOfVotes;
-								var userRating = criteriaDto.userRating;
-								var isCriteriaNotRatedByUser = userRating == "";
-								var averageRatingDisplayed = (!isCriteriaNotRatedByUser) ? averageRating : 0;
-								var ratingStarsClass = (isDisabled || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
-							
-								rows += '<strong>';
-								rows += 	 criteriaDto.title;
-								rows += '</strong>';
-										
-								rows += '<div class="'+ ratingStarsClass +' rating-stars-new" data-average="'+ averageRatingDisplayed +'" data-id="'+ objectId +'">';
-								rows += '</div>';
-									
-								rows += '<div class="rating-stars-caption" id="rating-stars-caption-'+ objectId +'"';
-								if (isCriteriaNotRatedByUser) {
-									rows += ' style="visibility: hidden;"';	
-								}
-								rows += '>';
-								var temp = YOUR_RATING_LABEL.replace("@1@", '<span id="user-rating-'+ objectId +'">'+ userRating + '</span>');
-								temp = temp.replace("@2@", '<span id="average-rating-'+ objectId +'">'+ averageRating + '</span>');
-								temp = temp.replace("@3@", '<span id="number-of-votes-'+ objectId +'">'+ numberOfVotes + '</span>');
-								rows += 	temp;
-								rows += '</div>';
-							}
-									
-							rows += 	'</div>';
-							rows += '</td>';
-							
-							if (${isCommentsEnabled}) {
-								rows += '<td class="comment" id="comments-area-' + itemId + '">';
-								
-								var commentsCriteriaId = userData["commentsCriteriaId"];
-								var commentPostedByUser = userData["commentPostedByUser"];
-									
-								//show all comments needs to be shown
-								if (commentPostedByUser != "") {
-									rows += '<div class="rating-comment">';
-									rows += 	commentPostedByUser;
-									rows += '</div>';
-										
-								//show comments textarea and a submit button
-								} else if (!isDisabled) {
-									rows += '<div id="add-comment-area-' + itemId + '">';	
-									rows += '<div class="no-gutter">';
-									rows += '';
-									rows += '<div class="col-xs-12 col-sm-11 ">';										
-									rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
-									rows += '</div>';
-									rows += 	'<div class="button add-comment add-comment-new col-xs-12 col-sm-1" data-item-id="'+ itemId +'" data-comment-criteria-id="'+ commentsCriteriaId +'">';
-									rows += 	'</div>';
-									
-									rows += '';
-									rows += '';
-									rows += '</div>';											
-								}
-								
-								rows += '</td>';
-							}
-							
-							rows += '</tr>';
-						}
-			            
-						json.total = data.total_rows;
-						json.rows = $(rows);
-						return json;
-			    	}
-				}
-			})
-			
-			// bind to pager events
-			.bind('pagerInitialized pagerComplete', function(event, options){
-				initializeJRating();
-			});
-		});
-	 });
-	
-		function finishSession(){
-			document.getElementById("finishButton").disabled = true;
+ 		function finishSession(){
+ 			hideButtons();
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionId=${toolSessionId}"/>';
 			return false;
 		}
 
 		function showResults(){
-			document.getElementById("finishButton").disabled = true;
+			hideButtons();
 			document.location.href ='<c:url value="/learning/showResults.do?sessionMapID=${sessionMapID}"/>';
 			return false;
 		}
 		
 		function continueReflect(){
+			hideButtons();
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
 		
 		function refresh(page){
-			document.location.href='<c:url value="/learning/start.do?mode=learner&toolSessionID=${toolSessionId}"/>';
+			hideButtons();
+			document.location.href='<c:url value="/learning/refresh.do?sessionMapID=${sessionMapID}&criteriaId=${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>';
 		}
-
+		function nextprev(next){
+			hideButtons();
+			document.location.href='<c:url value="/learning/nextPrev.do?sessionMapID=${sessionMapID}&criteriaId=${criteriaRatings.ratingCriteria.ratingCriteriaId}&next='+next+'"/>';
+		}
+/*
 		function onRatingErrorCallback() {
 			alert('<fmt:message key="error.max.ratings.per.user"/>');
 			refresh();
 		}
-
-    </script>
+ */
+     </script>
 </lams:head>
 <body class="stripes">
 
@@ -252,107 +96,67 @@
 				</c:choose>
 			</lams:Alert>
 		</c:if>
-		
-		<!-- Rating limits info -->
-		<c:if test="${peerreview.minimumRates ne 0 || peerreview.maximumRates ne 0}">
-		
-			<lams:Alert type="info" id="rate-limits-reminder" close="false">
-				<c:choose>
-					<c:when test="${peerreview.minimumRates ne 0 and peerreview.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder">
-							<fmt:param value="${peerreview.minimumRates}"/>
-							<fmt:param value="${peerreview.maximumRates}"/>
-						</fmt:message>
-					</c:when>
-					
-					<c:when test="${peerreview.minimumRates ne 0 and peerreview.maximumRates eq 0}">
-						<fmt:message key="label.rate.limits.reminder.min">
-							<fmt:param value="${peerreview.minimumRates}"/>
-						</fmt:message>
-					</c:when>
-					
-					<c:when test="${peerreview.minimumRates eq 0 and peerreview.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder.max">
-							<fmt:param value="${peerreview.maximumRates}"/>
-						</fmt:message>
-					</c:when>
-				</c:choose>
 
-				<BR/>
-				<fmt:message key="label.rate.limits.topic.reminder">
-					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>"/>
-				</fmt:message>
-			</lams:Alert>
-				
+		<div class="panel">
+			<p><c:out value="${peerreview.instructions}" escapeXml="false"/><p>
+			<p><fmt:message key="label.step"><fmt:param>${criteriaRatings.ratingCriteria.orderId}</fmt:param><fmt:param>${numCriteria}</fmt:param></fmt:message></p>
+		</div>
 			
-		</c:if>
-				
-		<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
-			<lams:Alert type="info" id="rate-limits-reminder" close="false">
-				<fmt:message key="label.comment.minimum.number.words">
-					<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
-				</fmt:message>
-			</lams:Alert>
-		</c:if>
-				
-		<p>
-			<c:out value="${peerreview.instructions}" escapeXml="false"/>
-		</p>
-
-		<c:set var="numColumns" value="2"/>
-		<c:if test="${isCommentsEnabled}">
-			<c:set var="numColumns" value="3"/>
-		</c:if>
-	
-		<lams:TSTable numColumns="${numColumns}">
-			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
-				<fmt:message key="label.user.name" />
-			</th>
-			<th class="rating">  
-				<fmt:message key="label.rating" />
-			</th>
-			<c:if test="${isCommentsEnabled}">
-				<th class="comment"> 
-					<fmt:message key="label.comment" />
-				</th>
-			</c:if>
-		</lams:TSTable>
-							
-		<div id="no-users-info">
-			<fmt:message key="label.no.users" />
+		<div class="panel">
+			<h4>${criteriaRatings.ratingCriteria.title}</h4>
+		<c:choose>
+		<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isComment}">
+			<%@ include file="comment.jsp" %>
+		</c:when>
+		<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isStar}">
+			<%@ include file="star.jsp" %>
+		</c:when>
+		<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRanking}">
+			<c:choose>
+			<c:when test="${criteriaRatings.ratingCriteria.maxRating == 0}">
+			<%@ include file="rankall.jsp" %>
+			</c:when>
+			<c:otherwise>
+			<%@ include file="ranking.jsp" %>
+			</c:otherwise>
+			</c:choose>		
+		</c:when>
+		<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isHedging}">
+			<%@ include file="hedging.jsp" %>
+		</c:when>
+		</c:choose>		
 		</div>
 	
-		<!-- Reflection -->
-		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<%@ include file="notebookdisplay.jsp"%>
-		</c:if>
-		<!-- End Reflection -->
+		<c:choose>	
+			<c:when test="${finishedLock || mode == 'teacher'}">
+				<c:set var="method">nextPrev</c:set>
+			</c:when>
+			<c:otherwise>
+				<c:set var="method">submitEntry</c:set>
+			</c:otherwise>
+		</c:choose>
 
-		<c:if test="${mode != 'teacher'}">
-				<html:button property="FinishButton" styleId="finishButton" onclick="refresh()" styleClass="btn btn-default voffset5 pull-left">
-					<fmt:message key="label.refresh" />
-				</html:button>
-				<div id="learner-submit"> <!-- div needed to enforce min num of ratings -->
-				<c:choose>
-					<c:when test="${peerreview.showRatingsLeftForUser}">
-						<html:button property="FinishButton" styleId="finishButton" onclick="return showResults()" styleClass="btn btn-primary voffset5 pull-right">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>				
-					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
-							<fmt:message key="label.finished" />
-						</html:link>
-					</c:otherwise>
-				</c:choose>
-				</div>
-		</c:if>
+		<div class="voffset5" id="buttondiv">
 		
+		<div class=" pull-left">		
+		<span id="refreshButton" class="btn btn-default" onclick="javascript:refresh();"><fmt:message key="label.refresh"/></span>
+		</div>
+		
+		<div class="pull-right">		
+		<c:if test="${criteriaRatings.ratingCriteria.orderId > 1}">
+			<span id="prevButton" class="btn btn-default" onclick="javascript:${method}(false);"><fmt:message key="label.previous"/></span>
+		</c:if>
+		<c:choose>
+			<c:when test="${criteriaRatings.ratingCriteria.orderId == numCriteria}">
+				<span id="finishButton" class="btn btn-primary" onclick="javascript:${method}(true);">${finishButtonLabel}</span>
+			</c:when>
+			<c:otherwise>
+				<span id="nextButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></span>
+			</c:otherwise>
+		</c:choose>
+		</div>
+		</div>				
+	
 	</lams:Page>
 	<!--closes content-->
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/learning/rankall.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/learning/ranking.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/results.jsp,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_preview/web/pages/learning/results.jsp	9 Mar 2016 03:01:20 -0000	1.3.2.4
+++ lams_tool_preview/web/pages/learning/results.jsp	10 Oct 2016 00:31:04 -0000	1.3.2.5
@@ -29,15 +29,16 @@
 		var pathToImageFolder = "${lams}images/css/";
 		
 		//vars for rating.js
-		var MAX_RATES = ${peerreview.maximumRates},
-		MIN_RATES = ${peerreview.minimumRates},
-		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATINGS_FOR_ITEM = ${peerreview.maximumRatesPerUser},
+		var MAX_RATES = 0,
+		MIN_RATES = 0,
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATINGS_FOR_ITEM = 0,
+		LIMIT_BY_CRITERIA = "true";
 		LAMS_URL = '${lams}',
-		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
+		COUNT_RATED_ITEMS = 0,
 		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="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>";
 	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -49,7 +50,6 @@
 	<script type="text/javascript">
 	
 		$(document).ready(function(){
-			
 			$(".tablesorter").tablesorter({
 				theme: 'bootstrap',
 			    widthFixed: true,
@@ -65,7 +65,7 @@
 		            } 
 		        } 
 			});
-			
+			initializeJRating();
 		 });
 	
 		function finishSession(){
@@ -87,89 +87,75 @@
 
 	<lams:Page type="learner" title="${peerreview.title}">
 
-		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-			<lams:Alert type="danger" id="warn-lock" close="false">
-				<c:choose>
-					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked"/>
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" ><fmt:param><fmt:message key="label.finished" /></fmt:param></fmt:message>
-					</c:otherwise>
-				</c:choose>
-			</lams:Alert>
-		</c:if>
+	<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
+		<lams:Alert type="danger" id="warn-lock" close="false">
+			<c:choose>
+				<c:when test="${sessionMap.userFinished}">
+					<fmt:message key="message.activityLocked"/>
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.warnLockOnFinish" ><fmt:param><fmt:message key="label.finished" /></fmt:param></fmt:message>
+				</c:otherwise>
+			</c:choose>
+		</lams:Alert>
+	</c:if>
 
-		<c:if test="${not empty itemRatingDtos}">
+	<c:if test="${peerreview.showRatingsLeftForUser}">
 
-		<!-- Ratings UI -->
-		<table class="tablesorter">
-			<thead>
-				<tr>
-					<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
-						<fmt:message key="label.user.name" />
-					</th>
-					<th class="comment">
-						<fmt:message key="label.rating" />
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				<c:forEach var="itemRatingDto" items="${itemRatingDtos}">
-					<tr>
-						<td>
-							<c:out value="${userNameMap[itemRatingDto.itemId]}" escapeXml="true"/>
-						</td>
-						
-						<td>
-							<lams:Rating itemRatingDto="${itemRatingDto}" disabled="true" isItemAuthoredByUser="false"/>
-						</td>
-					</tr>
-				</c:forEach>
-			</tbody>
-		</table>
-		
+		<c:if test="${not empty allCriteriaRatings}">
+		<c:forEach var="criteriaRatings" items="${allCriteriaRatings}" varStatus="status">
+			<div class="panel panel-default">
+			<div class="panel-heading panel-title">
+				${criteriaRatings.ratingCriteria.title}
+			</div>
+			<div class="panel-body">
+			<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="true" alwaysShowAverage="false" currentUserDisplay="false"/>
+			</div>
+			</div>
+		</c:forEach>
 		</c:if>
-		
-		<c:if test="${peerreview.showRatingsLeftForUser}">
+
 		<div class="panel panel-default">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.ratings.by.others" />
 		</div>
 		<div class="panel-body">
-			<lams:Rating itemRatingDto="${itemRatingDto}" disabled="true" isItemAuthoredByUser="true"/>
+			<c:forEach var="criteriaRatings" items="${userRatings}" varStatus="status">
+				<h4>${criteriaRatings.ratingCriteria.title}</h4>
+		 		<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="false" alwaysShowAverage="true" currentUserDisplay="true"/>
+		</c:forEach>
 		</div>
 		</div>
-		</c:if>
+	</c:if>
+				
+	<!-- Reflection -->
+	<c:if test="${sessionMap.isSessionCompleted and sessionMap.reflectOn}">
+		<%@ include file="notebookdisplay.jsp"%>
+	</c:if>
+	<!-- End Reflection -->
 
-		<!-- Reflection -->
-		<c:if test="${sessionMap.isSessionCompleted and sessionMap.reflectOn}">
-			<%@ include file="notebookdisplay.jsp"%>
-		</c:if>
-		<!-- End Reflection -->
+	<c:if test="${!peerreview.lockWhenFinished}">
+		<html:button property="redoRatings" styleClass="btn btn-default voffset5 pull-left" onclick="redoRatings();">
+			<fmt:message key="label.redo" />
+		</html:button>
+	</c:if>	
 
-		<c:if test="${!peerreview.lockWhenFinished}">
-			<html:button property="redoRatings" styleClass="btn btn-default voffset5 pull-left" onclick="redoRatings();">
-				<fmt:message key="label.redo" />
-			</html:button>
-		</c:if>	
+	<c:if test="${mode != 'teacher'}">
+			<c:choose>			
+				<c:when test="${(not sessionMap.isSessionCompleted) and sessionMap.reflectOn}">
+					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
+						<fmt:message key="label.finished" />
+					</html:link>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
 
-		<c:if test="${mode != 'teacher'}">
-				<c:choose>			
-					<c:when test="${(not sessionMap.isSessionCompleted) and sessionMap.reflectOn}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
-							<fmt:message key="label.finished" />
-						</html:link>
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:if>
-
 	</lams:Page>
 	<!--closes content-->
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/learning/star.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?