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.8 -r1.9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	4 Sep 2006 15:40:14 -0000	1.8
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	6 Sep 2006 22:31:08 -0000	1.9
@@ -48,6 +48,8 @@
     
     protected String countSessionComplete;
     
+    protected String userName;
+    
     protected String toolSessionID;
     
     protected String httpSessionID;
@@ -479,4 +481,16 @@
     public void setNotebookEntriesVisible(String notebookEntriesVisible) {
         this.notebookEntriesVisible = notebookEntriesVisible;
     }
+    /**
+     * @return Returns the userName.
+     */
+    public String getUserName() {
+        return userName;
+    }
+    /**
+     * @param userName The userName to set.
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.66 -r1.67
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	4 Sep 2006 15:40:14 -0000	1.66
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	6 Sep 2006 22:31:08 -0000	1.67
@@ -74,6 +74,8 @@
 	public static final String DEFAULT_QA_INSTRUCTIONS					="Q&A Instructions";
 	public static final String NOTEBOOK									="notebook";
 	public static final String ENTRY_TEXT								="entryText";
+	public static final String REFLECTIONS_CONTAINER_DTO				="reflectionsContainerDTO";
+	public static final String LEARNER_NOTEBOOK							="learnerNotebook";
 	
 	public static final String ACTIVE_MODULE							="activeModule";
 	public static final String AUTHORING								="authoring";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ReflectionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/ReflectionDTO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ReflectionDTO.java	6 Sep 2006 22:31:08 -0000	1.1
@@ -0,0 +1,131 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ***********************************************************************/
+/* $$Id: ReflectionDTO.java,v 1.1 2006/09/06 22:31:08 ozgurd Exp $$ */
+package org.lamsfoundation.lams.tool.qa;
+
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * <p> DTO that holds reflections from users
+ * </p>
+ * 
+ * @author Ozgur Demirtas
+ */
+public class ReflectionDTO implements Comparable
+{
+    protected String userName;
+    
+    protected String userId;
+    
+    protected String sessionId;
+    
+    protected String reflectionUid;
+    
+    protected String entry;
+    
+    
+	public int compareTo(Object o)
+    {
+	    ReflectionDTO reflectionDTO = (ReflectionDTO) o;
+     
+        if (reflectionDTO == null)
+        	return 1;
+		else
+			return 0;
+    }
+
+	
+	public String toString() {
+        return new ToStringBuilder(this)
+            .append("userName: ", userName)
+            .append("userId: ", userId)
+            .append("sessionId: ", sessionId)
+            .append("reflectionUid: ", reflectionUid)
+            .append("entry: ", entry)
+            .toString();
+    }
+    
+
+
+    /**
+     * @return Returns the entry.
+     */
+    public String getEntry() {
+        return entry;
+    }
+    /**
+     * @param entry The entry to set.
+     */
+    public void setEntry(String entry) {
+        this.entry = entry;
+    }
+    /**
+     * @return Returns the sessionId.
+     */
+    public String getSessionId() {
+        return sessionId;
+    }
+    /**
+     * @param sessionId The sessionId to set.
+     */
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+    /**
+     * @return Returns the reflectionUid.
+     */
+    public String getReflectionUid() {
+        return reflectionUid;
+    }
+    /**
+     * @param reflectionUid The reflectionUid to set.
+     */
+    public void setReflectionUid(String reflectionUid) {
+        this.reflectionUid = reflectionUid;
+    }
+    /**
+     * @return Returns the userId.
+     */
+    public String getUserId() {
+        return userId;
+    }
+    /**
+     * @param userId The userId to set.
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+    /**
+     * @return Returns the userName.
+     */
+    public String getUserName() {
+        return userName;
+    }
+    /**
+     * @param userName The userName to set.
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	5 Aug 2006 14:08:02 -0000	1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	6 Sep 2006 22:31:09 -0000	1.7
@@ -124,8 +124,9 @@
 
     	logger.debug("for the special case of export portfolio we place generalLearnerFlowDTO into session scope");
     	request.getSession().setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
     	request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner");
+    	
+    	qaMonitoringAction.prepareReflectionData(request, content, qaService, userID.toString(), true);
     	logger.debug("ending learner mode: ");
     }
     
@@ -169,6 +170,8 @@
     	request.getSession().setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
         request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher");
+        
+        qaMonitoringAction.prepareReflectionData(request, content, qaService, null, true);
         logger.debug("ending teacher mode: ");
     }
 }
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.21 -r1.22
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	4 Sep 2006 15:40:14 -0000	1.21
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	6 Sep 2006 22:31:09 -0000	1.22
@@ -881,7 +881,9 @@
         
         GeneralLearnerFlowDTO generalLearnerFlowDTO= new GeneralLearnerFlowDTO();
         generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle());
-        generalLearnerFlowDTO.setReflectionSubject(qaContent.getReflectionSubject());
+        String reflectionSubject=qaContent.getReflectionSubject();
+        reflectionSubject=QaUtils.replaceNewLines(reflectionSubject);
+        generalLearnerFlowDTO.setReflectionSubject(reflectionSubject);
         
         request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 		logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO);
@@ -890,6 +892,4 @@
 		logger.debug("fwd'ing to: " + NOTEBOOK);
         return (mapping.findForward(NOTEBOOK));
 	}
-    
-
 }
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.44 -r1.45
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	5 Aug 2006 14:08:02 -0000	1.44
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	6 Sep 2006 22:31:08 -0000	1.45
@@ -88,6 +88,8 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -102,13 +104,18 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO;
 import org.lamsfoundation.lams.tool.qa.GeneralMonitoringDTO;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaContent;
+import org.lamsfoundation.lams.tool.qa.QaQueUsr;
+import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
+import org.lamsfoundation.lams.tool.qa.ReflectionDTO;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
 import org.lamsfoundation.lams.tool.qa.util.QAConstants;
@@ -153,6 +160,7 @@
                                          ServletException
 	{
     	logger.debug("dispatching getStats..." + request);
+    	
     	GeneralMonitoringDTO generalMonitoringDTO= new GeneralMonitoringDTO();
     	initStatsContent(mapping, form, request, response, generalMonitoringDTO);
     	return (mapping.findForward(LOAD_MONITORING));
@@ -216,6 +224,8 @@
 
     	refreshStatsData(request, qaMonitoringForm, qaService, generalMonitoringDTO);
     	generalMonitoringDTO.setEditResponse(new Boolean(false).toString());
+    	
+        prepareReflectionData(request, qaContent, qaService, null, false);
 
     	logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
@@ -312,12 +322,13 @@
 		}
 		
 		generalMonitoringDTO.setEditResponse(new Boolean(false).toString());
+		
+        prepareReflectionData(request, qaContent, qaService,null, false);
     	
     	logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
     	logger.debug("ending  initInstructionsContent...");
-	 	
 	}
 
     /**
@@ -390,8 +401,6 @@
 			logger.debug("forwarding to: " + LOAD_MONITORING);
 			return (mapping.findForward(LOAD_MONITORING));
 		}
-		//request.getSession().setAttribute(ACTIVITY_TITLE, qaContent.getTitle());
-	    //request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, qaContent.getInstructions());
 		
 		if (qaContent.getTitle() == null)
 		{
@@ -407,6 +416,8 @@
     	logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 	    
+        prepareReflectionData(request, qaContent, qaService,null, false);
+		
 	    /* note that we are casting monitoring form subclass into Authoring form*/
 	    logger.debug("watch here: note that we are casting monitoring form subclass into Authoring form");
 	    return qaStarterAction.executeDefineLater(mapping, qaMonitoringForm, request, response, qaService);
@@ -504,6 +515,8 @@
 
 		generalMonitoringDTO.setEditResponse(new Boolean(false).toString());
 		
+        prepareReflectionData(request, qaContent, qaService,null, false);
+		
     	logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
@@ -532,7 +545,7 @@
 		//request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true).toString());
 		generalMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
 		
-		logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
+        logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 		QaUtils.setDefineLater(request, true,strToolContentID,  qaService);
@@ -557,7 +570,7 @@
 		logger.debug("questionIndex: " + questionIndex);
 		//request.getSession().setAttribute(REMOVABLE_QUESTION_INDEX, questionIndex);
     	
-    	QaAction qaAction= new QaAction(); 
+        QaAction qaAction= new QaAction(); 
     	return qaAction.removeQuestion(mapping, form, request, response);
     }
     
@@ -650,6 +663,8 @@
 		GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 	    
+	    prepareReflectionData(request, qaContent, qaService,null, false);
+        
 		refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO, false);
 		
     	return (mapping.findForward(LOAD_MONITORING));	
@@ -736,6 +751,8 @@
 	    
 	    refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO, true);
 	    
+        prepareReflectionData(request, qaContent, qaService,null, false);
+	    
 	    return (mapping.findForward(LOAD_MONITORING));	
 	}
     
@@ -826,11 +843,12 @@
 		logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
 		request.setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
 
-	    
 		GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 	    
 	    refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO, false);
+	    
+        prepareReflectionData(request, qaContent, qaService,null, false);
 	    return (mapping.findForward(LOAD_MONITORING));	
 	}
 
@@ -917,6 +935,8 @@
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 	    
 	    refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO, false);
+	    
+        prepareReflectionData(request, qaContent, qaService,null, false);
     	return (mapping.findForward(LOAD_MONITORING));	
 	}
 
@@ -952,6 +972,8 @@
 
 	    Map summaryToolSessionsId=MonitoringUtil.populateToolSessionsId(request, qaContent, qaService);
 		logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
+		
+		prepareReflectionData(request, qaContent, qaService,null, false);
 		request.setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
     }
     
@@ -1171,6 +1193,9 @@
 		    request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	    }
 	    
+	    
+	    prepareReflectionData(request, qaContent, qaService,null, false);
+	    
     	logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 	    /* ends here. */
@@ -1224,6 +1249,8 @@
 
 		generalMonitoringDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
 		
+		prepareReflectionData(request, qaContent, qaService,null, false);
+		
 		logger.debug("ending refreshStatsData with generalMonitoringDTO: " + generalMonitoringDTO);
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 	}
@@ -1298,6 +1325,8 @@
 	    }
 
 		logger.debug("SELECTION_CASE: " + request.getAttribute(SELECTION_CASE));
+		
+		prepareReflectionData(request, qaContent, qaService,null, false);
 
 	    logger.debug("submitting session to refresh the data from the database: ");
 	    return (mapping.findForward(LOAD_MONITORING));
@@ -1371,7 +1400,139 @@
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 	    refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO, false);
 	    
+	    prepareReflectionData(request, qaContent, qaService,null, false);
+	    
 	    logger.debug("submitting session to refresh the data from the database: ");
 	    return (mapping.findForward(LOAD_MONITORING));
      }
+    
+    
+	public ActionForward openNotebook(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException,
+            ServletException, ToolException
+    {
+        logger.debug("dispatching openNotebook...");
+    	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+		logger.debug("qaService: " + qaService);
+
+		
+		String uid=request.getParameter("uid");
+		logger.debug("uid: " + uid);
+		
+		String userId=request.getParameter("userId");
+		logger.debug("userId: " + userId);
+		
+		String userName=request.getParameter("userName");
+		logger.debug("userName: " + userName);
+
+		String sessionId=request.getParameter("sessionId");
+		logger.debug("sessionId: " + sessionId);
+		
+		
+		NotebookEntry notebookEntry = qaService.getEntry(new Long(sessionId),
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				MY_SIGNATURE, new Integer(userId));
+		
+        logger.debug("notebookEntry: " + notebookEntry);
+		
+        GeneralLearnerFlowDTO generalLearnerFlowDTO= new GeneralLearnerFlowDTO();
+		if (notebookEntry != null) {
+		    String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
+		    generalLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+		    generalLearnerFlowDTO.setUserName(userName);
+		}
+
+		
+		logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
+		request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
+		
+		return mapping.findForward(LEARNER_NOTEBOOK);
+	}
+	
+	public void prepareReflectionData(HttpServletRequest request, QaContent qaContent, 
+	        IQaService qaService, String userID, boolean exportMode)
+	{
+	    logger.debug("starting prepareReflectionData: " + qaContent);
+	    logger.debug("userID: " + userID);
+	    logger.debug("exportMode: " + exportMode);
+	    
+	    List reflectionsContainerDTO= new LinkedList();
+	    if (userID == null)
+	    {
+	        logger.debug("all users mode");
+		    for (Iterator sessionIter = qaContent.getQaSessions().iterator(); sessionIter.hasNext();) 
+		    {
+		       QaSession qaSession = (QaSession) sessionIter.next();
+		       logger.debug("qaSession: " + qaSession);
+		       for (Iterator userIter = qaSession.getQaQueUsers().iterator(); userIter.hasNext();) 
+		       {
+					QaQueUsr user = (QaQueUsr) userIter.next();
+					logger.debug("user: " + user);
+
+					NotebookEntry notebookEntry = qaService.getEntry(qaSession.getQaSessionId(),
+							CoreNotebookConstants.NOTEBOOK_TOOL,
+							MY_SIGNATURE, new Integer(user.getQueUsrId().toString()));
+					
+					logger.debug("notebookEntry: " + notebookEntry);
+					
+					if (notebookEntry != null) {
+					    ReflectionDTO reflectionDTO = new ReflectionDTO();
+					    reflectionDTO.setUserId(user.getQueUsrId().toString());
+					    reflectionDTO.setSessionId(qaSession.getQaSessionId().toString());
+					    reflectionDTO.setUserName(user.getUsername());
+					    reflectionDTO.setReflectionUid (notebookEntry.getUid().toString());
+					    String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
+					    reflectionDTO.setEntry(notebookEntryPresentable);
+					    reflectionsContainerDTO.add(reflectionDTO);
+					} 
+		       }
+		   }
+	   }
+	   else
+	   {
+	       logger.debug("single user mode");
+		    for (Iterator sessionIter = qaContent.getQaSessions().iterator(); sessionIter.hasNext();) 
+		    {
+		       QaSession qaSession = (QaSession) sessionIter.next();
+		       logger.debug("qaSession: " + qaSession);
+		       for (Iterator userIter = qaSession.getQaQueUsers().iterator(); userIter.hasNext();) 
+		       {
+					QaQueUsr user = (QaQueUsr) userIter.next();
+					logger.debug("user: " + user);
+					
+					if (user.getQueUsrId().toString().equals(userID))
+					{
+					    logger.debug("getting reflection for user with  userID: " + userID);
+						NotebookEntry notebookEntry = qaService.getEntry(qaSession.getQaSessionId(),
+								CoreNotebookConstants.NOTEBOOK_TOOL,
+								MY_SIGNATURE, new Integer(user.getQueUsrId().toString()));
+						
+						logger.debug("notebookEntry: " + notebookEntry);
+						
+						if (notebookEntry != null) {
+						    ReflectionDTO reflectionDTO = new ReflectionDTO();
+						    reflectionDTO.setUserId(user.getQueUsrId().toString());
+						    reflectionDTO.setSessionId(qaSession.getQaSessionId().toString());
+						    reflectionDTO.setUserName(user.getUsername());
+						    reflectionDTO.setReflectionUid (notebookEntry.getUid().toString());
+						    String notebookEntryPresentable=QaUtils.replaceNewLines(notebookEntry.getEntry());
+						    reflectionDTO.setEntry(notebookEntryPresentable);
+						    reflectionsContainerDTO.add(reflectionDTO);
+						} 
+					}
+		       }		       
+	   }
+    }
+	    
+	    
+	   logger.debug("reflectionsContainerDTO: " + reflectionsContainerDTO);
+	   request.setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+	   
+	   if (exportMode)
+	   {
+	       request.getSession().setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+	   }
+	   
+	}
 }
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.42 -r1.43
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	1 Sep 2006 09:39:07 -0000	1.42
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	6 Sep 2006 22:31:08 -0000	1.43
@@ -54,8 +54,8 @@
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.tool.qa.web.QaMonitoringAction; 
 
-
 /**
  * 
  * @author Ozgur Demirtas
@@ -204,7 +204,8 @@
         generalMonitoringDTO.setDeletedAttachmentList(new ArrayList());
         /** ...till here **/
 
-		
+        qaMonitoringAction.prepareReflectionData(request, qaContent, qaService, null, false);
+        
 		logger.debug("final qaMonitoringForm: " + qaMonitoringForm);
 		logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO );
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.39 -r1.40
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	4 Sep 2006 15:40:15 -0000	1.39
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	6 Sep 2006 22:31:08 -0000	1.40
@@ -368,6 +368,13 @@
 	        redirect="false"
 	     />
 	      
+
+        <forward
+          name="learnerNotebook"
+          path="/monitoring/LearnerNotebook.jsp"
+          redirect="false"
+        />
+
    	  	<forward
 		    name="errorList"
 		    path="/QaErrorBox.jsp"
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/exportportfolio.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/web/export/exportportfolio.jsp	1 Sep 2006 09:39:54 -0000	1.10
+++ lams_tool_laqa/web/export/exportportfolio.jsp	6 Sep 2006 22:31:08 -0000	1.11
@@ -61,7 +61,7 @@
 		
 		
 		<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			<table width="80%" cellspacing="8" class="forms">
 			
 					<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
 			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
@@ -91,7 +91,7 @@
 			  	 									<tr>
 														 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
 														 <td NOWRAP valign=top>    <lams:Date value="${userData.attemptTime}"/>  </td>														 
-														 <td NOWRAP valign=top>   <c:out value="${userData.response}"/>  </td>
+														 <td NOWRAP valign=top>   <c:out value="${userData.responsePresentable}" escapeXml="false"/>  </td>
 													</tr>
 											</c:if>														  					 
 	 									</c:forEach>		  	
@@ -100,7 +100,52 @@
 							</td>  
 			  			</tr>
 					</c:forEach>		  	
+
+						<tr>			
+							<td valign=top align=left>
+								&nbsp
+							</td>
+						</tr>
+
+					
+						<tr>			
+							<td valign=top align=left>
+								<table align=center>
+								
+										<tr>			
+											<td colspan=3 valign=top align=center>
+												<b>  <bean:message key="label.reflection"/>  </b> 
+											 </td>
+										</tr>	
+								
+								
+									<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
+							  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
+							  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
+							  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
+							  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
+							  	 		<c:set var="entry" scope="request" value="${currentDto.entry}"/>
+										<tr>			
+											<td valign=top align=left>
+												  <b>  <bean:message key="label.user"/>:  </b>
+											 </td>
+
+											<td valign=top align=left>
+	 												  <c:out value="${userName}" escapeXml="false"/> 
+											 </td>
+
+											<td valign=top align=left>
+												 <c:out value="${entry}" escapeXml="false"/> 
+											 </td>
+										</tr>	
+									</c:forEach>		
+								</table>  	
+							 </td>
+						</tr>	
+
+					
 			</table>			
+			
 		</c:if>					
 
 		</div>  <!--closes content-->
Index: lams_tool_laqa/web/monitoring/LearnerNotebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerNotebook.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/monitoring/LearnerNotebook.jsp	6 Sep 2006 22:31:08 -0000	1.1
@@ -0,0 +1,97 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!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="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+	
+</head>
+
+<body>
+	<div id="page-learner">
+	
+	<h1 class="no-tabs-below">
+		<bean:message key="label.view.reflection"/>
+	</h1>
+	
+	
+	<div id="header-no-tabs-learner"></div>
+	
+	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+	
+		<div id="content-learner">
+		
+			<table>
+				<tr>
+					<td>
+						<h2>
+							<c:out value="${generalLearnerFlowDTO.userName}" escapeXml="false"/>
+						</h2>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<p><c:out value="${generalLearnerFlowDTO.notebookEntry}" escapeXml="false"/></p>
+					</td>
+				</tr>
+			</table>
+
+			<table cellpadding="0">
+				<tr>
+					<td>
+						<a href="javascript:window.close();" class="button">
+							<bean:message key="label.close"/></a>
+					</td>
+				</tr>
+			</table>
+
+		
+		</div>
+	</html:form>	
+	
+	<div id="footer-learner"></div>
+
+
+</div>
+</body>
+</html:html>
+
+
+
+
+
+
+
+
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	30 Aug 2006 16:51:35 -0000	1.25
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	6 Sep 2006 22:31:08 -0000	1.26
@@ -235,6 +235,48 @@
 			  			</tr>
 					</c:forEach>		  	
 
+
+						<tr>			
+							<td valign=top align=left>
+								<table align=center>
+								
+										<tr>			
+											<td colspan=2 valign=top align=left>
+												<b>  <bean:message key="label.reflection"/>  </b> 
+											 </td>
+										</tr>	
+								
+								
+									<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
+							  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
+							  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
+							  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
+							  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
+										<tr>			
+											<td valign=top align=left>
+												 <c:out value="${userName}" escapeXml="false"/> 
+											 </td>
+
+											<td valign=top align=left>
+												<c:url value="monitoring.do" var="openNotebook">
+													<c:param name="method" value="openNotebook" />
+													<c:param name="uid" value="${reflectionUid}" />
+													<c:param name="userId" value="${userId}" />
+													<c:param name="userName" value="${userName}" />
+													<c:param name="sessionId" value="${sessionId}" />													
+												</c:url>
+				
+												<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
+													<bean:message key="label.view" />
+												</html:link>
+
+											 </td>
+										</tr>	
+									</c:forEach>		
+								</table>  	
+							 </td>
+						</tr>	
+
 				</table>
 		</c:if>