Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralLearnerFlowDTO.java,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	5 Aug 2006 14:08:02 -0000	1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	30 Aug 2006 14:41:39 -0000	1.7
@@ -74,6 +74,8 @@
 
     protected Map mapAnswers;
     
+    protected Map mapAnswersPresentable;
+    
     protected Map mapQuestions;
     
     protected Map mapQuestionContentLearner;
@@ -408,4 +410,16 @@
         this.listMonitoredAnswersContainerDTO = listMonitoredAnswersContainerDTO;
     }
 
+    /**
+     * @return Returns the mapAnswersPresentable.
+     */
+    public Map getMapAnswersPresentable() {
+        return mapAnswersPresentable;
+    }
+    /**
+     * @param mapAnswersPresentable The mapAnswersPresentable to set.
+     */
+    public void setMapAnswersPresentable(Map mapAnswersPresentable) {
+        this.mapAnswersPresentable = mapAnswersPresentable;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaMonitoredUserDTO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java	26 Aug 2006 15:27:45 -0000	1.4
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java	30 Aug 2006 14:41:40 -0000	1.5
@@ -52,6 +52,8 @@
 	
 	private String response;
 	
+	private String responsePresentable;
+	
 	private String sessionId;
 	
 	private String questionUid;
@@ -209,4 +211,16 @@
     public void setAttemptTime(Date attemptTime) {
         this.attemptTime = attemptTime;
     }
+    /**
+     * @return Returns the responsePresentable.
+     */
+    public String getResponsePresentable() {
+        return responsePresentable;
+    }
+    /**
+     * @param responsePresentable The responsePresentable to set.
+     */
+    public void setResponsePresentable(String responsePresentable) {
+        this.responsePresentable = responsePresentable;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.49 -r1.50
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	28 Aug 2006 12:00:28 -0000	1.49
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	30 Aug 2006 14:41:40 -0000	1.50
@@ -77,6 +77,17 @@
 	    qaGeneralAuthoringDTO.setSynchInMonitor(defaultQaContent.isSynchInMonitor()?ON:OFF);
 	    qaGeneralAuthoringDTO.setQuestionsSequenced(defaultQaContent.isQuestionsSequenced()?ON:OFF);
 	}
+    
+    
+    public static String replaceNewLines(String text)
+    {
+        logger.debug("using text: " + text);
+        String newText = text.replaceAll("\n","<br>");
+        logger.debug("newText: " + newText);
+        
+        return newText;
+    }
+    
 
     
     public static QaGeneralAuthoringDTO buildGeneralAuthoringDTO(HttpServletRequest request, IQaService qaService, QaContent qaContent, 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v
diff -u -r1.34 -r1.35
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	26 Aug 2006 15:27:45 -0000	1.34
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	30 Aug 2006 14:41:40 -0000	1.35
@@ -373,14 +373,18 @@
 		    	    		if (qaUsrResp != null)
 		    	    		{
 		    	    			QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
-		    	    			//qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
 		    	    			qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime());		    	    			
 		    	    			qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
 		    	    			qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
 		    	    			qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname());
 		    	    			qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
 		    	    			qaMonitoredUserDTO.setSessionId(sessionId.toString());
 		    	    			qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
+		    	    			
+		    	    			String responsePresentable=QaUtils.replaceNewLines(qaUsrResp.getAnswer());
+		    	    			logger.debug("responsePresentable: " + responsePresentable);
+		    	    			qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
+		    	    			
 		    	    			qaMonitoredUserDTO.setQuestionUid(questionUid);
 		    	    			qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString());
 		    	    			listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
@@ -419,14 +423,18 @@
 			    	    		if (qaUsrResp != null)
 			    	    		{
 			    	    			QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
-			    	    			//qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
 			    	    			qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime());			    	    			
 			    	    			qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
 			    	    			qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
 			    	    			qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname());
 			    	    			qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
 			    	    			qaMonitoredUserDTO.setSessionId(sessionId.toString());
 			    	    			qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
+			    	    			
+			    	    			String responsePresentable=QaUtils.replaceNewLines(qaUsrResp.getAnswer());
+			    	    			logger.debug("responsePresentable: " + responsePresentable);
+			    	    			qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
+			    	    			
 			    	    			qaMonitoredUserDTO.setQuestionUid(questionUid);
 			    	    			qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString());
 			    	    			listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
@@ -464,7 +472,6 @@
 				    	    		if (qaUsrResp != null)
 				    	    		{
 				    	    			QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
-				    	    			//qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
 				    	    			qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime());
 				    	    			qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
 				    	    			qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
@@ -484,6 +491,11 @@
 				    	    			qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
 				    	    			qaMonitoredUserDTO.setSessionId(sessionId.toString());
 				    	    			qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
+				    	    			
+				    	    			String responsePresentable=QaUtils.replaceNewLines(qaUsrResp.getAnswer());
+				    	    			logger.debug("responsePresentable: " + responsePresentable);
+				    	    			qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
+
 				    	    			qaMonitoredUserDTO.setQuestionUid(questionUid);
 				    	    			qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString());
 				    	    			listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
@@ -520,14 +532,18 @@
 		    	    			{
 		    	    				logger.debug("this is the user requested , include his name for learner progress.");
 			    	    			QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
-			    	    			//qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
 			    	    			qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime());
 			    	    			qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
 			    	    			qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
 		    	    				qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname());	
 			    	    			qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
 			    	    			qaMonitoredUserDTO.setSessionId(sessionId.toString());
 			    	    			qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
+			    	    			
+			    	    			String responsePresentable=QaUtils.replaceNewLines(qaUsrResp.getAnswer());
+			    	    			logger.debug("responsePresentable: " + responsePresentable);
+			    	    			qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
+			    	    			
 			    	    			qaMonitoredUserDTO.setQuestionUid(questionUid);
 			    	    			qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString());
 			    	    			listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	29 Aug 2006 13:30:34 -0000	1.19
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	30 Aug 2006 14:41:40 -0000	1.20
@@ -109,6 +109,7 @@
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
+import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -185,6 +186,7 @@
     	logger.debug("questionListingMode: " + questionListingMode);
     	
     	Map mapAnswers= new TreeMap(new QaComparator());
+    	Map mapAnswersPresentable= new TreeMap(new QaComparator());
         /* if the listing mode is QUESTION_LISTING_MODE_COMBINED populate  the answers here*/
     	if (questionListingMode.equalsIgnoreCase(QUESTION_LISTING_MODE_COMBINED))
     	{
@@ -193,7 +195,11 @@
             {
                 String answer=request.getParameter("answer" + questionIndex);
                 logger.debug("answer for question " + questionIndex + " is:" + answer);
+                String answerPresentable=QaUtils.replaceNewLines(answer);
+                logger.debug("answerPresentable: " + answerPresentable);
+                
                 mapAnswers.put(new Long(questionIndex).toString(), answer);
+                mapAnswersPresentable.put(new Long(questionIndex).toString(), answerPresentable);
             }
             logger.debug("final mapAnswers for the combined mode:" + mapAnswers);
     	}
@@ -203,7 +209,11 @@
     		if (totalQuestionCount.equals("1"))
     		{
     			logger.debug("totalQuestionCount is 1: " + qaLearningForm.getAnswer());
+    			String answerPresentable=QaUtils.replaceNewLines(qaLearningForm.getAnswer());
+    			logger.debug("answerPresentable: " + answerPresentable);
+    			
     			mapAnswers.put(new Long(1).toString(), qaLearningForm.getAnswer());
+    			mapAnswersPresentable.put(new Long(1).toString(), answerPresentable);
     		}
     		else 
     		{
@@ -216,6 +226,10 @@
     	}
 		logger.debug("using mapAnswers:" + mapAnswers);
     	generalLearnerFlowDTO.setMapAnswers(mapAnswers);
+    	
+		logger.debug("using mapAnswersPresentable:" + mapAnswersPresentable);;
+    	generalLearnerFlowDTO.setMapAnswersPresentable(mapAnswersPresentable);
+    	
 
     	/*mapAnswers will be used in the viewAllAnswers screen*/
 	    SessionMap sessionMap = new SessionMap();
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	24 Aug 2006 08:43:34 -0000	1.10
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	30 Aug 2006 14:41:39 -0000	1.11
@@ -92,7 +92,7 @@
 									  </tr>
 									  
 									  
-				  			  		<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
+				  			  		<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
 										<c:if test="${answerEntry.key == questionEntry.key}"> 						  			  		
 										  <tr>
 											<td colspan=2> <b> <bean:message key="label.learning.yourAnswer"/>  </b>  
@@ -101,7 +101,7 @@
 										  
 										  <tr>
 											<td colspan=2> 
-												  <c:out value="${answerEntry.value}" escapeXml="false" />						  																	
+												  <c:out value="${answerEntry.value}" escapeXml="false"/>						  																	
 										  	</td>
 										  </tr>
 										  
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/web/learning/LearnerRep.jsp	30 Aug 2006 10:00:17 -0000	1.12
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	30 Aug 2006 14:41:39 -0000	1.13
@@ -118,7 +118,7 @@
 														 <td NOWRAP valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>
 													</tr>
 													<tr> 															
-													 	<td colspan=2 valign=top>   <c:out value="${userData.response}"/>  </td>														 
+													 	<td colspan=2 valign=top>   <c:out value="${userData.responsePresentable}" escapeXml="false"/>  </td>														 
 													</tr>													 
 											</c:if>														  					 
 	 									</c:forEach>		  	
@@ -200,7 +200,7 @@
  														 <td NOWRAP valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>
 													</tr>
 													<tr>
-														 <td colspan=2 valign=top>  <c:out value="${userData.response}"/>  </td>														 
+														 <td colspan=2 valign=top>  <c:out value="${userData.responsePresentable}" escapeXml="false"/>  </td>														 
 													</tr>															
 											</c:if>														  					 
 	 									</c:forEach>