Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -66,6 +66,8 @@
     public static final String SUBMIT_SUCCESS							="sbmtSuccess";
     public static final String QUESTION_INDEX							="questionIndex";
     public static final String REFLECTION_SUBJECT						="reflectionSubject";
+    public static final String REFLECTIONS_CONTAINER_DTO				="reflectionsContainerDTO";
+    public static final String LEARNER_NOTEBOOK							="learnerNotebook";
     
     /*
      * authoring mode controllers
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
===================================================================
diff -u -rb05b20cc6c000c499f72bc6dbe1ceec0d7a28ba0 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision b05b20cc6c000c499f72bc6dbe1ceec0d7a28ba0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -40,6 +40,8 @@
     
     protected String learnerMark;
     
+    protected String userName;
+    
     protected String learnerMarkAtLeast;
     
     protected String totalQuestionCount;
@@ -538,4 +540,18 @@
     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_lamc/src/java/org/lamsfoundation/lams/tool/mc/ReflectionDTO.java
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/ReflectionDTO.java	(revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/ReflectionDTO.java	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -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$$ */
+package org.lamsfoundation.lams.tool.mc;
+
+
+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_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
===================================================================
diff -u -r1d705f95c7d374192c678e101772e93f0442dae9 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	(.../ExportServlet.java)	(revision 1d705f95c7d374192c678e101772e93f0442dae9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	(.../ExportServlet.java)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -131,6 +131,7 @@
 	    request.getSession().setAttribute(PASSMARK,content.getPassMark().toString());
 	    
 	    request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner");
+	    mcMonitoringAction.prepareReflectionData(request, content, mcService, userID.toString(), true);
     	logger.debug("ending learner mode: ");
     }
 
@@ -370,6 +371,8 @@
 
 	    request.getSession().setAttribute(PASSMARK,content.getPassMark().toString());
 	    request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher");
+	    
+	    mcMonitoringAction.prepareReflectionData(request, content, mcService, null, true);
         logger.debug("ending teacher mode: ");
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -rb05b20cc6c000c499f72bc6dbe1ceec0d7a28ba0 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision b05b20cc6c000c499f72bc6dbe1ceec0d7a28ba0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -1671,7 +1671,10 @@
         
 	    McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO= new McGeneralLearnerFlowDTO();
 	    mcGeneralLearnerFlowDTO.setActivityTitle(mcContent.getTitle());
-	    mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
+	    String reflectionSubject=mcContent.getReflectionSubject();
+	    
+	    reflectionSubject=McUtils.replaceNewLines(reflectionSubject);
+	    mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
         
         request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("final mcGeneralLearnerFlowDTO: " + mcGeneralLearnerFlowDTO);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
diff -u -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -23,6 +23,9 @@
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -36,11 +39,16 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+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.mc.McAppConstants;
 import org.lamsfoundation.lams.tool.mc.McApplicationException;
+import org.lamsfoundation.lams.tool.mc.McGeneralLearnerFlowDTO;
 import org.lamsfoundation.lams.tool.mc.McUtils;
+import org.lamsfoundation.lams.tool.mc.ReflectionDTO;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
@@ -208,6 +216,7 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);
 		
+		prepareReflectionData(request, mcContent, mcService, null,false);
     	return (mapping.findForward(LOAD_MONITORING_CONTENT));	
 	}
     
@@ -279,6 +288,7 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);
 
+		prepareReflectionData(request, mcContent, mcService, null,false);
 	    return mcStarterAction.executeDefineLater(mapping, form, request, response, mcService);
 	}
 
@@ -348,6 +358,8 @@
 		logger.debug("setting passmark to: " + mcContent.getPassMark());
 		mcMonitoringForm.setPassmark(mcContent.getPassMark().toString());
 		
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
 		logger.debug("fwd ing to : " + LOAD_MONITORING_CONTENT);
 		return (mapping.findForward(LOAD_MONITORING_CONTENT));
 	}
@@ -407,6 +419,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);
 		
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
 		McStarterAction mcStarterAction= new McStarterAction();
  		return mcStarterAction.executeGetMonitoringTab(mapping, form, request, response);
 	}
@@ -464,6 +478,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
 	 	McStarterAction mcStarterAction= new McStarterAction();
 	 	return mcStarterAction.executeGetMonitoringTab(mapping, form, request, response);
 	}
@@ -522,6 +538,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);
 		
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
  		McStarterAction mcStarterAction= new McStarterAction();
 	 	return mcStarterAction.executeGetMonitoringTab(mapping, form, request, response);
 	}
@@ -576,6 +594,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.addNewQuestion(mapping, form, request, response);
 	}
@@ -629,6 +649,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
 	    McAction mcAction = new McAction();
     	return mcAction.removeQuestion(mapping, form, request, response);
 	}
@@ -683,6 +705,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.editOptions(mapping, form, request, response);
     }
@@ -737,6 +761,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.addOption(mapping, form, request, response);
     }
@@ -790,6 +816,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.removeOption(mapping, form, request, response);
     }
@@ -845,6 +873,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.moveQuestionDown(mapping, form, request, response);
     }
@@ -899,6 +929,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.moveQuestionUp(mapping, form, request, response);
     }
@@ -952,6 +984,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.doneOptions(mapping, form, request, response);
     }
@@ -1012,6 +1046,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 		
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.submitQuestions(mapping, form, request, response);
     }
@@ -1065,6 +1101,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.deleteOfflineFile(mapping, form, request, response);
     }
@@ -1119,6 +1157,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.deleteOnlineFile(mapping, form, request, response);
     }
@@ -1176,6 +1216,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.submitOfflineFiles(mapping, form, request, response);
     }
@@ -1231,8 +1273,10 @@
 		logger.debug("mcContent:" + mcContent);
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
-	    
-    	McAction mcAction = new McAction();
+		
+		prepareReflectionData(request, mcContent, mcService, null,false);
+    	
+		McAction mcAction = new McAction();
     	return mcAction.submitOnlineFiles(mapping, form, request, response);
     }
 
@@ -1285,6 +1329,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.doneAdvancedTab(mapping, form, request, response);
     }
@@ -1339,6 +1385,8 @@
 		
 		MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);		
 	    
+		prepareReflectionData(request, mcContent, mcService, null,false);
+		
     	McAction mcAction = new McAction();
     	return mcAction.doneInstructionsTab(mapping, form, request, response);
     }
@@ -1370,6 +1418,136 @@
     	return null;
     }
     
+	public void prepareReflectionData(HttpServletRequest request, McContent mcContent, 
+	        IMcService mcService, String userID, boolean exportMode)
+	{
+	    logger.debug("starting prepareReflectionData: " + mcContent);
+	    logger.debug("exportMode: " + exportMode);
+	    List reflectionsContainerDTO= new LinkedList();
+	    
+	    if (userID == null)
+	    {
+	        logger.debug("all users mode");
+		    for (Iterator sessionIter = mcContent.getMcSessions().iterator(); sessionIter.hasNext();) 
+		    {
+		        McSession qaSession = (McSession) sessionIter.next();
+		        logger.debug("qaSession: " + qaSession);
+		       for (Iterator userIter = qaSession.getMcQueUsers().iterator(); userIter.hasNext();) 
+		       {
+					McQueUsr user = (McQueUsr) userIter.next();
+					logger.debug("user: " + user);
+
+					NotebookEntry notebookEntry = mcService.getEntry(qaSession.getMcSessionId(),
+							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.getMcSessionId().toString());
+					    reflectionDTO.setUserName(user.getUsername());
+					    reflectionDTO.setReflectionUid (notebookEntry.getUid().toString());
+					    String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry());
+					    reflectionDTO.setEntry(notebookEntryPresentable);
+					    reflectionsContainerDTO.add(reflectionDTO);
+					} 
+					
+		       }
+		   }
+	    }
+	    else
+	    {
+			logger.debug("single user mode");
+		    for (Iterator sessionIter = mcContent.getMcSessions().iterator(); sessionIter.hasNext();) 
+		    {
+		        McSession qaSession = (McSession) sessionIter.next();
+		        logger.debug("qaSession: " + qaSession);
+		       for (Iterator userIter = qaSession.getMcQueUsers().iterator(); userIter.hasNext();) 
+		       {
+					McQueUsr user = (McQueUsr) userIter.next();
+					logger.debug("user: " + user);
+					
+					if (user.getQueUsrId().toString().equals(userID))
+					{
+						NotebookEntry notebookEntry = mcService.getEntry(qaSession.getMcSessionId(),
+								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.getMcSessionId().toString());
+						    reflectionDTO.setUserName(user.getUsername());
+						    reflectionDTO.setReflectionUid (notebookEntry.getUid().toString());
+						    String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry());
+						    reflectionDTO.setEntry(notebookEntryPresentable);
+						    reflectionsContainerDTO.add(reflectionDTO);
+						} 
+					    
+					}
+		       }
+		   }	        
+	        
+	    }
+	    
+	    
+	   logger.debug("reflectionsContainerDTO: " + reflectionsContainerDTO);
+	   //request.setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+	   request.getSession().setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+	   
+	   if (exportMode)
+	   {
+	       request.getSession().setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+	   }
+	}
+
+
+	public ActionForward openNotebook(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException,
+            ServletException, ToolException
+    {
+        logger.debug("dispatching openNotebook...");
+    	IMcService qaService = McServiceProxy.getMcService(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);
+		
+        McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO= new McGeneralLearnerFlowDTO();
+		if (notebookEntry != null) {
+		    String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry());
+		    mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+		    mcGeneralLearnerFlowDTO.setUserName(userName);
+		}
+
+		logger.debug("mcGeneralLearnerFlowDTO: " + mcGeneralLearnerFlowDTO);
+		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
+		
+		return mapping.findForward(LEARNER_NOTEBOOK);
+	}
+
     
     /**
      * persists error messages to request scope
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
diff -u -r3a998c9b8c2ba60c293759d9bd20c2ca71edb68a -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision 3a998c9b8c2ba60c293759d9bd20c2ca71edb68a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -259,6 +259,9 @@
     	request.getSession().setAttribute(MAP_CORRECT_FEEDBACK, mapCorrectFeedback);
 
     	MonitoringUtil.setAttributeNoToolSessions(request, mcService, mcContent);
+    	
+    	McMonitoringAction mcMonitoringAction= new McMonitoringAction();
+		mcMonitoringAction.prepareReflectionData(request, mcContent, mcService, null, false);
 		
 	    return (mapping.findForward(LOAD_MONITORING_CONTENT));	
 	}
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -325,6 +325,7 @@
       		parameter="method"
       		unknown="false"
       		validate="false"> 
+      		
 	  	<forward
 		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
@@ -355,6 +356,13 @@
 	        path="/index.jsp"
 		    redirect="true"
 	     />
+	     
+        <forward
+          name="learnerNotebook"
+          path="/monitoring/LearnerNotebook.jsp"
+          redirect="false"
+        />
+	     
 
 	  	<forward
 		    name="errorList"
Index: lams_tool_lamc/web/export/exportportfolio.jsp
===================================================================
diff -u -r1d705f95c7d374192c678e101772e93f0442dae9 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 1d705f95c7d374192c678e101772e93f0442dae9)
+++ lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -267,6 +267,56 @@
 				  	 		</tr>
 						</table>					
 				</c:if>								 
+				
+				
+				<table width="100%" cellspacing="8">
+				
+						<tr>			
+							<td valign=top align=left>
+								&nbsp
+							</td>
+						</tr>
+				
+					<tr>			
+							<td valign=top align=left>
+								<table align=left>
+								
+										<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_lamc/web/learning/RedoQuestions.jsp
===================================================================
diff -u -r51cec6d26c1b76f99d5c1cdcff04da5b48731de5 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 51cec6d26c1b76f99d5c1cdcff04da5b48731de5)
+++ lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -18,6 +18,7 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
         "http://www.w3.org/TR/html4/strict.dtd">
 
@@ -41,13 +42,12 @@
 	<div id="page-learner">
 	
 	<h1 class="no-tabs-below">
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />		
 	</h1>
-
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
-
+	
+	
+	<div id="header-no-tabs-learner"></div>
+	
 		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 			<html:hidden property="toolContentID"/>						
 			<html:hidden property="toolSessionID"/>								
@@ -58,7 +58,8 @@
 			<html:hidden property="learnerProgress"/>										
 			<html:hidden property="learnerProgressUserId"/>										
 			<html:hidden property="questionListingMode"/>													
-		
+
+			<div id="content-learner">		
 				<table class="forms">
 					  <tr>
 					  	<th scope="col" valign=top colspan=2> 
@@ -117,12 +118,16 @@
 							</html:submit>	 				 		  					
 				  	 </td>
 				  </tr>
+			 </table>
 
-</html:form>	
+			
+		 	</div>
 
-</div>
+	
+		</html:form>	
+	
+	<div id="footer-learner"></div>
 
-<div id="footer-learner"></div>
 
 </div>
 </body>
@@ -135,6 +140,4 @@
 
 
 
-
-	
 	
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(revision 0)
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -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="${mcGeneralLearnerFlowDTO.userName}" escapeXml="false"/>
+						</h2>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<p><c:out value="${mcGeneralLearnerFlowDTO   .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_lamc/web/monitoring/Summary.jsp
===================================================================
diff -u -r4b57e04114818b323e27712d02c38e3f04cfd357 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/web/monitoring/Summary.jsp	(.../Summary.jsp)	(revision 4b57e04114818b323e27712d02c38e3f04cfd357)
+++ lams_tool_lamc/web/monitoring/Summary.jsp	(.../Summary.jsp)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -22,6 +22,7 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
@@ -128,6 +129,50 @@
 					<jsp:include page="/monitoring/SummaryIndividualSession.jsp" />
 				</c:if>						
 				
+			<table class="forms">
+					<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>						
 
 
Index: lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp
===================================================================
diff -u -r1d705f95c7d374192c678e101772e93f0442dae9 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp	(.../SummaryAllSessions.jsp)	(revision 1d705f95c7d374192c678e101772e93f0442dae9)
+++ lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp	(.../SummaryAllSessions.jsp)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -22,6 +22,7 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
Index: lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp
===================================================================
diff -u -r4b57e04114818b323e27712d02c38e3f04cfd357 -r638795e63a09fe10a694f8607e21ce2f81cb937b
--- lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp	(.../SummaryIndividualSession.jsp)	(revision 4b57e04114818b323e27712d02c38e3f04cfd357)
+++ lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp	(.../SummaryIndividualSession.jsp)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
@@ -22,6 +22,7 @@
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
@@ -109,5 +110,6 @@
 									</c:forEach>		
 					</c:forEach>		  	
 			</table>		  	 		
-
+			
+	
 	
\ No newline at end of file