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.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	23 Sep 2006 15:11:01 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	3 Dec 2006 14:58:03 -0000	1.11
@@ -171,6 +171,13 @@
         request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher");
         
         qaMonitoringAction.prepareReflectionData(request, content, qaService, null, true, "All");
+        
+        
+        request.setAttribute("currentMonitoredToolSession", "All");
+		MonitoringUtil.generateGroupsSessionData(request, qaService, content, true);
+        
+        
+        
         logger.debug("ending teacher mode: ");
     }
 }
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.38 -r1.39
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	23 Sep 2006 15:11:01 -0000	1.38
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	3 Dec 2006 14:58:02 -0000	1.39
@@ -751,14 +751,17 @@
 		request.setAttribute(QA_STATS_DTO, qaStatsDTO);
 	}
 	
-	public static void generateGroupsSessionData(HttpServletRequest request, IQaService qaService, QaContent qaContent)
+	public static void generateGroupsSessionData(HttpServletRequest request, IQaService qaService, QaContent qaContent, boolean forExport)
 	{
 	    logger.debug("generateGroupsSessionData: " + qaContent);
 	    
 	    List listAllGroupsDTO=buildGroupBasedSessionData(request, qaContent, qaService);
 		logger.debug("listAllGroupsDTO: " + listAllGroupsDTO);
 		
 	    request.setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO);
+
+	    if (forExport)
+	        request.getSession().setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO);
 	}
 
 	
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.55 -r1.56
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	16 Nov 2006 01:17:47 -0000	1.55
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	3 Dec 2006 14:58:02 -0000	1.56
@@ -258,7 +258,7 @@
     	logger.debug("ending  initStatsContent...");
     	
     	MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-    	MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+    	MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
     	
 	}
 
@@ -399,7 +399,7 @@
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
 
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
     	logger.debug("ending  initInstructionsContent...");
 	}
 
@@ -535,7 +535,7 @@
 
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
         
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, 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");
@@ -682,7 +682,7 @@
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
     	logger.debug("end  initSummaryContent...");
 	}
@@ -827,7 +827,7 @@
 		/* ... till here*/
 
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
         return (mapping.findForward(LOAD_MONITORING));
     }
@@ -944,7 +944,7 @@
 		/* ... till here*/
 
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
     	return (mapping.findForward(LOAD_MONITORING));	
 	}
@@ -1069,7 +1069,7 @@
 		/* ... till here*/
 
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 	    return (mapping.findForward(LOAD_MONITORING));	
 	}
@@ -1180,7 +1180,7 @@
 		/* ... till here*/
 
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		request.setAttribute("currentMonitoredToolSession", "All");
 		
 	    return (mapping.findForward(LOAD_MONITORING));	
@@ -1321,7 +1321,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 	    return (mapping.findForward(LOAD_MONITORING));	
 	}
@@ -1439,7 +1439,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		request.setAttribute("currentMonitoredToolSession", "All");
 		
 	    return (mapping.findForward(LOAD_MONITORING));	
@@ -1564,7 +1564,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
     	return (mapping.findForward(LOAD_MONITORING));	
 	}
@@ -1637,7 +1637,7 @@
 		
 		request.setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
 		
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
     }
     
@@ -1820,7 +1820,7 @@
 		request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO);
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 	}
 
 	
@@ -1909,7 +1909,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 	}
 	
 	
@@ -2022,7 +2022,7 @@
 
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 	    logger.debug("submitting session to refresh the data from the database: ");
 	    return (mapping.findForward(LOAD_MONITORING));
@@ -2134,7 +2134,7 @@
 
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		request.setAttribute("currentMonitoredToolSession", "All");
 		
 	    logger.debug("submitting session to refresh the data from the database: ");
@@ -2248,7 +2248,7 @@
 		}
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 	    logger.debug("submitting session to refresh the data from the database: ");
 	    return (mapping.findForward(LOAD_MONITORING));
@@ -2355,7 +2355,7 @@
 		}
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		request.setAttribute("currentMonitoredToolSession", "All");
 		
 	    logger.debug("submitting session to refresh the data from the database: ");
@@ -2466,7 +2466,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 		return mapping.findForward(LEARNER_NOTEBOOK);
 	}
@@ -2709,7 +2709,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 
         return mapping.findForward(LOAD_MONITORING);
     }
@@ -2975,7 +2975,7 @@
 		/* ... till here*/
 	
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
         return mapping.findForward(LOAD_MONITORING);
 	}
@@ -3173,7 +3173,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
         return mapping.findForward(LOAD_MONITORING);
     }
@@ -3299,7 +3299,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 		logger.debug("fwd ing to newQuestionBox: ");
         return (mapping.findForward("newQuestionBox"));
@@ -3467,7 +3467,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 		logger.debug("fwd ing to editQuestionBox: ");
         return (mapping.findForward("editQuestionBox"));
@@ -3663,7 +3663,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
 		
         return mapping.findForward(LOAD_MONITORING);
@@ -3832,7 +3832,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
         return mapping.findForward(LOAD_MONITORING);
 
@@ -3999,7 +3999,7 @@
 		/* ... till here*/
 		
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
 		
         return mapping.findForward(LOAD_MONITORING);
     }
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.50 -r1.51
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	23 Sep 2006 19:11:10 -0000	1.50
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	3 Dec 2006 14:58:02 -0000	1.51
@@ -254,7 +254,7 @@
 		MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent);
 		
 		request.setAttribute("currentMonitoredToolSession", "All");
-		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent);
+		MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent,false);
 		
 		logger.debug("fwding to : " + LOAD_MONITORING);
 		return (mapping.findForward(LOAD_MONITORING));	
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/exportportfolio.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/web/export/exportportfolio.jsp	3 Dec 2006 02:22:21 -0000	1.18
+++ lams_tool_laqa/web/export/exportportfolio.jsp	3 Dec 2006 14:58:01 -0000	1.19
@@ -58,45 +58,116 @@
 		
 		<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
 			<table width="80%" cellspacing="8" class="forms">
-			
-					<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+
+
+
+
+
+					<c:forEach var="groupDto" items="${listAllGroupsDTO}">
+			  	 		<c:set var="sessionId" scope="request" value="${groupDto.sessionId}"/>
+			  	 		<c:set var="sessionName" scope="request" value="${groupDto.sessionName}"/>
+			  	 		<c:set var="groupData" scope="request" value="${groupDto.groupData}"/>
+			  	 		
 			  	 		<tr>
-			  	 			<td> &nbsp&nbsp&nbsp</td>
+			  	 			<td> <b> <fmt:message key="group.label"/> : </b> <c:out value="${sessionName}"/> </td>
 			  	 		</tr>
+			  	 		
+									  	 		
+			  	 		
+			  	 		
+					<c:forEach var="currentDto" items="${groupData}">
+			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+
+			  	 		
 						<tr>			
-							<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question"/> : </b> 
+							<td valign=top class="align-left"><b>  <fmt:message key="label.question"/> : </b> 
 								<c:out value="${currentDto.question}" escapeXml="false"/>
 							 </td>
 						</tr>	
 						
 						<tr> 
-							<td NOWRAP valign=top>
+							<td valign=top>
 								<table align=center>
-									<tr> 
-										 <td NOWRAP valign=top> <b>  <fmt:message key="label.user"/>  </b> </td>  
-				  						 <td NOWRAP valign=top> <b>  <fmt:message key="label.learning.attemptTime"/> </b></td>
-				  						 <td NOWRAP valign=top> <b>  <fmt:message key="label.response"/>  	</b></td>
-						  			</tr>				 
+
 		  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 										<c:forEach var="sData" items="${questionAttemptData.value}">
 								  	 		<c:set var="userData" scope="request" value="${sData.value}"/>
 								  	 		<c:set var="responseUid" scope="request" value="${userData.uid}"/>
+								  	 		<c:set var="userSessionId" scope="request" value="${userData.sessionId}"/>
+								  	 		
+								  	 		
+	  	 									<c:if test="${sessionId == userSessionId}"> 											  	 		
+		  	 									<c:if test="${currentQuestionId == userData.questionUid}"> 			
 
-	  	 									<c:if test="${currentQuestionId == userData.questionUid}"> 			
-			  	 									<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.responsePresentable}" escapeXml="false"/>  </td>
-													</tr>
-											</c:if>														  					 
-	 									</c:forEach>		  	
+															<tr> 
+																 <td  valign=top>  <c:out value="${userData.userName}"/>   </td>  
+																 <td  valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
+															</tr>	 
+															
+															<tr>
+																 <td colspan=2  valign=top>   
+																	 <c:out value="${userData.responsePresentable}" escapeXml="false"/> 
+																 </td>
+															</tr>
+												</c:if>														  					 									  													  			
+											</c:if>														  					 									  													  														
+ 									</c:forEach>		
+	 									
+								  	 		<tr>
+								  	 			<td> &nbsp&nbsp&nbsp</td>
+								  	 		</tr>
+	 									  	
 									</c:forEach>		  	
 								</table>
 							</td>  
 			  			</tr>
 					</c:forEach>		  	
+				</c:forEach>		  	
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+			
+
 						<tr>			
 							<td valign=top class="align-left">
 								&nbsp