Index: lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -185,5 +185,6 @@
 label.view.all.responses  =View All Responses
 label.sort.by.answer  =Sort by answer
 label.other.answers  =Answers from other Learners
+label.total.responses  =Total responses so far: {0}
 
 #======= End labels: Exported 174 labels for en AU =====
Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -157,6 +157,7 @@
 			<forward name="definelater" path="/pages/learning/definelater.jsp" />
 			<forward name="submissionDeadline" path="/pages/learning/submissionDeadline.jsp" />	
 			<forward name="result" path="/pages/learning/result.jsp" />	
+			<forward name="resultOtherUsers" path="/learning/showOtherUsersAnswers.do" />
 		</action>
 		
 		<action path="/learning/nextQuestion"
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -63,7 +63,7 @@
 
     public static final String ATTR_USER_UID = "userUid";
     
-    public static final String ATTR_USER_ID = "userId";
+    public static final String ATTR_USER = "user";
 
     // error message keys
     public static final String ERROR_MSG_TITLE_BLANK = "error.survey.item.title.blank";
@@ -168,6 +168,8 @@
     
     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;
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	(.../SurveyAnswerDAO.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	(.../SurveyAnswerDAO.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -38,12 +38,12 @@
      * @param questionUid
      * @return
      */
-    List<SurveyAnswer> getSessionAnswer(Long sessionId, Long questionUid, Long excludeUserId);
+    List<SurveyAnswer> getSessionAnswer(Long sessionId, Long questionUid);
 
     List<SurveyAnswer> getByToolContentIdAndUserId(Long toolContentId, Long userId);
 
-    List<String> getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid,
-	    final Long excludeUserId, int page, int size, int sorting);
+    List<String> getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid, int page, int size,
+	    int sorting);
 
-    int getCountResponsesBySessionAndQuestion(final Long sessionId, final Long questionId, final Long excludeUserId);
+    int getCountResponsesBySessionAndQuestion(final Long sessionId, final Long questionId);
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java	(.../SurveyUserDAO.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java	(.../SurveyUserDAO.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -29,9 +29,11 @@
 
 public interface SurveyUserDAO extends DAO {
 
-	SurveyUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
+    SurveyUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
 
-	SurveyUser getUserByUserIDAndContentID(Long userId, Long contentId);
+    SurveyUser getUserByUserIDAndContentID(Long userId, Long contentId);
 
-	List<SurveyUser> getBySessionID(Long sessionId);
+    List<SurveyUser> getBySessionID(Long sessionId);
+    
+    int getCountFinishedUsers(Long sessionId);
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	(.../SurveyAnswerDAOHibernate.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	(.../SurveyAnswerDAOHibernate.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -32,18 +32,18 @@
     private static final String GET_LEARNER_ANSWER = "FROM " + SurveyAnswer.class.getName()
 	    + " AS a WHERE a.surveyQuestion.uid=? AND a.user.uid=?";
     private static final String GET_SESSION_ANSWER = "FROM " + SurveyAnswer.class.getName() + " AS a "
-	    + " WHERE a.user.session.sessionId=? AND a.surveyQuestion.uid=? AND a.user.userId!=?";
+	    + " WHERE a.user.session.sessionId=? AND a.surveyQuestion.uid=?";
     private static final String GET_BY_TOOL_CONTENT_ID_AND_USER_ID = "FROM " + SurveyAnswer.class.getName() + " AS a "
 	    + " WHERE a.user.session.survey.contentId = ? AND a.user.userId = ?";
 
     private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT = "SELECT r.answerText FROM "
 	    + SurveyAnswer.class.getName()
 	    + " AS r "
-	    + "WHERE r.user.session.sessionId=:sessionId AND r.surveyQuestion.uid=:questionUid AND r.user.userId!=:excludeUserId AND r.answerText<>'' order by ";
+	    + "WHERE r.user.session.sessionId=:sessionId AND r.surveyQuestion.uid=:questionUid AND r.answerText<>'' order by ";
 
     private static final String GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION = "SELECT COUNT(*) FROM "
 	    + SurveyAnswer.class.getName() + " AS r "
-	    + "WHERE r.user.session.sessionId=? AND r.surveyQuestion.uid=? AND r.user.userId!=? AND r.answerText<>''";
+	    + "WHERE r.user.session.sessionId=? AND r.surveyQuestion.uid=? AND r.answerText<>''";
 
     @Override
     public SurveyAnswer getAnswer(Long questionUid, Long userUid) {
@@ -55,8 +55,8 @@
     }
 
     @Override
-    public List<SurveyAnswer> getSessionAnswer(Long sessionId, Long questionUid, Long excludeUserId) {
-	return getHibernateTemplate().find(GET_SESSION_ANSWER, new Object[] { sessionId, questionUid, excludeUserId});
+    public List<SurveyAnswer> getSessionAnswer(Long sessionId, Long questionUid) {
+	return getHibernateTemplate().find(GET_SESSION_ANSWER, new Object[] { sessionId, questionUid});
     }
 
     @SuppressWarnings("unchecked")
@@ -66,8 +66,8 @@
     }
 
     @Override
-    public List<String> getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid,
-	    final Long excludeUserId, int page, int size, int sorting) {
+    public List<String> getOpenResponsesForTablesorter(final Long sessionId, final Long questionUid, int page,
+	    int size, int sorting) {
 	String sortingOrder = "";
 	switch (sorting) {
 	case SurveyConstants.SORT_BY_DEAFAULT:
@@ -82,18 +82,15 @@
 	}
 	String sqlQuery = LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT + sortingOrder;
 
-	return getSession().createQuery(sqlQuery)
-		.setLong("sessionId", sessionId.longValue()).setLong("questionUid", questionUid.longValue())
-		.setLong("excludeUserId", excludeUserId.longValue()).setFirstResult(page * size).setMaxResults(size)
-		.list();
+	return getSession().createQuery(sqlQuery).setLong("sessionId", sessionId.longValue())
+		.setLong("questionUid", questionUid.longValue()).setFirstResult(page * size).setMaxResults(size).list();
     }
 
     @Override
-    public int getCountResponsesBySessionAndQuestion(final Long sessionId, final Long questionId,
-	    final Long excludeUserId) {
+    public int getCountResponsesBySessionAndQuestion(final Long sessionId, final Long questionId) {
 
 	List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION,
-		new Object[] { sessionId, questionId, excludeUserId });
+		new Object[] { sessionId, questionId });
 	if (list == null || list.size() == 0) {
 	    return 0;
 	}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java	(.../SurveyUserDAOHibernate.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java	(.../SurveyUserDAOHibernate.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -28,30 +28,42 @@
 import org.lamsfoundation.lams.tool.survey.dao.SurveyUserDAO;
 import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
 
+public class SurveyUserDAOHibernate extends BaseDAOHibernate implements SurveyUserDAO {
 
-public class SurveyUserDAOHibernate extends BaseDAOHibernate implements SurveyUserDAO{
-	
-	private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + SurveyUser.class.getName() + " as u where u.userId =? and u.survey.contentId=?";
-	private static final String FIND_BY_USER_ID_SESSION_ID = "from " + SurveyUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?";
-	private static final String FIND_BY_SESSION_ID = "from " + SurveyUser.class.getName() + " as u where u.session.sessionId=?";
+    private static final String FIND_BY_USER_ID_CONTENT_ID = "FROM " + SurveyUser.class.getName()
+	    + " AS u WHERE u.userId =? AND u.survey.contentId=?";
+    private static final String FIND_BY_USER_ID_SESSION_ID = "FROM " + SurveyUser.class.getName()
+	    + " AS u WHERE u.userId =? AND u.session.sessionId=?";
+    private static final String FIND_BY_SESSION_ID = "FROM " + SurveyUser.class.getName()
+	    + " AS u WHERE u.session.sessionId=?";
+    private static final String GET_COUNT_FINISHED_USERS_FOR_SESSION = "SELECT COUNT(*) FROM "
+	    + SurveyUser.class.getName()
+	    + " AS u WHERE u.session.sessionId=? AND (u.sessionFinished is true OR u.responseFinalized is true)";
 
-	public SurveyUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
-		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId});
-		if(list == null || list.size() == 0)
-			return null;
-		return (SurveyUser) list.get(0);
-	}
+    public SurveyUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
+	List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId });
+	if (list == null || list.size() == 0)
+	    return null;
+	return (SurveyUser) list.get(0);
+    }
 
-	public SurveyUser getUserByUserIDAndContentID(Long userId, Long contentId) {
-		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId});
-		if(list == null || list.size() == 0)
-			return null;
-		return (SurveyUser) list.get(0);
-	}
+    public SurveyUser getUserByUserIDAndContentID(Long userId, Long contentId) {
+	List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
+	if (list == null || list.size() == 0)
+	    return null;
+	return (SurveyUser) list.get(0);
+    }
 
-	public List<SurveyUser> getBySessionID(Long sessionId) {
-		return this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId);
+    public List<SurveyUser> getBySessionID(Long sessionId) {
+	return this.getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId);
+    }
+
+    public int getCountFinishedUsers(Long sessionId) {
+	List list = getHibernateTemplate().find(GET_COUNT_FINISHED_USERS_FOR_SESSION, new Object[] { sessionId });
+	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/dbupdates/patch20141023.sql
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20141023.sql	(.../patch20141023.sql)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20141023.sql	(.../patch20141023.sql)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -5,6 +5,7 @@
 
 -- LDEV-3326 Option to include everyone results after survey responses are sent
 ALTER TABLE tl_lasurv11_survey ADD COLUMN show_other_users_answers TINYINT(1) NOT NULL DEFAULT 0;
+ALTER TABLE tl_lasurv11_user ADD COLUMN response_finalized TINYINT(1) NOT NULL DEFAULT 0;
 
 ----------------------Put all sql statements above here-------------------------
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java	(.../SurveyUser.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java	(.../SurveyUser.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -45,6 +45,7 @@
     private String lastName;
     private String loginName;
     private boolean sessionFinished;
+    private boolean responseFinalized;
 
     private SurveySession session;
     private Survey survey;
@@ -60,6 +61,7 @@
 	this.session = session;
 	this.survey = null;
 	this.sessionFinished = false;
+	this.responseFinalized = false;
     }
 
     public SurveyUser(UserDTO user, Survey content) {
@@ -69,7 +71,7 @@
 	this.loginName = user.getLogin();
 	this.session = null;
 	this.survey = content;
-	this.sessionFinished = false;
+	this.responseFinalized = false;
     }
 
     /**
@@ -196,7 +198,23 @@
     public void setSessionFinished(boolean sessionFinished) {
 	this.sessionFinished = sessionFinished;
     }
+    
+    /**
+     * @hibernate.property column="response_finalized"
+     * @return Returns the responseFinalized.
+     */
+    public boolean isResponseFinalized() {
+	return responseFinalized;
+    }
 
+    /**
+     * @param responseFinalized
+     *                The responseFinalized to set.
+     */
+    public void setResponseFinalized(boolean responseFinalized) {
+	this.responseFinalized = responseFinalized;
+    }
+
     public boolean equals(Object obj) {
 	if (this == obj)
 	    return true;
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -42,7 +42,7 @@
 /**
  * @author Dapeng.Ni
  * 
- * Interface that defines the contract that all Survey service provider must follow.
+ *         Interface that defines the contract that all Survey service provider must follow.
  */
 public interface ISurveyService {
 
@@ -116,20 +116,10 @@
      */
     AnswerDTO getQuestionResponse(Long sessionId, Long questionUid);
 
-    /**
-     * Get question's answer with response percentage infromation.
-     * 
-     * @param sessionId
-     * @param questionUid
-     * @param excludeUserId exclude this user's answers from result list. 
-     * @return
-     */
-    AnswerDTO getQuestionResponse(Long sessionId, Long questionUid, Long excludeUserId);
-    
-    List<String> getOpenResponsesForTablesorter(final Long qaSessionId, final Long questionId,
-	    final Long excludeUserId, int page, int size, int sorting);
+    List<String> getOpenResponsesForTablesorter(final Long qaSessionId, final Long questionId, int page, int size,
+	    int sorting);
 
-    int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId);
+    int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId);
 
     /**
      * Commit answers for a group of question together.
@@ -178,6 +168,14 @@
      * @return
      */
     List<SurveyUser> getSessionUsers(Long sessionId);
+    
+    /**
+     * Get number of finished users.
+     * 
+     * @param sessionId
+     * @return
+     */
+    int getCountFinishedUsers(Long sessionId);
 
     // ******************************************************************************************
     // ********** Session methods ***********************
@@ -206,6 +204,13 @@
      * @return
      */
     String finishToolSession(Long toolSessionId, Long userId) throws SurveyApplicationException;
+    
+    /**
+     * Mark user as finalized response which will signify he has submitted response.
+     * 
+     * @param user
+     */
+    void setResponseFinalized(Long userUid);
 
     // ******************************************************************************************
     // Monitoring summary /statistic methods
@@ -274,21 +279,21 @@
      * @return
      */
     Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry);
-    
+
     void notifyTeachersOnAnswerSumbit(Long sessionId, SurveyUser surveyUser);
 
     /**
      * Creates an unique name for a SurveyCondition. It consists of the tool output definition name and a unique
      * positive integer number.
      * 
      * @param existingConditions
-     *                existing conditions; required to check if a condition with the same name does not exist.
+     *            existing conditions; required to check if a condition with the same name does not exist.
      * @return unique SurveyCondition name
      */
     String createConditionName(Collection<SurveyCondition> existingConditions);
 
     void deleteCondition(SurveyCondition condition);
-    
+
     /**
      * Returns whether activity is grouped and therefore it is expected more than one tool session.
      * 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -174,6 +174,11 @@
     public SurveyUser getUserByIDAndSession(Long userId, Long sessionId) {
 	return surveyUserDao.getUserByUserIDAndSessionID(userId, sessionId);
     }
+    
+    @Override
+    public int getCountFinishedUsers(Long sessionId) {
+	return surveyUserDao.getCountFinishedUsers(sessionId);
+    }
 
     @Override
     public void saveOrUpdateSurvey(Survey survey) {
@@ -219,6 +224,13 @@
 	}
 	return nextUrl;
     }
+    
+    @Override
+    public void setResponseFinalized(Long userUid) {
+	SurveyUser user = (SurveyUser) surveyUserDao.getObject(SurveyUser.class, userUid);
+	user.setResponseFinalized(true);
+	surveyUserDao.saveObject(user);
+    }
 
     @Override
     public Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry) {
@@ -321,20 +333,14 @@
 	    surveyAnswerDao.saveObject(ans);
 	}
     }
-    
-    @Override
-    public AnswerDTO getQuestionResponse(Long sessionId, Long questionUid) {
-	//pass -1 as exclude userId to skip no users
-	return getQuestionResponse(sessionId, questionUid, -1L);
-    }
 
     @Override
-    public AnswerDTO getQuestionResponse(Long sessionId, Long questionUid, Long excludeUserId) {
+    public AnswerDTO getQuestionResponse(Long sessionId, Long questionUid) {
 	SurveyQuestion question = surveyQuestionDao.getByUid(questionUid);
 	AnswerDTO answerDto = new AnswerDTO(question);
 
 	// get question all answer from this session
-	List<SurveyAnswer> answsers = surveyAnswerDao.getSessionAnswer(sessionId, questionUid, excludeUserId);
+	List<SurveyAnswer> answsers = surveyAnswerDao.getSessionAnswer(sessionId, questionUid);
 
 	// create a map to hold Option UID and sequenceID(start from 0);
 	Map<String, Integer> optMap = new HashMap<String, Integer>();
@@ -396,16 +402,17 @@
 
 	return answerDto;
     }
-    
+
     @Override
-    public List<String> getOpenResponsesForTablesorter(final Long qaSessionId, final Long questionId, final Long excludeUserId,
-	    int page, int size, int sorting) {
-	return surveyAnswerDao.getOpenResponsesForTablesorter(qaSessionId, questionId, excludeUserId, page, size, sorting);
-    }    
-    
+    public List<String> getOpenResponsesForTablesorter(final Long qaSessionId, final Long questionId, int page,
+	    int size, int sorting) {
+	return surveyAnswerDao.getOpenResponsesForTablesorter(qaSessionId, questionId, page, size,
+		sorting);
+    }
+
     @Override
-    public int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId) {
-	return surveyAnswerDao.getCountResponsesBySessionAndQuestion(qaSessionId, questionId, excludeUserId);
+    public int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId) {
+	return surveyAnswerDao.getCountResponsesBySessionAndQuestion(qaSessionId, questionId);
     }
 
     @Override
@@ -520,11 +527,11 @@
 
 	return summary;
     }
-    
+
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public String createConditionName(Collection<SurveyCondition> existingConditions) {
 	String uniqueNumber = null;
@@ -549,15 +556,15 @@
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getSurveyOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
-    
+
     @Override
     public void notifyTeachersOnAnswerSumbit(Long sessionId, SurveyUser surveyUser) {
-	
-	//it appears surveyUser can be null (?)
+
+	// it appears surveyUser can be null (?)
 	if (surveyUser == null) {
 	    return;
 	}
-	
+
 	String userName = surveyUser.getLastName() + " " + surveyUser.getFirstName();
 	String message = getLocalisedMessage("event.answer.submit.body", new Object[] { userName });
 	eventNotificationService.notifyLessonMonitors(sessionId, message, false);
@@ -651,7 +658,7 @@
 	try {
 	    // register version filter class
 	    exportContentService.registerImportVersionFilterClass(SurveyImportContentVersionFilter.class);
-	
+
 	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, surveyToolContentHandler,
 		    fromVersion, toVersion);
 	    if (!(toolPOJO instanceof Survey)) {
@@ -737,11 +744,11 @@
 	    }
 	}
     }
-    
+
     public String getToolContentTitle(Long toolContentId) {
 	return getSurveyByContentId(toolContentId).getTitle();
     }
-    
+
     @Override
     public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException {
 	Survey survey = surveyDao.getByContentId(toolContentId);
@@ -750,7 +757,7 @@
 	}
 	survey.setDefineLater(false);
     }
-    
+
     @Override
     public boolean isContentEdited(Long toolContentId) {
 	return getSurveyByContentId(toolContentId).isDefineLater();
@@ -855,31 +862,33 @@
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
     /*
-     * Sample content for import: <struct> <var name='objectType'><string>content</string></var> <var name='id'><number>34.0</number></var>
-     * <var name='questions'><array length='3'> <struct> <var name='order'><number>1.0</number></var> <var
-     * name='isOptional'><boolean value='true'/></var> <var name='question'><string>Sample Multiple choice - only one
-     * response allowed?</string></var> <var name='questionType'><string>simpleChoice</string></var> <var
-     * name='isTextBoxEnabled'><boolean value='false'/></var> <var name='candidates'><array length='3'> <struct> <var
-     * name='order'><number>1.0</number></var> <var name='answer'><string>Option 1</string></var> </struct>
-     * <struct> <var name='order'><number>2.0</number></var> <var name='answer'><string>Option 2</string></var>
-     * </struct> <struct> <var name='order'><number>3.0</number></var> <var name='answer'><string>Option 3</string></var>
+     * Sample content for import: <struct> <var name='objectType'><string>content</string></var> <var
+     * name='id'><number>34.0</number></var> <var name='questions'><array length='3'> <struct> <var
+     * name='order'><number>1.0</number></var> <var name='isOptional'><boolean value='true'/></var> <var
+     * name='question'><string>Sample Multiple choice - only one response allowed?</string></var> <var
+     * name='questionType'><string>simpleChoice</string></var> <var name='isTextBoxEnabled'><boolean
+     * value='false'/></var> <var name='candidates'><array length='3'> <struct> <var
+     * name='order'><number>1.0</number></var> <var name='answer'><string>Option 1</string></var> </struct> <struct>
+     * <var name='order'><number>2.0</number></var> <var name='answer'><string>Option 2</string></var> </struct>
+     * <struct> <var name='order'><number>3.0</number></var> <var name='answer'><string>Option 3</string></var>
      * </struct> </array></var> </struct> <struct> <var name='order'><number>2.0</number></var> <var
-     * name='isOptional'><boolean value='false'/></var> <var name='question'><string>Sample Multiple choice -
-     * multiple response allowed?</string></var> <var name='questionType'><string>choiceMultiple</string></var>
-     * <var name='isTextBoxEnabled'><boolean value='true'/></var> <var name='candidates'><array length='3'> <struct>
-     * <var name='order'><number>1.0</number></var> <var name='answer'><string>Option 1</string></var> </struct><struct>
-     * <var name='order'><number>2.0</number></var> <var name='answer'><string>Option 2</string></var> </struct><struct>
-     * <var name='order'><number>3.0</number></var> <var name='answer'><string>Option 3</string></var> </struct>
+     * name='isOptional'><boolean value='false'/></var> <var name='question'><string>Sample Multiple choice - multiple
+     * response allowed?</string></var> <var name='questionType'><string>choiceMultiple</string></var> <var
+     * name='isTextBoxEnabled'><boolean value='true'/></var> <var name='candidates'><array length='3'> <struct> <var
+     * name='order'><number>1.0</number></var> <var name='answer'><string>Option 1</string></var> </struct><struct> <var
+     * name='order'><number>2.0</number></var> <var name='answer'><string>Option 2</string></var> </struct><struct> <var
+     * name='order'><number>3.0</number></var> <var name='answer'><string>Option 3</string></var> </struct>
      * </array></var> </struct> <struct> <var name='order'><number>3.0</number></var> <var name='isOptional'><boolean
      * value='true'/></var> <var name='question'><string>Sample Free text question?</string></var> <var
      * name='questionType'><string>textEntry</string></var> <var name='isTextBoxEnabled'><boolean value='false'/></var>
      * <var name='candidates'><array length='0'></array></var> </struct> </array></var> <var
-     * name='contentDefineLater'><boolean value='false'/></var> <var name='body'><string>Put instructions here.</string></var>
-     * <var name='contentShowUser'><boolean value='false'/></var> <var name='isHTML'><boolean value='false'/></var>
-     * <var name='summary'><string>Thank you for your participation!</string></var> xxxxxxxxxx <var name='title'><string>Put
-     * Title Here</string></var> <var name='description'><string>Survey Questions</string></var> <var
-     * name='contentType'><string>surveycontent</string></var> <var name='isReusable'><boolean value='false'/></var>
-     * </struct></array></var> <var name='firstActivity'><number>31.0</number></var>
+     * name='contentDefineLater'><boolean value='false'/></var> <var name='body'><string>Put instructions
+     * here.</string></var> <var name='contentShowUser'><boolean value='false'/></var> <var name='isHTML'><boolean
+     * value='false'/></var> <var name='summary'><string>Thank you for your participation!</string></var> xxxxxxxxxx
+     * <var name='title'><string>Put Title Here</string></var> <var name='description'><string>Survey
+     * Questions</string></var> <var name='contentType'><string>surveycontent</string></var> <var
+     * name='isReusable'><boolean value='false'/></var> </struct></array></var> <var
+     * name='firstActivity'><number>31.0</number></var>
      */
 
     /**
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -104,6 +104,7 @@
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="update*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="setResponseFinalized">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="notifyTeachersOnAnswerSumbit">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java	(.../ChartAction.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java	(.../ChartAction.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -66,11 +66,9 @@
 
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 	Long questionUid = WebUtil.readLongParam(request, SurveyConstants.ATTR_QUESTION_UID);
-	Long excludeUserId = WebUtil.readLongParam(request, SurveyConstants.ATTR_USER_ID, true);
 
 	// if excludeUserId received exclude this user's answers
-	AnswerDTO answer = (excludeUserId == null) ? getSurveyService().getQuestionResponse(sessionId, questionUid)
-		: getSurveyService().getQuestionResponse(sessionId, questionUid, excludeUserId);
+	AnswerDTO answer = getSurveyService().getQuestionResponse(sessionId, questionUid);
 	if (answer.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY) {
 	    ChartAction.logger.error("Error question type : Text entry can not generate chart.");
 	    response.getWriter().print(resource.getMessage(SurveyConstants.ERROR_MSG_CHART_ERROR));
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -49,6 +49,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionRedirect;
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
@@ -148,14 +149,15 @@
 	AnswerForm answerForm = (AnswerForm) form;
 	// initial Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
-	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-	answerForm.setSessionMapID(sessionMap.getSessionID());
+	String sessionMapID = sessionMap.getSessionID();
+	request.getSession().setAttribute(sessionMapID, sessionMap);
+	answerForm.setSessionMapID(sessionMapID);
 
 	// save toolContentID into HTTPSession
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 	Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
 	// it will be use when submissionDeadline or lock on finish page.
-	request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
 	// get back the survey and question list and display them on page
 	ISurveyService service = getSurveyService();
@@ -174,8 +176,6 @@
 	List<AnswerDTO> answers = service.getQuestionAnswers(sessionId, surveyUser.getUid());
 	Survey survey = service.getSurveyBySessionId(sessionId);
 
-	// check whehter finish lock is on/off
-	boolean lock = survey.getLockWhenFinished() && surveyUser.isSessionFinished();
 
 	// get notebook entry
 	String entryText = new String();
@@ -192,12 +192,14 @@
 	// basic information
 	sessionMap.put(SurveyConstants.ATTR_TITLE, survey.getTitle());
 	sessionMap.put(SurveyConstants.ATTR_SURVEY_INSTRUCTION, survey.getInstructions());
+	// check whehter finish lock is on/off
+	boolean lock = survey.getLockWhenFinished() && surveyUser.isSessionFinished();
 	sessionMap.put(SurveyConstants.ATTR_FINISH_LOCK, lock);
 	sessionMap.put(SurveyConstants.ATTR_LOCK_ON_FINISH, survey.getLockWhenFinished());
 	sessionMap.put(SurveyConstants.ATTR_SHOW_ON_ONE_PAGE, survey.isShowOnePage());
 	sessionMap.put(SurveyConstants.ATTR_SHOW_OTHER_USERS_ANSWERS, survey.isShowOtherUsersAnswers());
 	sessionMap.put(SurveyConstants.ATTR_USER_FINISHED, surveyUser.isSessionFinished());
-	sessionMap.put(SurveyConstants.ATTR_USER_ID, surveyUser.getUserId());
+	sessionMap.put(SurveyConstants.ATTR_USER, surveyUser);
 
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
@@ -260,11 +262,20 @@
 	} else {
 	    answerForm.setPosition(SurveyConstants.POSITION_FIRST);
 	}
-	// if page is locked, only go to result pages.
-	if (lock) {
+	
+	// if session is finished go to result pages.
+	if (surveyUser.isSessionFinished() && !survey.isShowOtherUsersAnswers()) {
 	    return mapping.findForward(SurveyConstants.FORWARD_RESULT);
+	 
+	//if show other users is ON and response is finalized - show results page with other users answers
+	} else if (survey.isShowOtherUsersAnswers() && surveyUser.isResponseFinalized()) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("resultOtherUsers"));
+	    redirect.addParameter(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	    return redirect;
+	    
+	}  else {
+	    return mapping.findForward(SurveyConstants.SUCCESS);    
 	}
-	return mapping.findForward(SurveyConstants.SUCCESS);
     }
 
     private ActionForward nextQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -369,17 +380,22 @@
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
 		sessionMapID);
 
-	Long excludeUserId = (Long) sessionMap.get(SurveyConstants.ATTR_USER_ID);
 	SortedMap<Integer, AnswerDTO> surveyItemMap = getQuestionList(sessionMap);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	List<AnswerDTO> answerDtos = new ArrayList<AnswerDTO>();
 	for (SurveyQuestion question : surveyItemMap.values()) {
-	    AnswerDTO answerDto = service.getQuestionResponse(sessionId, question.getUid(), excludeUserId);
+	    AnswerDTO answerDto = service.getQuestionResponse(sessionId, question.getUid());
 	    answerDtos.add(answerDto);
 	}
 	request.setAttribute("answerDtos", answerDtos);
 
+	SurveyUser surveyLearner = (SurveyUser) sessionMap.get(SurveyConstants.ATTR_USER);
+	service.setResponseFinalized(surveyLearner.getUid());
+	
+	int countFinishedUser = service.getCountFinishedUsers(sessionId);
+	request.setAttribute(SurveyConstants.ATTR_COUNT_FINISHED_USERS, countFinishedUser);
+
 	return mapping.findForward(SurveyConstants.SUCCESS);
     }
     
@@ -392,7 +408,6 @@
 	
 	Long questionUid = WebUtil.readLongParam(request, "questionUid");
 	Long sessionId = WebUtil.readLongParam(request, "sessionId");
-	Long excludeUserId = WebUtil.readLongParam(request, "userId");
 	
 	//paging parameters of tablesorter
 	int size = WebUtil.readIntParam(request, "size");
@@ -406,13 +421,13 @@
 	    sorting = SurveyConstants.SORT_BY_ANSWER_DESC;
 	}
 	
-	List<String> responses = service.getOpenResponsesForTablesorter(sessionId, questionUid, excludeUserId, page, size,
+	List<String> responses = service.getOpenResponsesForTablesorter(sessionId, questionUid, page, size,
 		sorting);
 	
 	JSONArray rows = new JSONArray();
 
 	JSONObject responcedata = new JSONObject();
-	responcedata.put("total_rows", service.getCountResponsesBySessionAndQuestion(sessionId, questionUid, excludeUserId));
+	responcedata.put("total_rows", service.getCountResponsesBySessionAndQuestion(sessionId, questionUid));
 	
 	for (String response : responses) {
 	    //JSONArray cell=new JSONArray();
@@ -444,15 +459,9 @@
 	SortedMap<Integer, AnswerDTO> surveyItemMap = getQuestionList(sessionMap);
 	Collection<AnswerDTO> surveyItemList = surveyItemMap.values();
 
-	SurveyUser surveyLearner = null;
+	SurveyUser surveyLearner = (SurveyUser) sessionMap.get(SurveyConstants.ATTR_USER);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, true);
-	if ((userID != null) && (userID != 0)) {
-	    surveyLearner = service.getUserByIDAndSession(userID, sessionId);
-	    request.setAttribute(AttributeNames.PARAM_USER_ID, userID);
-	}
-
 	ActionErrors errors;
 	if ((questionSeqID == null) || questionSeqID.equals(0)) {
 	    errors = getAnswers(request);
@@ -466,9 +475,7 @@
 	List<SurveyAnswer> answerList = new ArrayList<SurveyAnswer>();
 	for (AnswerDTO question : surveyItemList) {
 	    if (question.getAnswer() != null) {
-		if ((userID != null) && (userID != 0)) {
-		    question.getAnswer().setUser(surveyLearner);
-		}
+		question.getAnswer().setUser(surveyLearner);
 		answerList.add(question.getAnswer());
 	    }
 	}
@@ -479,9 +486,6 @@
 
 	Survey survey = service.getSurveyBySessionId(sessionId);
 	if (survey.isNotifyTeachersOnAnswerSumbit()) {
-	    if (surveyLearner == null) {
-		surveyLearner = getCurrentUser(service, sessionId);
-	    }
 	    service.notifyTeachersOnAnswerSumbit(sessionId, surveyLearner);
 	}
 
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -6,7 +6,8 @@
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
-
+	
+	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript">
 		function previousQuestion(sessionMapID){
 			$("surveyForm").action = '<c:url value="/learning/previousQuestion.do"/>';
@@ -32,13 +33,11 @@
 		<html:hidden property="sessionMapID" />
 		<html:hidden property="position" />
 		<html:hidden property="currentIdx" />
-		<html:hidden property="userID" />
 		<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 		<c:set var="position" value="${formBean.position}" />
 		<c:set var="questionSeqID" value="${formBean.questionSeqID}" />
 		<c:set var="currentIdx" value="${formBean.currentIdx}" />
-		<c:set var="userID" value="${formBean.userID}" />
 
 		<div id="content">
 			<h1>
Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
diff -u -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
+++ lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -45,8 +45,7 @@
 
 	<c:if test="${question.type == 3}">
 		<p>
-			<textarea name="optionText${question.uid}" rows="7" cols="50" class="text-area"
-				type="_moz">${answerText}</textarea>
+			<lams:textarea name="optionText${question.uid}" rows="7" cols="50" class="text-area">${answerText}</lams:textarea>
 		</p>
 	</c:if>
 	<c:if test="${question.appendText}">
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -25,7 +25,7 @@
 		function retakeSurvey(questionSeqId){
 			//retake for all questions
 			if(questionSeqId == -1) {
-				document.location.href='<c:url value="/learning/start.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&userID=${userID}"/>';
+				document.location.href='<c:url value="/learning/retake.do?sessionMapID=${sessionMapID}"/>';
 			} else {
 				document.location.href='<c:url value="/learning/retake.do?sessionMapID=${sessionMapID}&questionSeqID="/>' +questionSeqId ;
 			}
@@ -42,7 +42,7 @@
 			<c:out value="${sessionMap.instructions}" escapeXml="false" />
 		</p>
 
-		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher'}">
+		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher' and !sessionMap.showOtherUsersAnswers}">
 			<div class="info">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
@@ -96,7 +96,7 @@
 
 				</p>
 				<c:if test="${question.type == 3}">
-					<lams:out value="${answerText}" escapeHtml="true"/>
+					<lams:out value="${answerText}" escapeHtml="false"/>
 				</c:if>
 
 				<c:if test="${question.appendText && (not empty answerText)}">
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -rc9845f2002ce96c641bb4334b237ef4744cd83c4 -r19c53ce28433c0e4d47c5f303be3e658c808329c
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision c9845f2002ce96c641bb4334b237ef4744cd83c4)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
@@ -29,7 +29,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />showChart.do?userId=${sessionMap.userId}';
+		var chartDataUrl = '<lams:WebAppURL />showChart.do';
 		var alwaysFetchChartValues = true;
 	
 		$(document).ready(function(){
@@ -50,7 +50,7 @@
 				      // {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds
 				      // the filterList to the url into an "fcol" array.
 				      // So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url
-					ajaxUrl : "<c:url value='/learning/getOpenResponses.do'/>?page={page}&size={size}&{sortList:column}&sessionId=${sessionMap.toolSessionID}&userId=${sessionMap.userId}&questionUid=" + $(this).attr('data-question-uid'),
+					ajaxUrl : "<c:url value='/learning/getOpenResponses.do'/>?page={page}&size={size}&{sortList:column}&sessionId=${sessionMap.toolSessionID}&questionUid=" + $(this).attr('data-question-uid'),
 					ajaxProcessing: function (data) {
 						
 				    	if (data && data.hasOwnProperty('rows')) {
@@ -108,7 +108,7 @@
 		}
 		
 		function retakeSurvey(){
-			document.location.href='<c:url value="/learning/start.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&userID=${userID}"/>';
+			document.location.href='<c:url value="/learning/retake.do?sessionMapID=${sessionMapID}"/>';
 		}
     </script>
 </lams:head>
@@ -171,7 +171,7 @@
 
 				</p>
 				<c:if test="${question.type == 3}">
-					<lams:out value="${answerText}" escapeHtml="true"/>
+					<lams:out value="${answerText}" escapeHtml="false"/>
 				</c:if>
 
 				<c:if test="${question.appendText && (not empty answerText)}">
@@ -218,6 +218,12 @@
 			<h2 id="other-users-answers-title">
 				<fmt:message key="label.other.answers" />
 			</h2>
+			
+			<div>
+				<fmt:message key="label.total.responses" >
+					<fmt:param>${countFinishedUser}</fmt:param>
+				</fmt:message>
+			</div>
 		
 			<c:forEach var="question" items="${answerDtos}" varStatus="queStatus">
 			<table class="alternative-color">
@@ -278,8 +284,7 @@
 				</c:if>
 				<c:if test="${question.type == 3}">
 					<tr>
-						<td><fmt:message key="label.open.response"/></td>
-						<td>
+						<td colspan="2">
 							<table class="tablesorter" data-question-uid="${question.uid}">
 								<thead>
 									<tr>