Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java
===================================================================
diff -u -rf355a4d46b5ab02602de9fdb7513321197503bad -r4253bb20fe05c0f8dd22c9e5055279b75a7d5d79
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java	(.../QaExportPortfolioStarterAction.java)	(revision f355a4d46b5ab02602de9fdb7513321197503bad)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java	(.../QaExportPortfolioStarterAction.java)	(revision 4253bb20fe05c0f8dd22c9e5055279b75a7d5d79)
@@ -11,10 +11,15 @@
  * <lams base path>/<tool's export portfolio url>&mode=learner&toolSessionId=231&userId=<learners user id>
 */
 
+/**
+	Most of the code base for the export portfolio are re-used functionality from monitoring action and jsps.
+	We make use of TARGET_MODE_LEARNING and TARGET_MODE_MONITORING  since these are the flags in the monitoring codebase 
+	to differentiate between learner and teacher modes.
+*/
 
+
 package org.lamsfoundation.lams.tool.qa.web;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -207,11 +212,16 @@
 		toolSessionId=(Long)request.getSession().getAttribute(TOOL_SESSION_ID);
 		logger.debug("toolSessionId: " + toolSessionId);
 
+		/**
+			whether the request is of mode learner or teacher, we construct a single listToolSessions object and 
+			build the report based on that object.
+		*/
 		List listToolSessions=null;
 		if (mode.equalsIgnoreCase(LEARNER))
 		{
 			logger.debug("generate portfolio for mode: " + mode);
 			request.getSession().setAttribute(TARGET_MODE, TARGET_MODE_LEARNING);
+			/** a single toolSessionId */
 			listToolSessions.add(1, toolSessionId);
 			logger.debug("listToolSessions: " + listToolSessions);
 		}
@@ -250,7 +260,9 @@
 			toolSessionCounter++;
 		}
 		
+		/** the flag to differentiate between request for monitoring versus request for portfolio */
 		request.setAttribute(PORTFOLIO_REQUEST, new Boolean(true));
+		logger.debug("generate portfolio jsp for mode: " + mode);
 		return (mapping.findForward(PORTFOLIO_REPORT));		
 	}
 		
Index: lams_tool_laqa/web/exportPortfolioIndex.jsp
===================================================================
diff -u -rcae190bef6a3e4f857bdfaff17eb3a0ae680cb72 -r4253bb20fe05c0f8dd22c9e5055279b75a7d5d79
--- lams_tool_laqa/web/exportPortfolioIndex.jsp	(.../exportPortfolioIndex.jsp)	(revision cae190bef6a3e4f857bdfaff17eb3a0ae680cb72)
+++ lams_tool_laqa/web/exportPortfolioIndex.jsp	(.../exportPortfolioIndex.jsp)	(revision 4253bb20fe05c0f8dd22c9e5055279b75a7d5d79)
@@ -4,3 +4,4 @@
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 
+<h1> can be handy at some stage for testing </h1>
\ No newline at end of file
Index: lams_tool_laqa/web/groupsReport.jsp
===================================================================
diff -u -rf355a4d46b5ab02602de9fdb7513321197503bad -r4253bb20fe05c0f8dd22c9e5055279b75a7d5d79
--- lams_tool_laqa/web/groupsReport.jsp	(.../groupsReport.jsp)	(revision f355a4d46b5ab02602de9fdb7513321197503bad)
+++ lams_tool_laqa/web/groupsReport.jsp	(.../groupsReport.jsp)	(revision 4253bb20fe05c0f8dd22c9e5055279b75a7d5d79)
@@ -104,15 +104,13 @@
 																			  		<c:out value="${requestScope.answer}"/>
 																		</td>  
 																		<td>  
-																		  	&nbsp&nbsp&nbsp  
-															  				<html:submit property="editReport" styleClass="linkbutton"  
+																			<c:if test="${requestScope.portfolioRequest != 'true'}"> 			
+																			  	&nbsp&nbsp&nbsp  
+															  					<html:submit property="editReport" styleClass="linkbutton"  
 															  											onclick="selectResponse(${requestScope.responseId})">
-															  					
-																		<c:if test="${requestScope.portfolioRequest != 'true'}"> 			
-																				<fmt:message key="label.edit"/>
-																		</c:if>							  																					
-																				
-																			</html:submit>
+																					<fmt:message key="label.edit"/>
+																				</html:submit>
+																			</c:if>							  																					
 																		</td>  
 	
 																		<td>  
@@ -123,30 +121,30 @@
 																			</html:submit>
 																		</td>  
 																	</c:if>																
+	
 																	<c:if test="${requestScope.responseHidden == 'false'}"> 			
 																		<td>  
 																			  		&nbsp&nbsp&nbsp 
 																			  		<c:out value="${requestScope.answer}"/>
 																		</td>  
 																		<td>  
-																		  	&nbsp&nbsp&nbsp  
-															  				<html:submit property="editReport" styleClass="linkbutton"  
+																			<c:if test="${requestScope.portfolioRequest != 'true'}">																		
+																		  		&nbsp&nbsp&nbsp  
+															  					<html:submit property="editReport" styleClass="linkbutton"  
 															  											onclick="selectResponse(${requestScope.responseId})">
-																			<c:if test="${requestScope.portfolioRequest != 'true'}"> 																		  											
-																				<fmt:message key="label.edit"/>
+																					<fmt:message key="label.edit"/>
+																				</html:submit>
 																			</c:if>							  																																									
-																				
-																			</html:submit>
 																		</td>  
 	
 																	<td>  
-																	  	&nbsp&nbsp&nbsp  
-														  				<html:submit property="hideReport" styleClass="linkbutton"  
+														  				<c:if test="${requestScope.portfolioRequest != 'true'}">																	
+																		  	&nbsp&nbsp&nbsp  
+															  				<html:submit property="hideReport" styleClass="linkbutton"  
 														  											onclick="hideResponse(${requestScope.responseId})">
-														  				<c:if test="${requestScope.portfolioRequest != 'true'}">														  											
-																			<fmt:message key="label.hide"/>
+																				<fmt:message key="label.hide"/>
+																			</html:submit>																			
 																		</c:if>							  																																																												
-																		</html:submit>
 																	</td>  
 																	</c:if>																
 																</c:if>	
@@ -155,14 +153,16 @@
 																	<td>  
 																				&nbsp&nbsp&nbsp <fmt:message key="label.hidden"/> : <c:out value="${requestScope.answer}"/> 
 																	</td>  
+			
 																	<td>  
-																	  	&nbsp&nbsp&nbsp  
-														  				<html:submit property="editReport" styleClass="linkbutton"  
-														  											onclick="selectResponse(${requestScope.responseId})">
-														  				<c:if test="${requestScope.portfolioRequest != 'true'}"> 																		  											
-																			<fmt:message key="label.edit"/>
+														  				<c:if test="${requestScope.portfolioRequest != 'true'}"> 																		  																												
+																		  	&nbsp&nbsp&nbsp  
+															  				<html:submit property="editReport" styleClass="linkbutton"  
+															  											onclick="selectResponse(${requestScope.responseId})">
+																				<fmt:message key="label.edit"/>
+																			</html:submit>																			
 																		</c:if>																																			
-																		</html:submit>
+		
 																	</td>  
 																	<td>  
 																	  	&nbsp&nbsp&nbsp  
Index: lams_tool_laqa/web/portfolioReport.jsp
===================================================================
diff -u -rf355a4d46b5ab02602de9fdb7513321197503bad -r4253bb20fe05c0f8dd22c9e5055279b75a7d5d79
--- lams_tool_laqa/web/portfolioReport.jsp	(.../portfolioReport.jsp)	(revision f355a4d46b5ab02602de9fdb7513321197503bad)
+++ lams_tool_laqa/web/portfolioReport.jsp	(.../portfolioReport.jsp)	(revision 4253bb20fe05c0f8dd22c9e5055279b75a7d5d79)
@@ -11,6 +11,7 @@
 				requestScope.userExceptionNumberFormat 			== 'true' ||
 				requestScope.userExceptionToolSessionIdRequired	== 'true' ||
 				requestScope.userExceptionContentIdRequired		== 'true' ||
+				requestScope.userExceptionNoToolSessions		== 'true' ||
 				requestScope.userExceptionContentDoesNotExist	== 'true' }"> 	
 		<table align=center> <!-- Dave to take off-->
 			<tr> <td class="error">   
@@ -25,7 +26,8 @@
 				  requestScope.userExceptionNumberFormat 		!= 'true' &&
   				  requestScope.userExceptionToolSessionIdRequired != 'true' &&
 				  requestScope.userExceptionContentIdRequired	  != 'true' &&
-				  requestScope.userExceptionContentDoesNotExist != 'true' 
+				  requestScope.userExceptionNoToolSessions		  != 'true' &&				  
+				  requestScope.userExceptionContentDoesNotExist   != 'true' 
 				}"> 	
 		<table align=center> <!-- Dave to take off-->
 				<jsp:include page="groupsReport.jsp" />