Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java,v
diff -u -r1.5 -r1.6
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	14 Oct 2008 02:11:08 -0000	1.5
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	14 Oct 2008 04:14:07 -0000	1.6
@@ -34,18 +34,24 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiDTO;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiPageDTO;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiSessionDTO;
+import org.lamsfoundation.lams.tool.wiki.dto.WikiUserDTO;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
 import org.lamsfoundation.lams.tool.wiki.model.WikiSession;
+import org.lamsfoundation.lams.tool.wiki.model.WikiUser;
 import org.lamsfoundation.lams.tool.wiki.service.IWikiService;
 import org.lamsfoundation.lams.tool.wiki.service.WikiServiceProxy;
 import org.lamsfoundation.lams.tool.wiki.util.WikiConstants;
 import org.lamsfoundation.lams.tool.wiki.util.WikiException;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 public class ExportServlet extends AbstractExportPortfolioServlet {
@@ -148,6 +154,20 @@
 	request.getSession()
 		.setAttribute(WikiConstants.ATTR_MAIN_WIKI_PAGE, new WikiPageDTO(wikiSession.getMainPage()));
 
+	// Construct the user dto
+	UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	WikiUser wikiUser = wikiService.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()), toolSessionID);
+	WikiUserDTO wikiUserDTO = new WikiUserDTO(wikiUser);
+	if (wikiUser.isFinishedActivity()) {
+	    // get the notebook entry.
+	    NotebookEntry notebookEntry = wikiService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    WikiConstants.TOOL_SIGNATURE, wikiUser.getUserId().intValue());
+	    if (notebookEntry != null) {
+		wikiUserDTO.setNotebookEntry(notebookEntry.getEntry());
+	    }
+	}
+	request.getSession().setAttribute(WikiConstants.ATTR_USER_DTO, wikiUserDTO);
+
 	// Set the mode
 	request.getSession().setAttribute(WikiConstants.ATTR_MODE, ToolAccessMode.LEARNER);
 
@@ -174,14 +194,27 @@
 	// Set up the title
 	String wikiTitle = wiki.getMainPage().getTitle();
 	request.getSession().setAttribute(WikiConstants.ATTR_MAIN_PAGE_TITLE, wikiTitle);
-	
+
 	// Do the main monitoring page
 	writeResponseToFile(basePath + "/pages/export/exportPortfolioTeacher.jsp", directoryName, FILENAME, cookies);
 
 	// Do the wiki pages for each session
 	for (WikiSession wikiSession : wiki.getWikiSessions()) {
 	    // construct wiki session dto
 	    WikiSessionDTO sessionDTO = new WikiSessionDTO(wikiSession);
+	    
+	    for (WikiUserDTO wikiUserDTO : sessionDTO.getUserDTOs()) {
+		if (wikiUserDTO.isFinishedActivity()) {
+		    // get the notebook entry.
+		    NotebookEntry notebookEntry = wikiService.getEntry(sessionDTO.getSessionID(),
+			    CoreNotebookConstants.NOTEBOOK_TOOL, WikiConstants.TOOL_SIGNATURE, wikiUserDTO.getUserId()
+				    .intValue());
+		    if (notebookEntry != null) {
+			wikiUserDTO.setNotebookEntry(notebookEntry.getEntry());
+		    }
+		}
+		sessionDTO.getUserDTOs().add(wikiUserDTO);
+	    }
 	    request.getSession().setAttribute(WikiConstants.ATTR_SESSION_DTO, sessionDTO);
 
 	    // construct wiki pages dto
Index: lams_tool_wiki/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_wiki/web/pages/export/exportPortfolio.jsp	14 Oct 2008 02:11:08 -0000	1.2
+++ lams_tool_wiki/web/pages/export/exportPortfolio.jsp	14 Oct 2008 04:14:07 -0000	1.3
@@ -99,31 +99,48 @@
 		
 		
 			<!-- Reflections -->
-			<c:if test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity && mode=='teacher'}">
-				
-				<br />
-				<hr />
-				<br />
-				
-				<h4>
-					<fmt:message key="monitor.notebooks"></fmt:message>
-				</h4>
-				<br />
-				<table class="alternative-color">
-					<c:forEach var="user" items="${sessionDTO.userDTOs}">
-						<c:if test="${not empty user.notebookEntry}">
-						<tr>
-							<td>
-								${user.firstName} ${user.lastName}
-							</td>
-							<td> 
-								<lams:out escapeHtml="true" value="${user.notebookEntry}" />
-							</td>
-						</tr>
-						</c:if>
-					</c:forEach>
-				</table>
-			</c:if>
+			<c:choose>
+				<c:when test="${mode=='teacher'}">
+					<c:if test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity}">
+						<br />
+						<hr />
+						<br />
+						
+						<h4>
+							<fmt:message key="monitor.notebooks"></fmt:message>
+						</h4>
+						<table class="alternative-color">
+							<c:forEach var="user" items="${sessionDTO.userDTOs}">
+								<c:if test="${not empty user.notebookEntry}">
+								<tr>
+									<td>
+										${user.firstName} ${user.lastName}
+									</td>
+									<td> 
+										<lams:out escapeHtml="true" value="${user.notebookEntry}" />
+									</td>
+								</tr>
+								</c:if>
+							</c:forEach>
+						</table>
+					</c:if>
+				</c:when>
+				<c:otherwise>
+					<c:if test="${userDTO.notebookEntry != null && wikiDTO.reflectOnActivity}">
+						<br />
+						<hr />
+						<br />
+						
+						<h4>
+							${wikiDTO.reflectInstructions}
+						</h4>
+						<br />
+						
+							<lams:out escapeHtml="true" value="${userDTO.notebookEntry}" />	
+					</c:if>
+				</c:otherwise>
+			</c:choose>
+			
 		
 		</div>
 		<!--closes content-->