Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.33 -r1.34
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	29 Mar 2015 10:53:43 -0000	1.33
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	9 Feb 2016 11:37:50 -0000	1.34
@@ -186,6 +186,6 @@
 label.other.answers  =Answers from other Learners
 label.total.responses  =Total responses so far: {0}
 message.no.reflection.available  =No notebook entry has been added.
+label.search=Search...
 
-
 #======= End labels: Exported 180 labels for en AU =====
Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/conf/xdoclet/struts-actions.xml,v
diff -u -r1.17 -r1.18
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	28 Oct 2014 23:23:27 -0000	1.17
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	9 Feb 2016 11:37:50 -0000	1.18
@@ -261,7 +261,16 @@
 			parameter="listAnswers" >
 			<forward name="success" path="/pages/monitoring/listanswers.jsp" />
 		</action>
+		<action path="/monitoring/getAnswersJSON"
+			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
+			parameter="getAnswersJSON" >
+		</action>
 		
+		<action path="/monitoring/listReflections"
+			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
+			parameter="listReflections">
+			<forward name="success" path="/pages/monitoring/listreflections.jsp" />
+		</action>
 		<action path="/monitoring/viewReflection"
 			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
 			parameter="viewReflection">
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java,v
diff -u -r1.22 -r1.23
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	28 Oct 2014 23:23:27 -0000	1.22
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	9 Feb 2016 11:37:49 -0000	1.23
@@ -65,6 +65,8 @@
     
     public static final String ATTR_USER = "user";
 
+    public static final String ATTR_USER_NAME = "userName";
+
     // error message keys
     public static final String ERROR_MSG_TITLE_BLANK = "error.survey.item.title.blank";
 
@@ -118,8 +120,6 @@
 
     public static final String ATTR_QUESTION_LIST = "questionList";
 
-    public static final String ATTR_ANSWER_LIST = "answerList";
-
     public static final String ATTR_QUESTION = "question";
 
     public static final String ATTR_DELETED_QUESTION_LIST = "deletedQuestionList";
@@ -169,10 +169,12 @@
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
     
     public static final String ATTR_COUNT_FINISHED_USERS = "countFinishedUser";
-    
+
     public static final int SORT_BY_DEAFAULT = 0;
     public static final int SORT_BY_ANSWER_ASC = 1;
     public static final int SORT_BY_ANSWER_DESC = 2;
+    public static final int SORT_BY_NAME_ASC = 3;
+    public static final int SORT_BY_NAME_DESC = 4;
     
     // POSITION
     public static int POSITION_INSIDE = 0;
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	28 Oct 2014 23:23:27 -0000	1.7
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	9 Feb 2016 11:37:49 -0000	1.8
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
 
 public interface SurveyAnswerDAO extends DAO {
@@ -39,7 +38,11 @@
      * @return
      */
     List<SurveyAnswer> getSessionAnswer(Long sessionId, Long questionUid);
+    
+    /** Get a count of the number of times this particular choice has been selected for this question. */
+    Integer getAnswerCount(Long sessionId, Long questionUid, String choice);
 
+    
     List<SurveyAnswer> getByToolContentIdAndUserId(Long toolContentId, Long userId);
 
     List<String> getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid, int page, int size,
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java	28 Oct 2014 23:23:27 -0000	1.3
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java	9 Feb 2016 11:37:49 -0000	1.4
@@ -36,4 +36,8 @@
     List<SurveyUser> getBySessionID(Long sessionId);
     
     int getCountFinishedUsers(Long sessionId);
+
+    List<Object[]> getUsersForTablesorter(final Long sessionId, final Long questionId, int page, int size,
+	    int sorting, String searchString);
+    int getCountUsersBySession(final Long sessionId, String searchString);
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	28 Oct 2014 23:23:27 -0000	1.8
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	9 Feb 2016 11:37:50 -0000	1.9
@@ -45,6 +45,11 @@
 	    + SurveyAnswer.class.getName() + " AS r "
 	    + "WHERE r.user.session.sessionId=? AND r.surveyQuestion.uid=? AND r.answerText<>''";
 
+    private static final String GET_COUNT_RESPONSES_FOR_SESSION_QUESTION_CHOICE = "SELECT COUNT(*) FROM "
+	    + SurveyAnswer.class.getName() + " AS r "
+	    + " WHERE r.user.session.sessionId=? AND r.surveyQuestion.uid=? "
+	    + " AND ( r.answerChoices like ? OR r.answerChoices like ? )";
+
     @Override
     public SurveyAnswer getAnswer(Long questionUid, Long userUid) {
 	List list = getHibernateTemplate().find(GET_LEARNER_ANSWER, new Object[] { questionUid, userUid });
@@ -96,4 +101,22 @@
 	}
 	return ((Number) list.get(0)).intValue();
     }
+    
+    /** Get a count of the number of times this particular choice has been selected for this question. */
+    @SuppressWarnings("rawtypes")
+    public Integer getAnswerCount(Long sessionId, Long questionId, String choice) {
+	
+	String choice1 = choice+"&%";
+	String choice2 = "%&"+choice1;
+
+	String sql = GET_COUNT_RESPONSES_FOR_SESSION_QUESTION_CHOICE;
+	List list = getHibernateTemplate().find(sql,
+		new Object[] { sessionId, questionId, choice1, choice2 });
+	if (list == null || list.size() == 0) {
+	    return 0;
+	}
+	return ((Number) list.get(0)).intValue();
+    }
+
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java	28 Oct 2014 23:23:27 -0000	1.3
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java	9 Feb 2016 11:37:50 -0000	1.4
@@ -25,6 +25,11 @@
 
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Hibernate;
+import org.hibernate.SQLQuery;
+import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.dao.SurveyUserDAO;
 import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
 
@@ -66,4 +71,75 @@
 	return ((Number) list.get(0)).intValue();
     }
 
+    private static final String FIND_USER_ANSWERS_BY_SESSION_ID = "SELECT user.*, answer.answer_choices answerChoices , answer.answer_text answerText"
+	    + " FROM tl_lasurv11_user user "
+	    + " JOIN tl_lasurv11_session session ON user.session_uid = session.uid and session.session_id = :sessionId "
+	    + " LEFT JOIN tl_lasurv11_answer answer ON user.uid = answer.user_uid and answer.question_uid = :questionId ";
+
+    @SuppressWarnings("unchecked")
+    /** Will return List<[SurveyUser, String, String], [SurveyUser, String, String], ... , [SurveyUser, String, String]>
+     * where the first String is answer choices (for multiple choice) and the second String is the answer text for
+     * free entry choice.
+     */
+    public List<Object[]> getUsersForTablesorter(final Long sessionId, final Long questionId, int page, int size,
+	    int sorting, String searchString) {
+	String sortingOrder;
+	switch (sorting) {
+	case SurveyConstants.SORT_BY_NAME_ASC:
+	    sortingOrder = "user.last_name ASC, user.first_name ASC";
+	    break;
+	case SurveyConstants.SORT_BY_NAME_DESC:
+	    sortingOrder = "user.last_name DESC, user.first_name DESC";
+	    break;
+	default:
+	    sortingOrder = "user.uid";
+	}
+
+	// Basic select for the user records
+	StringBuilder queryText = new StringBuilder(FIND_USER_ANSWERS_BY_SESSION_ID);
+
+	// If filtering by name add a name based where clause
+	buildNameSearch(searchString, queryText);
+
+	// Now specify the sort based on the switch statement above.
+	queryText.append(" ORDER BY " + sortingOrder);
+
+	SQLQuery query = getSession().createSQLQuery(queryText.toString());
+	query.addEntity("user", SurveyUser.class)
+		.addScalar("answerChoices", Hibernate.STRING)
+		.addScalar("answerText", Hibernate.STRING)
+		.setLong("sessionId", sessionId.longValue())
+		.setLong("questionId", questionId.longValue())
+		.setFirstResult(page * size).setMaxResults(size);
+	return query.list();
+    }
+
+    private void buildNameSearch(String searchString, StringBuilder sqlBuilder) {
+	if (!StringUtils.isBlank(searchString)) {
+	    String[] tokens = searchString.trim().split("\\s+");
+	    for (String token : tokens) {
+		String escToken = StringEscapeUtils.escapeSql(token);
+		sqlBuilder.append(" WHERE (user.first_name LIKE '%").append(escToken)
+			.append("%' OR user.last_name LIKE '%").append(escToken)
+			.append("%' OR user.login_name LIKE '%").append(escToken).append("%') ");
+	    }
+	}
+    }
+
+    @SuppressWarnings("rawtypes")
+    public int getCountUsersBySession(final Long sessionId, String searchString) {
+
+	StringBuilder queryText = new StringBuilder("SELECT count(*) FROM tl_lasurv11_user user ");
+	queryText
+		.append(" JOIN tl_lasurv11_session session ON user.session_uid = session.uid and session.session_id = :sessionId");
+	buildNameSearch(searchString, queryText);
+
+	List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue())
+		.list();
+	if (list == null || list.size() == 0) {
+	    return 0;
+	}
+	return ((Number) list.get(0)).intValue();
+    }
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dto/SimpleAnswerDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dto/Attic/SimpleAnswerDTO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dto/SimpleAnswerDTO.java	9 Feb 2016 11:37:49 -0000	1.1
@@ -0,0 +1,125 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.tool.survey.dto;
+
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
+import org.lamsfoundation.lams.tool.survey.model.SurveyOption;
+import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
+import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
+import org.lamsfoundation.lams.tool.survey.util.SurveyOptionComparator;
+
+public class SimpleAnswerDTO extends SurveyQuestion {
+
+    private static final int SHORT_TITLE_LENGTH = 60;
+
+    // ***********************************************
+    // DTO fields:
+    // this is DTO field. For answer, which is user and session level. For question, which is content level.
+    private SurveyAnswer answer;
+    // Open text entry response percentage if this question has open text entry.
+    private double openResponse;
+    private String openResponseFormatStr;
+    private int openResponseCount;
+
+    // this field could have value even this user does not reply this question (the answer is null)
+    private SurveyUser replier;
+
+    private static Logger logger = Logger.getLogger(SimpleAnswerDTO.class.getName());
+
+    public SimpleAnswerDTO(SurveyQuestion question) {
+	try {
+	    PropertyUtils.copyProperties(this, question);
+	} catch (Exception e) {
+	    logger.error("Error occurs during creating AnswerDTO");
+	}
+
+	// clone options
+	Set<SurveyOption> optList = question.getOptions();
+	if (optList != null) {
+	    SortedSet<SurveyOption> newOptions = new TreeSet<SurveyOption>(new SurveyOptionComparator());
+	    for (SurveyOption option : optList) {
+		SurveyOption newOption = (SurveyOption) option.clone();
+		// clone does not copy the UID, here copy it back
+		newOption.setUid(option.getUid());
+		newOptions.add(newOption);
+	    }
+	    this.setOptions(newOptions);
+	}
+
+	String desc = this.getDescription();
+	desc = desc.replaceAll("<(.|\n)*?>", "");
+	this.setShortTitle(StringUtils.abbreviate(desc, SHORT_TITLE_LENGTH));
+
+    }
+
+    // ****************************************************************
+    // DTO fields
+    // ****************************************************************
+    public SurveyAnswer getAnswer() {
+	return answer;
+    }
+
+    public void setAnswer(SurveyAnswer answer) {
+	this.answer = answer;
+    }
+
+    public double getOpenResponse() {
+	return openResponse;
+    }
+
+    public void setOpenResponse(double openResponse) {
+	this.openResponse = openResponse;
+    }
+
+    public int getOpenResponseCount() {
+	return openResponseCount;
+    }
+
+    public void setOpenResponseCount(int openResponseCount) {
+	this.openResponseCount = openResponseCount;
+    }
+
+    public String getOpenResponseFormatStr() {
+	return openResponseFormatStr;
+    }
+
+    public void setOpenResponseFormatStr(String openResponseFormatStr) {
+	this.openResponseFormatStr = openResponseFormatStr;
+    }
+
+    public SurveyUser getReplier() {
+	return replier;
+    }
+
+    public void setReplier(SurveyUser replier) {
+	this.replier = replier;
+    }
+
+}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java,v
diff -u -r1.23 -r1.24
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	14 Apr 2015 20:59:55 -0000	1.23
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	9 Feb 2016 11:37:49 -0000	1.24
@@ -280,6 +280,16 @@
      */
     Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry);
 
+    /**
+     * Get Reflect DTO set for session. Called by getReflectList(contentId, setEntry) so has same 
+     * effect as calling getReflectList(contentId, setEntry)
+     * and pulling out a single session.
+     * 
+     * @param contentId
+     * @return
+     */
+    Set<ReflectDTO> getReflectList(Long sessionId, boolean setEntry, boolean hasReflection);
+    
     void notifyTeachersOnAnswerSumbit(Long sessionId, SurveyUser surveyUser);
 
     /**
@@ -301,4 +311,14 @@
      * @return
      */
     boolean isGroupedActivity(long toolContentID);
+    
+    /** Gets the Answer information for the monitoring listAnswers tablesorter. 
+     * Will return List<[SurveyUser, String, String], [SurveyUser, String, String], ... , [SurveyUser, String, String]>
+     * where the first String is answer choices (for multiple choice) and the second String is the answer text for
+     * free entry choice.
+     */
+  List<Object[]> getQuestionAnswersForTablesorter(Long sessionId, Long questionId,
+	    int page, int size, int sorting, String searchString);
+    int getCountUsersBySession(final Long sessionId, String searchString);
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v
diff -u -r1.45 -r1.46
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	30 Dec 2015 19:08:34 -0000	1.45
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	9 Feb 2016 11:37:49 -0000	1.46
@@ -241,31 +241,37 @@
 	List<SurveySession> sessionList = surveySessionDao.getByContentId(contentId);
 	for (SurveySession session : sessionList) {
 	    Long sessionId = session.getSessionId();
-	    boolean hasRefection = session.getSurvey().isReflectOnActivity();
-	    Set<ReflectDTO> list = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
-	    // get all users in this session
-	    List<SurveyUser> users = surveyUserDao.getBySessionID(sessionId);
-	    for (SurveyUser user : users) {
-		ReflectDTO ref = new ReflectDTO(user);
-
-		if (setEntry) {
-		    NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
-			    SurveyConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-		    if (entry != null) {
-			ref.setReflect(entry.getEntry());
-		    }
-		}
-
-		ref.setHasRefection(hasRefection);
-		list.add(ref);
-	    }
+	    boolean hasReflection = session.getSurvey().isReflectOnActivity();
+	    Set<ReflectDTO> list = getReflectList(sessionId, setEntry, hasReflection);
 	    map.put(sessionId, list);
 	}
 
 	return map;
     }
 
     @Override
+    public Set<ReflectDTO> getReflectList(Long sessionId, boolean setEntry, boolean hasReflection) {
+	Set<ReflectDTO> list = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
+	// get all users in this session
+	List<SurveyUser> users = surveyUserDao.getBySessionID(sessionId);
+	for (SurveyUser user : users) {
+	    ReflectDTO ref = new ReflectDTO(user);
+
+	    if (setEntry) {
+		NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+			SurveyConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+		if (entry != null) {
+		    ref.setReflect(entry.getEntry());
+		}
+	    }
+
+	    ref.setHasRefection(hasReflection);
+	    list.add(ref);
+	}
+	return list;
+    }
+
+    @Override
     public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
 	    String entryText) {
 	return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "",
@@ -330,6 +336,18 @@
     }
 
     @Override
+    public List<Object[]> getQuestionAnswersForTablesorter(Long sessionId, Long questionId,
+	    int page, int size, int sorting, String searchString) {
+
+	return surveyUserDao.getUsersForTablesorter(sessionId, questionId, page, size, sorting, searchString);
+    }
+
+    @Override
+    public int getCountUsersBySession(final Long sessionId, String searchString) {
+	return surveyUserDao.getCountUsersBySession(sessionId, searchString);
+    }
+    
+    @Override
     public void updateAnswerList(List<SurveyAnswer> answerList) {
 	for (SurveyAnswer ans : answerList) {
 	    surveyAnswerDao.saveObject(ans);
@@ -341,70 +359,49 @@
 	SurveyQuestion question = surveyQuestionDao.getByUid(questionUid);
 	AnswerDTO answerDto = new AnswerDTO(question);
 
-	// get question all answer from this session
-	List<SurveyAnswer> answsers = surveyAnswerDao.getSessionAnswer(sessionId, questionUid);
+	// create a map to hold Option UID and the counts for that choice
+	Map<Long, Integer> optMap = new HashMap<Long, Integer>();
 
-	// create a map to hold Option UID and sequenceID(start from 0);
-	Map<String, Integer> optMap = new HashMap<String, Integer>();
+	// total number of answers - used for the percentage calculations
+	int numberAnswers = 0;
+
+	// go through all the choices and find out how many options for the choices.
 	Set<SurveyOption> options = answerDto.getOptions();
-	int idx = 0;
 	for (SurveyOption option : options) {
-	    optMap.put(option.getUid().toString(), idx);
-	    idx++;
+	    Long optUid = option.getUid();
+	    int numChoice = surveyAnswerDao.getAnswerCount(sessionId, questionUid, optUid.toString());
+	    optMap.put(optUid, numChoice);
+	    numberAnswers += numChoice;
 	}
 
-	// initial a array to hold how many time chose has been done for a option or open text.
-	int numberAvailableOptions = options.size();
-	// for appendText and open Text Entry will be the last one of choose[] array.
-	if (answerDto.isAppendText() || (answerDto.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)) {
-	    numberAvailableOptions++;
+	Integer numFreeChoice = null;
+	if ( answerDto.isAppendText() || (answerDto.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY) ) {
+	    numFreeChoice = getCountResponsesBySessionAndQuestion(sessionId, questionUid);
+	    numberAnswers += numFreeChoice;
 	}
 
-	int[] choiceArray = new int[numberAvailableOptions];
-	Arrays.fill(choiceArray, 0);
-
-	// sum up all option and open text (if has) have been selected count list
-	int numberAnswers = 0;
-	if (answsers != null) {
-	    for (SurveyAnswer answer : answsers) {
-		String[] choiceList = SurveyWebUtils.getChoiceList(answer.getAnswerChoices());
-		for (String optUid : choiceList) {
-		    // if option has been chosen, the relative index of choose[] array will increase.
-		    if (optMap.containsKey(optUid)) {
-			choiceArray[optMap.get(optUid)]++;
-			numberAnswers++;
-		    }
-		}
-		// handle appendText or Open Text Entry
-		if ((answerDto.isAppendText() || (answerDto.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY))
-			&& !StringUtils.isBlank(answer.getAnswerText())) {
-		    choiceArray[numberAvailableOptions - 1]++;
-		    numberAnswers++;
-		}
-	    }
-	}
-	// caculate the percentage of answer response
-	idx = 0;
+	// calculate the percentage of answer response
 	if (numberAnswers == 0) {
 	    numberAnswers = 1;
 	}
 	for (SurveyOption option : options) {
-	    double percentage = ((double) choiceArray[idx] / (double) numberAnswers) * 100d;
+	    int count = optMap.get(option.getUid());
+	    double percentage = ((double) count / (double) numberAnswers) * 100d;
 	    option.setResponse(percentage);
 	    option.setResponseFormatStr(new Long(Math.round(percentage)).toString());
-	    option.setResponseCount(choiceArray[idx]);
-	    idx++;
+	    option.setResponseCount(count);
 	}
-	if (answerDto.isAppendText() || (answerDto.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)) {
-	    double percentage = ((double) choiceArray[idx] / (double) numberAnswers) * 100d;
+	if (numFreeChoice != null) {
+	    double percentage = ((double) numFreeChoice / (double) numberAnswers) * 100d;
 	    answerDto.setOpenResponse(percentage);
 	    answerDto.setOpenResponseFormatStr(new Long(Math.round(percentage)).toString());
-	    answerDto.setOpenResponseCount(choiceArray[idx]);
+	    answerDto.setOpenResponseCount(numFreeChoice);
 	}
 
 	return answerDto;
     }
 
+
     @Override
     public List<String> getOpenResponsesForTablesorter(final Long qaSessionId, final Long questionId, int page,
 	    int size, int sorting) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	14 Apr 2015 20:59:55 -0000	1.25
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	9 Feb 2016 11:37:50 -0000	1.26
@@ -33,14 +33,14 @@
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TimeZone;
-import java.util.TreeMap;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.Cell;
@@ -53,6 +53,9 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
+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.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
@@ -64,7 +67,6 @@
 import org.lamsfoundation.lams.tool.survey.model.SurveySession;
 import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
 import org.lamsfoundation.lams.tool.survey.service.ISurveyService;
-import org.lamsfoundation.lams.tool.survey.util.SurveyUserComparator;
 import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.DateUtil;
@@ -89,7 +91,7 @@
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+	    HttpServletResponse response) throws IOException, ServletException, JSONException {
 	String param = mapping.getParameter();
 
 	if (param.equals("summary")) {
@@ -99,7 +101,13 @@
 	if (param.equals("listAnswers")) {
 	    return listAnswers(mapping, form, request, response);
 	}
+	if (param.equals("getAnswersJSON")) {
+	    return getAnswersJSON(mapping, form, request, response);
+	}
 
+	if (param.equals("listReflections")) {
+	    return listReflections(mapping, form, request, response);
+	}
 	if (param.equals("viewReflection")) {
 	    return viewReflection(mapping, form, request, response);
 	}
@@ -144,7 +152,7 @@
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	ISurveyService service = getSurveyService();
 
-	// get summary
+	// get summary 
 	SortedMap<SurveySession, List<AnswerDTO>> summary = service.getSummary(contentId);
 
 	// get survey
@@ -153,16 +161,12 @@
 	// get statistic
 	SortedMap<SurveySession, Integer> statis = service.getStatistic(contentId);
 
-	// get refection list
-	Map<Long, Set<ReflectDTO>> relectList = service.getReflectList(contentId, false);
-
 	// cache into sessionMap
 	sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, summary);
 	sessionMap.put(SurveyConstants.ATTR_STATISTIC_LIST, statis);
 	sessionMap.put(SurveyConstants.PAGE_EDITABLE, new Boolean(SurveyWebUtils.isSurveyEditable(survey)));
 	sessionMap.put(SurveyConstants.ATTR_SURVEY, survey);
 	sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId);
-	sessionMap.put(SurveyConstants.ATTR_REFLECT_LIST, relectList);
 	sessionMap.put(SurveyConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
 
 	// check if there is submission deadline
@@ -189,25 +193,70 @@
 
 	// get user list
 	ISurveyService service = getSurveyService();
+	SurveyQuestion question = service.getQuestion(questionUid);
+	request.setAttribute(SurveyConstants.ATTR_QUESTION, question);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	return mapping.findForward(SurveyConstants.SUCCESS);
+    }
+    private ActionForward getAnswersJSON(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
+	
+	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	Long questionUid = WebUtil.readLongParam(request, SurveyConstants.ATTR_QUESTION_UID);
 
-	SortedMap<SurveyUser, AnswerDTO> userAnswerMap = new TreeMap<SurveyUser, AnswerDTO>(new SurveyUserComparator());
-	// get all users with their answers whatever they answer or not
-	List<SurveyUser> users = service.getSessionUsers(sessionId);
-	for (SurveyUser user : users) {
-	    List<AnswerDTO> questionAnswers = service.getQuestionAnswers(sessionId, user.getUid());
-	    for (AnswerDTO questionAnswer : questionAnswers) {
-		if (questionUid.equals(questionAnswer.getUid())) {
-		    userAnswerMap.put(user, questionAnswer);
-		    break;
-		}
-	    }
+	// paging parameters of tablesorter
+	int size = WebUtil.readIntParam(request, "size");
+	int page = WebUtil.readIntParam(request, "page");
+	Integer sortByName = WebUtil.readIntParam(request, "column[0]", true);
+	String searchString = request.getParameter("fcol[0]"); 
+	
+	int sorting = SurveyConstants.SORT_BY_DEAFAULT;
+	if ( sortByName != null ) 
+	    sorting = sortByName.equals(0) ? SurveyConstants.SORT_BY_NAME_ASC : SurveyConstants.SORT_BY_NAME_DESC; 
+
+	//return user list according to the given sessionID
+	ISurveyService service = getSurveyService();
+	List<Object[]> users = service.getQuestionAnswersForTablesorter(sessionId, questionUid, page, size, sorting, searchString);
+	
+	JSONArray rows = new JSONArray();
+	JSONObject responsedata = new JSONObject();
+	responsedata.put("total_rows", service.getCountUsersBySession(sessionId, searchString));
+
+	for (Object[] userAndReflection : users) {
+
+	    JSONObject responseRow = new JSONObject();
+	    
+	    SurveyUser user = (SurveyUser) userAndReflection[0];
+	    responseRow.put(SurveyConstants.ATTR_USER_NAME, StringEscapeUtils.escapeHtml(user.getLastName() + " " + user.getFirstName()));
+
+	    if ( userAndReflection.length > 1 && userAndReflection[1] != null) {
+		responseRow.put("choices", SurveyWebUtils.getChoiceList((String)userAndReflection[1]));
+	    } 
+	    if ( userAndReflection.length > 2 && userAndReflection[2] != null) {
+		responseRow.put("answerText", StringEscapeUtils.escapeHtml((String)userAndReflection[2]));
+	    } 
+	    rows.put(responseRow);
 	}
-	// set all attribute to request for show
-	request.setAttribute(SurveyConstants.ATTR_ANSWER_LIST, userAnswerMap);
+	responsedata.put("rows", rows);
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(new String(responsedata.toString()));
+	return null;
+    }
 
+    private ActionForward listReflections(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	
+	ISurveyService service = getSurveyService();
+	Survey survey = service.getSurveyBySessionId(sessionId);
+	
+	Set<ReflectDTO> reflectList = getSurveyService().getReflectList(sessionId, false, survey.isReflectOnActivity());
+	request.setAttribute(SurveyConstants.ATTR_REFLECT_LIST, reflectList);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 	return mapping.findForward(SurveyConstants.SUCCESS);
     }
-
+    
     private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/listanswers.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_survey/web/pages/monitoring/listanswers.jsp	27 Oct 2014 22:47:59 -0000	1.9
+++ lams_tool_survey/web/pages/monitoring/listanswers.jsp	9 Feb 2016 11:36:10 -0000	1.10
@@ -7,106 +7,199 @@
 <lams:html>
 <lams:head>
 	    <%@ include file="/common/header.jsp" %>
+	    <link type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
+
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+
+<script type="text/javascript">
+
+	<c:set var="numOptions">${fn:length(question.options)}</c:set>
+	<c:set var="filterOptions" value="{ sorter: false, filter: false}"/>
+    <c:forEach var="option" items="${question.options}" varStatus="optStatus">
+    	<c:choose>
+    	<c:when test="${optStatus.first}">
+	    	<c:set var="filterString">${optStatus.count}:${filterOptions}</c:set>
+	    </c:when>
+	    <c:otherwise>
+	    	<c:set var="filterString">${filterString}, ${optStatus.count}:${filterOptions}</c:set>
+	    </c:otherwise>
+	    </c:choose>
+    </c:forEach>
+    <c:if test="${question.appendText || question.type==3}">
+    	<c:choose> 
+    	<c:when test="${numOptions gt 0}">
+	    	<c:set var="filterString">${filterString}, ${numOptions+1}:${filterOptions}</c:set>
+	    </c:when>
+	    <c:otherwise>
+	    	<c:set var="filterString">1:${filterOptions}</c:set>
+	    </c:otherwise>
+	    </c:choose>
+    </c:if>
+	
+	$(document).ready(function(){
+	    
+		$(".tablesorter").tablesorter({
+			theme: 'blue',
+		    sortInitialOrder: 'desc',
+            sortList: [[0]],
+            widgets: [ "resizable", "filter" ],
+            headers: { ${filterString} }, 
+            widgetOptions: {
+            	resizable: true,
+            	// include column filters 
+                filter_columnFilters: true, 
+                filter_placeholder: { search : '<fmt:message key="label.search"/>' }, 
+                filter_searchDelay: 700 
+            }
+		});
+		
+		$(".tablesorter").each(function() {
+			$(this).tablesorterPager({
+				savePages: false,
+				ajaxUrl : "<c:url value='/monitoring/getAnswersJSON.do'/>?page={page}&size={size}&{sortList:column}&{filterList:fcol}&questionUid=${question.uid}&toolSessionID=" + $(this).attr('data-session-id'),
+				ajaxProcessing: function (data, table) {
+					if (data && data.hasOwnProperty('rows')) {
+			    		var rows = [],
+			            json = {};
+			    		
+						for (i = 0; i < data.rows.length; i++){
+							var userData = data.rows[i];
+
+							rows += '<tr>';
+							rows += '<td>';
+							rows += userData["userName"];
+							rows += '</td>';
+
+						    <c:forEach var="option" items="${question.options}">
+								rows += '<td align="center" width="30px">';
+								if ( $.inArray('${option.uid}',userData.choices) > -1 ) {
+									rows += '<img src="${tool}/includes/images/tick_red.gif" title="<fmt:message key="message.learner.choose.answer"/>">';
+								}
+								rows += '</td>';
+						    </c:forEach>
+								
+							<c:if test="${question.appendText || question.type==3}">
+							rows += '<td>';
+							rows += userData["answerText"];
+							rows += '</td>';
+							</c:if>
+															
+							rows += '</tr>';
+						}
+			            
+						json.total = data.total_rows;
+						json.rows = $(rows);
+						return json;
+			            
+			    	}
+				},					
+			    container: $(this).next(".pager"),
+			    output: '{startRow} to {endRow} ({totalRows})',
+			    // css class names of pager arrows
+			    cssNext: '.tablesorter-next', // next page arrow
+				cssPrev: '.tablesorter-prev', // previous page arrow
+				cssFirst: '.tablesorter-first', // go to first page arrow
+				cssLast: '.tablesorter-last', // go to last page arrow
+				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
+				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
+				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
+				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
+				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+			})
+		});
+  	})
+</script>
 </lams:head>
 <body>
 		<div id="content">
 		<h1>
 			<fmt:message key="title.chart.report"/>
 		</h1>
 
-			<c:forEach var="entry" items="${answerList}" varStatus="status">
-				<c:set var="user" value="${entry.key}"/>
-				<c:set var="question" value="${entry.value}"/>
-				<%--  display question header  --%>
-				<c:if test="${status.first}">
-					<h2><fmt:message key="label.question"/></h2>
-					<table  class="alternative-color" cellspacing="0">
-					<tr>
-						<%-- <td><fmt:message key="label.question"/></td>--%>
-						<th colspan="2" class="first"><c:out value="${question.description}" escapeXml="false"/></th>
-					</tr>
-					<%-- 
-					<tr>
-						<td colspan="2"><b><fmt:message key="message.possible.answers"/></b></td>
-					</tr>
-					--%>
+		<h2><fmt:message key="label.question"/></h2>
+
+		<table  class="tablesorter-blue" cellspacing="0">
+		<tr>
+			<th colspan="2" class="first"><c:out value="${question.description}" escapeXml="false"/></th>
+		</tr>
+		<c:forEach var="option" items="${question.options}" varStatus="optStatus">
+			<tr>
+				<td  width="100px">
+					<%= SurveyConstants.OPTION_SHORT_HEADER %>${optStatus.count}
+				</td>
+				<td>
+					<c:out value="${option.description}" escapeXml="true"/>
+				</td>
+			</tr>
+		</c:forEach>
+		<c:if test="${question.appendText ||question.type == 3}">
+			<tr>
+				<td  width="100px">
+					<fmt:message key="label.open.response"/>
+				</td>
+				<td>&nbsp;</td>
+			</tr>
+		</c:if>
+		</table>
+
+		<h2><fmt:message key="label.answer"/></h2>
+
+		<c:choose>
+			<c:when test="${!(question.appendText || question.type==3)}">
+				<c:set var="nameWidth">width="25%"</c:set>
+			</c:when>
+			<c:otherwise>
+				<c:set var="nameWidth"></c:set>
+			</c:otherwise>
+		</c:choose>
+
+		<div class="tablesorter-holder">
+		<table class="tablesorter" data-session-id="${toolSessionID}">
+			<thead>
+				<tr>
+ 					<th align="left" ${nameWidth}>
+						<fmt:message key="label.learner"/>
+					</th>
 					<c:forEach var="option" items="${question.options}" varStatus="optStatus">
-						<tr>
-							<td  width="50px">
-								<%= SurveyConstants.OPTION_SHORT_HEADER %>${optStatus.count}
-							</td>
-							<td>
-								<c:out value="${option.description}" escapeXml="true"/>
-							</td>
-						</tr>
+					<th>
+						<%= SurveyConstants.OPTION_SHORT_HEADER %>${optStatus.count}
+					</th>
 					</c:forEach>
-					<c:if test="${question.appendText ||question.type == 3}">
-						<tr>
-							<td  width="50px">
-								<fmt:message key="label.open.response"/>
-							</td>
-							<td>&nbsp;</td>
-						</tr>
+					<c:if test="${question.appendText || question.type == 3}">
+					<th>
+						<fmt:message key="label.open.response"/>
+					</th>
 					</c:if>
-					<tr>
-					</table>
-				<%--  End first check  --%>
-				</c:if>
-				<c:if test="${status.first}">
-					<h2><fmt:message key="label.answer"/></h2>
-					<div align="center">
-						<table class="alternative-color" cellspacing="0">
-							<tr>
-								<th class="first"><fmt:message key="label.learner"/></th>
-								<c:forEach var="option" items="${question.options}" varStatus="optStatus">
-									<th>
-										<%= SurveyConstants.OPTION_SHORT_HEADER %>${optStatus.count}
-									</th>
-								</c:forEach>
-								<c:if test="${question.appendText || question.type == 3}">
-									<th>
-										<fmt:message key="label.open.response"/>
-									</th>
-								</c:if>
-							</tr>
-				</c:if>
-						<%--  User answer list --%>
-						<tr>
-							<td>${user.loginName}</td>
-							<c:forEach var="option" items="${question.options}">
-								<td>
-									<c:if test="${not empty question.answer}">
-										<c:set var="checked" value="false"/>
-										<c:forEach var="choice" items="${question.answer.choices}">
-											<c:if test="${choice == option.uid}">
-												<c:set var="checked" value="true"/>
-											</c:if>
-										</c:forEach>
-										<c:if test="${checked}">
-											<img src="${tool}/includes/images/tick_red.gif" title="<fmt:message key="message.learner.choose.answer"/>">
-										</c:if>
-									</c:if>
-									&nbsp;
-								</td>
-							</c:forEach>
-							<c:if test="${question.appendText ||question.type == 3}">
-								<td>
-									<c:if test="${not empty question.answer}">
-										<lams:out value="${question.answer.answerText}" escapeHtml="true"/>
-									</c:if>
-									&nbsp;
-								</td>
-							</c:if>
-						</tr>
-					<c:if test="${status.last}">
-						</table>
-						</div>
-					<%--  End first check  --%>
-					</c:if>
-				</c:forEach>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+		
+		<!-- pager -->
+		<div class="pager">
+			<form>
+				<img class="tablesorter-first"/>
+				<img class="tablesorter-prev"/>
+				<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+				<img class="tablesorter-next"/>
+				<img class="tablesorter-last"/>
+				<select class="pagesize">
+					<option selected="selected" value="10">10</option>
+					<option value="20">20</option>
+					<option value="30">30</option>
+					<option value="40">40</option>
+					<option value="50">50</option>
+					<option value="100">100</option>
+				</select>
+			</form>
 		</div>
-		<div id="learner"></div>
 		</div>
+		
 	</div>
 </body>
 </lams:html>
Index: lams_tool_survey/web/pages/monitoring/listreflections.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/listreflections.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_survey/web/pages/monitoring/listreflections.jsp	9 Feb 2016 11:36:10 -0000	1.1
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+<%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%>
+<lams:html>
+<lams:head>
+	    <%@ include file="/common/header.jsp" %>
+</lams:head>
+<body class="stripes">
+	<div id="content">
+		<h1><fmt:message key="title.reflection"/></h1>
+
+		<%-- Reflection list  --%>
+		<c:if test="${empty reflectList}">
+			<p><fmt:message key="message.no.reflection.available"/></p>
+		</c:if>
+		
+		<c:forEach var="user" items="${reflectList}" varStatus="refStatus">
+			<c:if test="${refStatus.first}">
+			<table cellpadding="0"  class="alternative-color">
+				<tr>
+					<th><fmt:message key="monitoring.user.fullname"/></th>
+					<th><fmt:message key="monitoring.label.user.loginname"/></th>
+					<th><fmt:message key="monitoring.user.reflection"/></th>
+				</tr>
+			</c:if>
+				<tr>
+					<td><c:out value="${user.fullName}" escapeXml="true"/></td>
+					<td><c:out value="${user.loginName}" escapeXml="true"/></td>
+					<td><c:set var="viewReflection">
+							<c:url value="/monitoring/viewReflection.do?toolSessionID=${toolSessionID}&userUid=${user.userUid}"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewReflection}')">
+							<fmt:message key="label.view" />
+						</html:link>
+					</td>
+				</tr>
+			<c:if test="${refStatus.last}">
+			</table>
+			</c:if>
+		</c:forEach>
+		
+	</div>
+</body>
+</lams:html>
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/summary.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_survey/web/pages/monitoring/summary.jsp	17 Jul 2015 09:52:30 -0000	1.22
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	9 Feb 2016 11:36:10 -0000	1.23
@@ -152,55 +152,16 @@
 			<c:if test="${queStatus.last}">
 				</table>
 			</c:if>
-				<%-- Reflection list  --%>
-				<c:if test="${sessionMap.survey.reflectOnActivity && queStatus.last}">
-					<c:set var="userList" value="${sessionMap.reflectList[surveySession.sessionId]}"/>
-					<c:forEach var="user" items="${userList}" varStatus="refStatus">
-						<c:if test="${refStatus.first}">
-							<table cellpadding="0"  class="alternative-color">
-							<tr>
-								<td colspan="5">
-									<h2><fmt:message key="title.reflection"/>	</h2>
-								</td>
-							</tr>
-							<tr>
-								<th colspan="2">
-									<fmt:message key="monitoring.user.fullname"/>
-								</th>
-								<th colspan="2">
-									<fmt:message key="monitoring.label.user.loginname"/>
-								</th>
-								<th>
-									<fmt:message key="monitoring.user.reflection"/>
-								</th>
-							</tr>
-						</c:if>
-						<tr>
-							<td colspan="2">
-								<c:out value="${user.fullName}" escapeXml="true"/>
-							</td>
-							<td colspan="2">
-								<c:out value="${user.loginName}" escapeXml="true"/>
-							</td>
-							<td >
-								<c:set var="viewReflection">
-									<c:url value="/monitoring/viewReflection.do?toolSessionID=${surveySession.sessionId}&userUid=${user.userUid}"/>
-								</c:set>
-								<html:link href="javascript:launchPopup('${viewReflection}')">
-									<fmt:message key="label.view" />
-								</html:link>
-							</td>
-						</tr>
-						<c:if test="${refStatus.last}">
-							</table>
-						</c:if>
-					</c:forEach>
-				</c:if>
-
 		</c:forEach>
 			<table>		
 					<tr>
 						<td >
+							<c:if test="${sessionMap.survey.reflectOnActivity}">
+								<c:set var="listReflections"><c:url value="/monitoring/listReflections.do?toolSessionID=${surveySession.sessionId}"/></c:set>
+								<html:link href="javascript:launchPopup('${listReflections}')" styleClass="button">
+									<fmt:message key="page.title.monitoring.view.reflection" />
+								</html:link>
+							</c:if>	
 							<html:link href="javascript:exportSurvey(${surveySession.sessionId});" property="exportExcel" styleClass="button">
 									<fmt:message key="label.monitoring.button.export.excel" />
 							</html:link>