Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	15 Jun 2006 17:38:39 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	21 Jun 2006 01:44:54 -0000	1.5
@@ -116,6 +116,11 @@
         List listMonitoredAnswersContainerDTO=MonitoringUtil.buildSessionQuestionData(request, content, toolSessionID, userID);
 	    request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
 	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
+	    
+	    List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, content, mcService);
+	    request.getSession().setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
+	    logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO));
+
         
     	logger.debug("ending learner mode: ");
     }
@@ -150,6 +155,12 @@
         List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, content);
 	    request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
 	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
+	    
+	    
+	    List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, content, mcService);
+	    request.getSession().setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
+	    logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO));
+
         logger.debug("ending teacher mode: ");
     }
 
Index: lams_tool_lamc/web/export/ExportContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/Attic/ExportContent.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/export/ExportContent.jsp	15 Jun 2006 17:38:40 -0000	1.3
+++ lams_tool_lamc/web/export/ExportContent.jsp	21 Jun 2006 01:44:57 -0000	1.4
@@ -43,45 +43,161 @@
 		</c:if>			
 
 		<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
-			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+		
+			<table class="forms">
+				<c:if test="${(portfolioExportMode != 'learner')}">
+
+				<tr>
+			 		<td NOWRAP colspan=2>  &nbsp  </td>
+				</tr>
 			
+			
+			
+		  	 		<tr>
+					  	<th scope="col" valign=top> 
+						    <bean:message key="label.mcqSummary"/> 
+					  	</th>
+	
+		  	 		</tr>
+					
+					<c:if test="${sessionScope.currentMonitoredToolSession != 'All'}"> 			
+						<tr>
+					 		<td NOWRAP colspan=2 > <b> <font size=2> <bean:message key="label.groupName"/> </b><c:out value="${currentMonitoredToolSession}"/>  </td>
+						</tr>
+					</c:if>						
+					
+		  	 		<c:set var="queIndex" scope="request" value="0"/>
 					<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
+					<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
 			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
 			  	 		<tr>
 			  	 			<td> &nbsp&nbsp&nbsp</td>
 			  	 		</tr>
 						<tr>			
-							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question"/> : </font> </b> 
-								<c:out value="${currentDto.question}" escapeXml="false"/>
-							 </td>
+							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
+							<font size=2>
+								<c:out value="${currentDto.question}"/> &nbsp (<bean:message key="label.weight"/> 
+								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/>)
+							</font> </td>
 						</tr>	
-						
-						<tr> 
-							<td NOWRAP class="formlabel" valign=top>
-								<table align=center>
-									<tr> 
-										 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
-				  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
-				  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.response"/> </font> 	</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:if test="${currentQuestionId == userData.questionUid}"> 			
-	  	 										<tr>
-													 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-													 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
-													 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
-												</tr>
-											</c:if>														  					 
-	 									</c:forEach>		  	
+						<tr>					
+							<td NOWRAP valign=top align=left> <font size=2> <b> <bean:message key="label.mc.options.col"/> </font> </b> 
+								<table align=left>
+									<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
+										<tr>			
+											<td NOWRAP valign=top align=left>
+												<font size=2>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+												<c:out value="${answersData.candidateAnswer}"/> 
+												
+												<c:if test="${answersData.correct == 'true'}"> 		
+													&nbsp (<bean:message key="label.correct"/>)
+												</c:if>																		
+												</font>
+											</td>	
+										</tr>
 									</c:forEach>		  	
 								</table>
 							</td>  
-			  			</tr>
+						</tr>			
+	
 					</c:forEach>		  	
-			</table>			
+	
+		  	 		<tr>
+		  	 			<td NOWRAP valign=top align=left><font size=2> <b> 
+		  	 				<bean:message key="label.passingMark"/> </b> <c:out value="${passMark}"/> <bean:message key="label.percent"/>  </font>
+		  	 			</td>
+		  	 		</tr>
+				</table>
+	
+	
+				 <h2>    <bean:message key="label.studentMarks"/>  </h2>
+				 
+	
+				<table width="80%" cellspacing="8" align="center" class="forms">
+			  	 		<tr>
+							 <td NOWRAP valign=top align=left> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
+							 
+			  	 		<c:set var="queIndex" scope="request" value="0"/>
+						<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
+						<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+							<td NOWRAP valign=top align=left> <b> <font size=2> <bean:message key="label.question.only"/> <c:out value="${queIndex}"/></b>
+								 &nbsp (<bean:message key="label.weight"/> 
+								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/>)
+							</font> 
+							</td>
+						</c:forEach>		  	
+							 
+							 <td NOWRAP valign=top align=left> <b> <font size=2> <bean:message key="label.total"/> </font> </b> </td>  
+			  	 		</tr>						 
+			  	 		
+						<c:forEach var="sessionMarksDto" items="${sessionScope.listMonitoredMarksContainerDto}">
+				  	 		<c:set var="currentSessionId" scope="request" value="${sessionMarksDto.sessionId}"/>
+				  	 		<c:set var="mapUserMarksDto" scope="request" value="${sessionMarksDto.userMarks}"/>
+	
+	
+										<c:forEach var="markData" items="${mapUserMarksDto}">						
+							  	 		<c:set var="data" scope="request" value="${markData.value}"/>
+							  	 		<c:set var="currentUserSessionId" scope="request" value="${data.sessionId}"/>
+	
+										<c:if test="${sessionScope.currentMonitoredToolSession == 'All'}"> 			
+											<c:if test="${currentUserSessionId == currentSessionId}"> 	
+												<tr>									  	 		
+								  	 				<td NOWRAP valign=top align=left> <font size=2>
+															<c:out value="${data.userName}"/> 
+														</font>
+													</td>	
+				
+													<c:forEach var="mark" items="${data.marks}">
+														<td NOWRAP valign=top align=left> <font size=2>
+																<c:out value="${mark}"/> 								
+														</td>
+													</c:forEach>		  										
+				
+													<td NOWRAP valign=top align=left> <font size=2>
+																<c:out value="${data.totalMark}"/> 																
+														</font>
+													</td>							
+												</tr>													
+											</c:if>																
+										</c:if>																		
+										</c:forEach>		  	
+				
+	
+										<c:forEach var="markData" items="${mapUserMarksDto}">						
+							  	 		<c:set var="data" scope="request" value="${markData.value}"/>
+							  	 		<c:set var="currentUserSessionId" scope="request" value="${data.sessionId}"/>							  	 		
+										<c:if test="${sessionScope.currentMonitoredToolSession !='All'}"> 			
+											<c:if test="${sessionScope.currentMonitoredToolSession == currentUserSessionId}"> 										
+												<c:if test="${currentUserSessionId == currentSessionId}"> 									
+												<tr>			
+													<td NOWRAP valign=top align=left> <font size=2>
+															<c:out value="${data.userName}"/> 
+														</font>
+													</td>	
+				
+													<c:forEach var="mark" items="${data.marks}">
+														<td NOWRAP valign=top align=left> <font size=2>
+																<c:out value="${mark}"/> 								
+														</td>
+													</c:forEach>		  										
+				
+													<td NOWRAP valign=top align=left> <font size=2>
+																<c:out value="${data.totalMark}"/> 																
+														</font>
+													</td>							
+												</tr>														
+												</c:if>																
+											</c:if>																			
+										</c:if>																								
+										</c:forEach>		  	
+						</c:forEach>		  	
+				</c:if>										
+				
+				
+				<c:if test="${(portfolioExportMode == 'learner')}">
+					learner mode				
+				</c:if>										
+				
+			</table>		  	 		
 		</c:if>