Index: lams_tool_survey/conf/language/ApplicationResources.properties
===================================================================
diff -u -racfcd68cefd9d696f1b8ced611f7bedb30750024 -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision acfcd68cefd9d696f1b8ced611f7bedb30750024)
+++ lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -158,4 +158,8 @@
 message.view.bar.chart=View column chart
 message.possible.answers=Possible answers
 message.total.user.response=Total user response
-message.learner.choose.answer = {0} percent leaners of the class have chosen this answer.
\ No newline at end of file
+message.learner.choose.answer.percentage = {0} percent leaners of the class have chosen this answer.
+message.learner.choose.answer=The learner has chosen this answer
+error.chart.gen=Error occurs during generating chart, please try again.
+title.chart.report=Report of Individual Question
+label.learner=Learner
\ No newline at end of file
Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -racfcd68cefd9d696f1b8ced611f7bedb30750024 -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision acfcd68cefd9d696f1b8ced611f7bedb30750024)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -229,25 +229,19 @@
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
 		
-		<action path="/monitoring/viewBarChart"
+		<action path="/monitoring/viewChartReport"
 			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
-			parameter="viewBarChart" >
-			<forward name="success" path="/pages/monitoring/barchart.jsp" />
+			parameter="viewChartReport" >
+			<forward name="success" path="/pages/monitoring/chartreport.jsp" />
 		</action>
-		<action path="/monitoring/viewPieChart"
-			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
-			parameter="viewPieChart" >
-			<forward name="success" path="/pages/monitoring/piechart.jsp" />
-		</action>
 		<action path="/showChart"
 			type="org.lamsfoundation.lams.tool.survey.web.action.ChartAction">
-			<forward name="error" path="/pages/monitoring/charterror.jsp" />
 		</action>
 		
-		<action path="/monitoring/listuser"
+		<action path="/monitoring/listAnswers"
 			type="org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction"
-			parameter="listuser" >
-			<forward name="success" path="/pages/monitoring/userlist.jsp" />
+			parameter="listAnswers" >
+			<forward name="success" path="/pages/monitoring/listanswers.jsp" />
 		</action>
 		
 		<action path="/monitoring/viewReflection"
Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/db/sql/create_lams_tool_survey.sql	(.../create_lams_tool_survey.sql)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/db/sql/create_lams_tool_survey.sql	(.../create_lams_tool_survey.sql)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -33,7 +33,6 @@
 uid bigint not null auto_increment, 
 question_uid bigint, 
 user_uid bigint, 
-session_id bigint, 
 answer_choices varchar(255), 
 udpate_date datetime, 
 answer_text varchar(255), 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -45,7 +45,6 @@
 	public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
 	public static final String PARAM_FILE_UUID = "fileUuid";
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
-	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
 	public static final String PARAM_RUN_OFFLINE = "runOffline";
 	public static final String PARAM_TITLE = "title";
 	public static final String ATTR_USER_UID = "userUid";
@@ -60,7 +59,8 @@
 	public static final String ERROR_MSG_INVALID_URL = "error.survey.item.invalid.url";
 	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
 	public static final String ERROR_MSG_MANDATORY_QUESTION = "error.mandatory.question";
-	
+	public static final String ERROR_MSG_CHART_ERROR = "error.chart.gen";
+
 	public static final String MSG_OPEN_RESPONSE ="label.open.response";
 	public static final String MSG_PIECHART_TITLE = "piechart.title";
 	public static final String MSG_BARCHART_TITLE = "barchart.title";
@@ -81,6 +81,8 @@
 	public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
 	public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
 	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";
 	
 	public static final String ATTR_TITLE = "title";
@@ -108,4 +110,6 @@
 	public static int POSITION_FIRST = 1;
 	public static int POSITION_LAST = 2;
 	public static int POSITION_ONLY_ONE = 3;
+	
+	public static final String OPTION_SHORT_HEADER = "a";
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
===================================================================
diff -u -racfcd68cefd9d696f1b8ced611f7bedb30750024 -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	(.../SurveyAnswerDAOHibernate.java)	(revision acfcd68cefd9d696f1b8ced611f7bedb30750024)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	(.../SurveyAnswerDAOHibernate.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -8,7 +8,7 @@
 public class SurveyAnswerDAOHibernate extends BaseDAOHibernate implements SurveyAnswerDAO {
 	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.surveyQuestion.uid=? and a.user.session.sessionId=?";
+							" where a.user.session.sessionId=? and a.surveyQuestion.uid=?";
 	
 	public SurveyAnswer getAnswer(Long questionUid, Long userUid) {
 		List list = getHibernateTemplate().find(GET_LEARNER_ANSWER,new Object[]{questionUid,userUid});
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -125,7 +125,7 @@
             inverse="false"
             cascade="all"
             sort="unsorted"
-            order-by="sequence_id desc"
+            order-by="sequence_id asc"
         >
 
             <key
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -417,7 +417,7 @@
 	 * @hibernate.set lazy="true"
 	 *                inverse="false"
 	 *                cascade="all"
-	 *                order-by="sequence_id desc"
+	 *                order-by="sequence_id asc"
 	 * @hibernate.collection-key column="survey_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.survey.model.SurveyQuestion"
 	 * 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java	(.../SurveyOption.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java	(.../SurveyOption.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -41,8 +41,8 @@
 	
 	//****************************************************
 	// DTO fields: percentage of response for this option. For monitoring summary usage.
-	private double reponse;
-	private String reponseFormatStr;
+	private double response;
+	private String responseFormatStr;
 	private int responseCount;
 	
     public Object clone(){
@@ -92,23 +92,23 @@
 		public void setSequenceId(int sequenceId) {
 			this.sequenceId = sequenceId;
 		}
-		public double getReponse() {
-			return reponse;
+		public double getResponse() {
+			return response;
 		}
-		public void setReponse(double reponse) {
-			this.reponse = reponse;
+		public void setResponse(double reponse) {
+			this.response = reponse;
 		}
 		public int getResponseCount() {
 			return responseCount;
 		}
 		public void setResponseCount(int responseCount) {
 			this.responseCount = responseCount;
 		}
-		public String getReponseFormatStr() {
-			return reponseFormatStr;
+		public String getResponseFormatStr() {
+			return responseFormatStr;
 		}
-		public void setReponseFormatStr(String reponseFormatStr) {
-			this.reponseFormatStr = reponseFormatStr;
+		public void setResponseFormatStr(String reponseFormatStr) {
+			this.responseFormatStr = reponseFormatStr;
 		}
 
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -100,7 +100,7 @@
 	//******************************************************************************************
 	//*************** Questions  methods **********************
 	//******************************************************************************************
-	
+	SurveyQuestion getQuestion(Long questionUid);
 	/**
 	 * Delete resoruce item from database.
 	 * @param uid
@@ -154,6 +154,14 @@
 	 * @return
 	 */
 	SurveyUser getUser(Long uid);
+
+	/**
+	 * Get all users under one tool session.
+	 * @param sessionId
+	 * @return
+	 */
+	List<SurveyUser> getSessionUsers(Long sessionId);
+
 	//******************************************************************************************
 	//********** Repository methods ***********************
 	//******************************************************************************************
@@ -227,8 +235,6 @@
 	 * @return
 	 */
 	Map<Long, Set<ReflectDTO>> getReflectList(Long contentId);
-	
-	
 
 }
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -89,6 +89,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
@@ -295,8 +296,10 @@
 		return (SurveyUser) surveyUserDao.getObject(SurveyUser.class, uid);
 	}
 	
+	public List<SurveyUser> getSessionUsers(Long sessionId){
+		return surveyUserDao.getBySessionID(sessionId);
+	}
 
-
 	public void deleteQuestion(Long uid) {
 		surveyQuestionDao.removeObject(SurveyQuestion.class, uid);
 		
@@ -330,10 +333,8 @@
 	public SurveyQuestion getQuestionResponse(Long sessionId, Long questionUid){
 		SurveyQuestion question = surveyQuestionDao.getByUid(questionUid);
 		
+		SurveyWebUtils.createShortTitle(question);
 		
-		if(question.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
-			return question;
-		
 		//get question all answer from this session
 		List<SurveyAnswer> answsers = surveyAnswerDao.getSessionAnswer(sessionId, questionUid);
 
@@ -348,40 +349,46 @@
 		
 		//initial a array to hold how many time chose has been done for a option or open text.
 		int optSize = options.size();
-		if(question.isAppendText())
+		if(question.isAppendText() || question.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
 			optSize++;
 		
 		int[] choose = new int[optSize];
 		Arrays.fill(choose, 0);
 
 		//sum up all option and open text (if has) have been selected count list
-		int answerSum = 1;
+		int answerSum = 0;
 		if(answsers != null){
 			for (SurveyAnswer answer : answsers) {
 				String[] choseOpt = SurveyWebUtils.getChoiceList(answer.getAnswerChoices());
 				for (String optUid : choseOpt) {
 					if(optMap.containsKey(optUid))
 						choose[optMap.get(optUid)]++;
 				}
-				if(question.isAppendText() && !StringUtils.isBlank(answer.getAnswerText()))
+				if((question.isAppendText()
+						|| question.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
+						&& !StringUtils.isBlank(answer.getAnswerText()))
 					choose[optSize-1]++;
 					
 				answerSum ++;
 			}
 		}
 		//caculate the percentage of answer response
 		idx=0;
+		if(answerSum == 0){
+			answerSum = 1;
+		}
 		for (SurveyOption option : options) {
-			option.setReponse((double)choose[idx]/(double)answerSum);
-			option.setReponseFormatStr(new Integer((int) option.getReponse()).toString());
+			option.setResponse((double)choose[idx]/(double)answerSum * 100d);
+			option.setResponseFormatStr(new Integer((int) option.getResponse()).toString());
 			option.setResponseCount(choose[idx]);
 			idx++;
 		}
-		if(question.isAppendText()){
-			question.setOpenResponse((double)choose[idx]/(double)answerSum);
+		if(question.isAppendText() || question.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY){
+			question.setOpenResponse((double)choose[idx]/(double)answerSum * 100d);
 			question.setOpenResponseFormatStr(new Integer((int) question.getOpenResponse()).toString());
 			question.setOpenResponseCount(choose[idx]);
 		}
+		
 		return question;
 		
 	}
@@ -408,6 +415,11 @@
 		
 		return summary;
 	}
+
+	public SurveyQuestion getQuestion(Long questionUid) {
+		return surveyQuestionDao.getByUid(questionUid);
+	}
+
 	//*****************************************************************************
 	// private methods
 	//*****************************************************************************
@@ -819,4 +831,5 @@
 	}
 
 
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyUserComparator.java
===================================================================
diff -u
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyUserComparator.java	(revision 0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyUserComparator.java	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -0,0 +1,17 @@
+package org.lamsfoundation.lams.tool.survey.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
+
+public class SurveyUserComparator implements Comparator<SurveyUser> {
+	
+	public int compare(SurveyUser o1, SurveyUser o2) {
+		if(o1 != null && o2 != null){
+			return o1.getLoginName().compareTo( o2.getLoginName());
+		}else if(o1 != null)
+			return 1;
+		else
+			return -1;
+	}
+}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java	(.../SurveyWebUtils.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java	(.../SurveyWebUtils.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -24,7 +24,9 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.tool.survey.util;
 
+import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
+import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 import org.lamsfoundation.lams.tool.survey.web.action.MonitoringAction;
 
 
@@ -37,6 +39,8 @@
  */
 public class SurveyWebUtils {
 
+	private static final int SHORT_TITLE_LENGTH = 60;
+	
 	public static boolean isSurveyEditable(Survey survey) {
 	        if ( (survey.isDefineLater() == true) && (survey.isContentInUse()==true) )
 	        {
@@ -68,4 +72,9 @@
 		
 		return choiceList.split("&");
 	}
+	public static void createShortTitle(SurveyQuestion question) {
+		String desc = question.getDescription();
+		desc = desc.replaceAll("<(.|\n)*?>", "");
+		question.setShortTitle(StringUtils.abbreviate(desc,SHORT_TITLE_LENGTH));
+	}
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -868,7 +868,7 @@
 			retriveQuestionForDisplay(item);
 		}
 	}
-	private void retriveQuestionForDisplay(SurveyQuestion item) {
+	public static void retriveQuestionForDisplay(SurveyQuestion item) {
 		String desc = item.getDescription();
 		desc = desc.replaceAll("<(.|\n)*?>", "");
 		item.setShortTitle(StringUtils.abbreviate(desc,SHORT_TITLE_LENGTH));
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java	(.../ChartAction.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java	(.../ChartAction.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -23,14 +23,23 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.survey.web.action;
 
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.ATTR_QUESTION_UID;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.CHART_TYPE;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.ERROR_MSG_CHART_ERROR;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.MSG_BARCHART_CATEGORY_AXIS_LABEL;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.MSG_BARCHART_TITLE;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.MSG_BARCHART_VALUE_AXIS_LABEL;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.MSG_OPEN_RESPONSE;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.MSG_PIECHART_TITLE;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.QUESTION_TYPE_TEXT_ENTRY;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.SURVEY_SERVICE;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.OPTION_SHORT_HEADER;
+
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -46,9 +55,6 @@
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.data.category.DefaultCategoryDataset;
 import org.jfree.data.general.DefaultPieDataset;
-import static org.lamsfoundation.lams.tool.survey.SurveyConstants.*;
-
-import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.model.SurveyOption;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 import org.lamsfoundation.lams.tool.survey.service.ISurveyService;
@@ -64,14 +70,14 @@
  * @version $Revision$
  */
 public class ChartAction extends  Action {
-    private static final String OPTION_SHORT_HEADER = "a";
     
 	static Logger logger = Logger.getLogger(ChartAction.class.getName());
 	
 	private MessageResources resource;
 	public ActionForward execute(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 		
+		resource = getResources(request);
         OutputStream out= response.getOutputStream(); 
         
         String type= WebUtil.readStrParam(request, CHART_TYPE);
@@ -83,7 +89,8 @@
 		SurveyQuestion question =service.getQuestionResponse(sessionId,questionUid);
 		if(question.getType() == QUESTION_TYPE_TEXT_ENTRY){
 			logger.error("Error question type : Text entry can not generate chart.");
-			return mapping.findForward(ERROR);
+			response.getWriter().print(resource.getMessage(ERROR_MSG_CHART_ERROR));
+			return null;
 		}
 			
 		//Try to create chart
@@ -94,14 +101,14 @@
     		chart = createBarChart (question);    
     	}
     	
-    	resource = getResources(request);
         //send chart to response output stream
         if (chart != null){
             response.setContentType("image/png");
             ChartUtilities.writeChartAsPNG(out, chart, 400, 300);
             return null;
         }else{
-        	return mapping.findForward(ERROR);
+			response.getWriter().print(resource.getMessage(ERROR_MSG_CHART_ERROR));
+			return null;
         }
      
     }
@@ -114,7 +121,7 @@
         Set<SurveyOption> options = question.getOptions();
 		int optIdx = 1;
 		for (SurveyOption option : options) {
-			data.setValue(OPTION_SHORT_HEADER + optIdx, (Number) option.getReponse());
+			data.setValue(OPTION_SHORT_HEADER + optIdx, (Number) option.getResponse());
 			optIdx++;
   		}
           
@@ -135,7 +142,7 @@
         Set<SurveyOption> options = question.getOptions();
         int optIdx = 1;
         for (SurveyOption option : options) {
-            data.setValue((Number)option.getReponse(), OPTION_SHORT_HEADER + optIdx, OPTION_SHORT_HEADER + optIdx);
+            data.setValue((Number)option.getResponse(), OPTION_SHORT_HEADER + optIdx, OPTION_SHORT_HEADER + optIdx);
             optIdx++;
 		}
         
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -24,11 +24,16 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.survey.web.action;
 
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.CHART_TYPE;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.ATTR_QUESTION;
+import static org.lamsfoundation.lams.tool.survey.SurveyConstants.ATTR_ANSWER_LIST;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -48,6 +53,7 @@
 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.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -67,19 +73,31 @@
 			return summary(mapping, form, request, response);
 		}
 
-		if (param.equals("listuser")) {
-			return listuser(mapping, form, request, response);
+		if (param.equals("viewChartReport")) {
+			return viewChartReport(mapping, form, request, response);
 		}
 
+		if (param.equals("listAnswers")) {
+			return listAnswers(mapping, form, request, response);
+		}
+
 		if (param.equals("viewReflection")) {
 			return viewReflection(mapping, form, request, response);
 		}
-		
 
 		return mapping.findForward(SurveyConstants.ERROR);
 	}
 
 
+	/**
+	 * Summary page action.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+
 	private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		//initial Session Map 
@@ -103,18 +121,56 @@
 		
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
+	/**
+	 * Display pie chart or bar chart for one question.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward viewChartReport(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+		String type= WebUtil.readStrParam(request, CHART_TYPE);
+		
+		Long questionUid = WebUtil.readLongParam(request, SurveyConstants.ATTR_QUESTION_UID);
+		ISurveyService service = getSurveyService();
+		//get question
+		SurveyQuestion question = service.getQuestion(questionUid);
 
-	private ActionForward listuser(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+		//set all attribute to request for show
+		request.setAttribute( AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+		request.setAttribute( CHART_TYPE, type);
+		request.setAttribute( ATTR_QUESTION, question);
+		
+		return mapping.findForward(SurveyConstants.SUCCESS);
+	}
+
+
+
+	private ActionForward listAnswers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-		Long itemUid = WebUtil.readLongParam(request, SurveyConstants.PARAM_RESOURCE_ITEM_UID);
+		Long questionUid = WebUtil.readLongParam(request, SurveyConstants.ATTR_QUESTION_UID);
 
-		//get user list by given item uid
+		//get user list 
 		ISurveyService service = getSurveyService();
-//		List list = service.getUserListBySessionItem(sessionId, itemUid);
 		
-		//set to request
-//		request.setAttribute(SurveyConstants.ATTR_USER_LIST, list);
+		SortedMap<SurveyUser,SurveyQuestion> userAnswerMap = new TreeMap<SurveyUser, SurveyQuestion>(new SurveyUserComparator());
+//		get all users with their answers whatever they answer or not
+		List<SurveyUser> users = service.getSessionUsers(sessionId);
+		for (SurveyUser user : users) {
+			List<SurveyQuestion> questionAnswers = service.getQuestionAnswer(sessionId, user.getUid());
+			for (SurveyQuestion questionAnswer : questionAnswers) {
+				if(questionUid.equals(questionAnswer.getUid())){
+					userAnswerMap.put(user,questionAnswer);
+					break;
+				}
+			}
+		}
+		//set all attribute to request for show
+		request.setAttribute( ATTR_ANSWER_LIST, userAnswerMap);
+		
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
 	
Fisheye: Tag 6a5d35ec57dde95eae93fb628d669af257d36949 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/monitoring/charterror.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/monitoring/chartreport.jsp
===================================================================
diff -u
--- lams_tool_survey/web/pages/monitoring/chartreport.jsp	(revision 0)
+++ lams_tool_survey/web/pages/monitoring/chartreport.jsp	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%>
+<html>
+<head>
+	    <%@ include file="/common/header.jsp" %>
+</head>
+<body>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<fmt:message key="title.chart.report"/>
+		</h1>
+		<div id="header-no-tabs-learner">
+		</div>
+		<div id="content-learner">
+			<table border="0" cellspacing="3" width="98%">
+				<tr>
+					<td><fmt:message key="label.question"/></td>
+					<td><c:out value="${question.description}" escapeXml="false"/></td>
+				</tr>
+				<tr>
+					<td colspan="2"><fmt:message key="message.possible.answers"/></td>
+				</tr>
+				<c:forEach var="option" items="${question.options}" varStatus="status">
+					<tr>
+						<td>
+							<%= SurveyConstants.OPTION_SHORT_HEADER %>${status.count}
+						</td>
+						<td>
+							${option.description}
+						</td>
+					</tr>
+				</c:forEach>
+				<c:if test="${question.appendText}">
+					<tr>
+						<td>
+							<fmt:message key="label.open.response"/>
+						</td>
+						<td></td>
+					</tr>
+				</c:if>
+				<tr>
+					<td colspan="2">
+						<img src="<c:url value="/showChart.do?chartType=${chartType}&toolSessionID="/>${toolSessionID}&questionUid=${question.uid}" 
+							title="<fmt:message key="message.view.pie.chart"/>">
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div id="footer-learner"></div>
+		</div>
+	</div>
+</body>
+</html>
Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp
===================================================================
diff -u
--- lams_tool_survey/web/pages/monitoring/listanswers.jsp	(revision 0)
+++ lams_tool_survey/web/pages/monitoring/listanswers.jsp	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -0,0 +1,110 @@
+<!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"%>
+<html>
+<head>
+	    <%@ include file="/common/header.jsp" %>
+</head>
+<body>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<fmt:message key="title.chart.report"/>
+		</h1>
+		<div id="header-no-tabs-learner">
+		</div>
+		<div id="content-learner">
+			<table border="0" cellspacing="3" width="98%">
+			<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}">
+					<tr>
+						<td><fmt:message key="label.question"/></td>
+						<td><c:out value="${question.description}" escapeXml="false"/></td>
+					</tr>
+					<tr>
+						<td colspan="2"><fmt:message key="message.possible.answers"/></td>
+					</tr>
+					<c:forEach var="option" items="${question.options}" varStatus="optStatus">
+						<tr>
+							<td>
+								<%= SurveyConstants.OPTION_SHORT_HEADER %>${optStatus.count}
+							</td>
+							<td>
+								${option.description}
+							</td>
+						</tr>
+					</c:forEach>
+					<c:if test="${question.appendText ||question.type == 3}">
+						<tr>
+							<td>
+								<fmt:message key="label.open.response"/>
+							</td>
+							<td></td>
+						</tr>
+					</c:if>
+					<tr>
+						<td colspan="2">
+							<table>
+								<tr>
+									<th><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>
+				<%--  End first check  --%>
+				</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>
+										</td>
+									</c:forEach>
+									<c:if test="${question.appendText ||question.type == 3}">
+										<td>
+											<c:if test="${not empty question.answer}">
+												<c:if test="${not empty question.answer.answerText}">
+													<img src="${tool}/includes/images/tick_red.gif" title="<fmt:message key="message.learner.choose.answer"/>">
+												</c:if>
+											</c:if>
+										</td>
+									</c:if>
+								</tr>
+				<c:if test="${status.first}">
+							</table>
+						</td>
+					</tr>
+				<%--  End first check  --%>
+				</c:if>
+				</c:forEach>
+			</table>
+		</div>
+		<div id="footer-learner"></div>
+		</div>
+	</div>
+</body>
+</html>
Fisheye: Tag 6a5d35ec57dde95eae93fb628d669af257d36949 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/monitoring/piechart.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -1,91 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-
 <table cellspacing="3">
-	<c:if test="${empty summaryList}">
-		<div align="center">
-			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-		</div>
-	</c:if>
-	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-		<c:set var="groupSize" value="${fn:length(group)}" />
-		<c:forEach var="item" items="${group}" varStatus="status">
-			<%-- display group name on first row--%>
-			<c:if test="${status.index == 0}">
-				<tr>
-					<td colspan="4">
-						<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B> <SPAN style="font-size: 12px;"> <c:if test="${firstGroup.index==0}">
-								<fmt:message key="monitoring.summary.note" />
-							</c:if> </SPAN>
-					</td>
-				</tr>
-				<tr>
-					<th width="20%" align="center">
-						<fmt:message key="monitoring.label.type" />
-					</th>
-					<th width="35%">
-						<fmt:message key="monitoring.label.title" />
-					</th>
-					<th width="25%">
-						<fmt:message key="monitoring.label.suggest" />
-					</th>
-					<th width="20%" align="center">
-						<fmt:message key="monitoring.label.number.learners" />
-					</th>
-				</tr>
-			</c:if>
-			<c:if test="${item.itemUid == -1}">
-				<tr>
-					<td colspan="4">
-						<div align="left">
-							<b> <fmt:message key="message.monitoring.summary.no.survey.for.group" /> </b>
-						</div>
-					</td>
-				</tr>
-			</c:if>
-			<c:if test="${item.itemUid != -1}">
-				<tr>
-					<td>
-						<c:choose>
-							<c:when test="${item.itemType == 1}">
-								<fmt:message key="label.authoring.basic.survey.url" />
-							</c:when>
-							<c:when test="${item.itemType == 2}">
-								<fmt:message key="label.authoring.basic.survey.file" />
-							</c:when>
-							<c:when test="${item.itemType == 3}">
-								<fmt:message key="label.authoring.basic.survey.website" />
-							</c:when>
-							<c:when test="${item.itemType == 4}">
-								<fmt:message key="label.authoring.basic.survey.learning.object" />
-							</c:when>
-						</c:choose>
-					</td>
-					<td>
-						${item.itemTitle}
-					</td>
-					<td>
-						<c:if test="${!item.itemCreateByAuthor}">
-										${item.username}
-									</c:if>
-					</td>
-					<td align="center">
-						<c:choose>
-							<c:when test="${item.viewNumber > 0}">
-								<c:set var="listUrl">
-									<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}' />
-								</c:set>
-								<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
-							</c:when>
-							<c:otherwise>
-											0
-										</c:otherwise>
-						</c:choose>
-					</td>
-				</tr>
-			</c:if>
-		</c:forEach>
-	</c:forEach>
 </table>
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
diff -u -racfcd68cefd9d696f1b8ced611f7bedb30750024 -r6a5d35ec57dde95eae93fb628d669af257d36949
--- lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision acfcd68cefd9d696f1b8ced611f7bedb30750024)
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
@@ -1,18 +1,18 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
+<c:set var="tool"><lams:WebAppURL/></c:set>
 
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 	</div>
 </c:if>
 
-<table cellpadding="0">
+<table cellpadding="0"  class="alternative-color">
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-		<c:set var="groupSize" value="${fn:length(group)}" />
-		<c:set var="surveySession"  value="${summaryList.key}"/>
-		<c:set var="questions"  value="${summaryList.value}"/>
+		<c:set var="surveySession"  value="${group.key}"/>
+		<c:set var="questions"  value="${group.value}"/>
 		
 		<c:if test="${empty questions}">
 			<tr>
@@ -23,50 +23,52 @@
 				</td>
 			</tr>
 		</c:if>
-		<c:forEach var="item" items="${questions}" varStatus="status">
+		<c:forEach var="question" items="${questions}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.first}">
 				<tr>
 					<td colspan="2">
 						<B><fmt:message key="monitoring.label.group" /> ${surveySession.sessionName}</B> 
-						<SPAN style="font-size: 12px;"> 
-							<c:if test="${firstGroup.index==0}">
-								<fmt:message key="monitoring.summary.note" />
-							</c:if> 
-						</SPAN>
 					</td>
 				</tr>
 				<%-- End group title display --%>
 			</c:if>
 			<tr>
-				<th>${question.shortTitle}</th>
-				<th>
-					<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/viewPieChart.do?"/>toolSessionID${surveySession.sessionId}&questionUid=${question.uid}')">
-						<img src="/includes/images/piechart.gif" title="<fmt:message key='message.view.pie.chart'/>">
+				<th class="first">
+					<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/listAnswers.do?"/>toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}')">
+						${question.shortTitle}
 					</a>
-					<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/viewBarChart.do?"/>toolSessionID${surveySession.sessionId}&questionUid=${question.uid}')">
-						<img src="/includes/images/barchart.gif" title="<fmt:message key='message.view.bar.chart'/>">
-					</a>
 				</th>
+				<th class="first">
+					<%-- Only show pie/bar chart when question is single/multiple choics type --%>
+					<c:if test="${question.type !=3}">
+						<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/viewChartReport.do?chartType=pie&"/>toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}')">
+							<img src="${tool}/includes/images/piechart.gif" title="<fmt:message key='message.view.pie.chart'/>" height="22" width="25" border="0">
+						</a>
+						<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/viewChartReport.do?chartType=bar&"/>toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}')">
+							<img src="${tool}/includes/images/columnchart.gif" title="<fmt:message key='message.view.bar.chart'/>" height="22" width="25" border="0">
+						</a>
+					</c:if>
+				</th>
 			</tr>
 			<tr>
 				<td><fmt:message key="message.possible.answers"/></td>
 				<td><fmt:message key="message.total.user.response"/></td>
 			</tr>
 			<c:set var="optSize" value="${fn:length(question.options)}" />
-			<c:forEach var="option" items="question.options"  varStatus="status">
+			<c:forEach var="option" items="${question.options}"  varStatus="status">
 				<tr>
 					<td>${option.description}</td>
 					<td>
 						<c:set var="imgTitle">
-							<fmt:message key="message.learner.choose.answer">
+							<fmt:message key="message.learner.choose.answer.percentage">
 								<fmt:param>${option.response}</fmt:param>
 							</fmt:message>
 						</c:set>
 						<c:set var="imgIdx">
-							${status.index % 5}
+							${status.index % 5 + 1}
 						</c:set>			
-						<img src="/includes/images/bar${imgIdx}.gif" height="10" width="${option.response * 2}" 
+						<img src="${tool}/includes/images/bar${imgIdx}.gif" height="10" width="${option.response * 2}" 
 						title="${imgTitle}">
 						${option.responseCount} (${option.responseFormatStr}%)
 					</td>
@@ -77,19 +79,27 @@
 					<td><fmt:message key="label.open.response"/></td>
 					<td>
 						<c:set var="imgTitle">
-							<fmt:message key="message.learner.choose.answer">
+							<fmt:message key="message.learner.choose.answer.percentage">
 								<fmt:param>${question.openResponseFormatStr}</fmt:param>
 							</fmt:message>
 						</c:set>
 						<c:set var="imgIdx">
-							${(optSize + 1) % 5}
+							${(optSize % 5)  + 1}
 						</c:set>						
-						<img src="/includes/images/bar${imgIdx}.gif" height="10" width="${question.openResponse * 2}" 
+						<img src="${tool}/includes/images/bar${imgIdx}.gif" height="10" width="${question.openResponse * 2}" 
 						title="${imgTitle}">
 						${question.openResponseCount} (${question.openResponseFormatStr}%)
 					</td>
 				</tr>
 			</c:if>
+			<c:if test="${question.type == 3}">
+				<tr>
+					<td><fmt:message key="label.open.response"/></td>
+					<td>
+						${question.openResponseCount} 
+					</td>
+				</tr>
+			</c:if>
 				<%-- Reflection list  --%>
 				<c:if test="${sessionMap.survey.reflectOnActivity && status.last}">
 					<c:set var="userList" value="${sessionMap.reflectList[surveySession.sessionId]}"/>
Fisheye: Tag 6a5d35ec57dde95eae93fb628d669af257d36949 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/monitoring/userlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?