Index: lams_tool_lamc/web/monitoring/Summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/Summary.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/monitoring/Summary.jsp	16 Jun 2006 20:56:38 -0000	1.1
+++ lams_tool_lamc/web/monitoring/Summary.jsp	17 Jun 2006 22:42:19 -0000	1.2
@@ -86,6 +86,12 @@
 
 		  	 		</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:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
 			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
@@ -125,10 +131,96 @@
 
 		  	 		<tr>
 		  	 			<td NOWRAP valign=top align=left><font size=2> <b> 
-		  	 				<bean:message key="label.passingMark"/><c:out value="${passMark}"/> <bean:message key="label.percent"/> </b> </font>
+		  	 				<bean:message key="label.passingMark"/> </b> <c:out value="${passMark}"/> <bean:message key="label.percent"/>  </font>
 		  	 			</td>
 		  	 		</tr>
 				</table>
+				
+
+			<table width="80%" cellspacing="8" align="center" class="forms">
+		  	 		<tr>
+					  	<th scope="col" valign=top> 
+						    <bean:message key="label.studentMarks"/> 
+					  	</th>
+		  	 		</tr>
+		  	 		
+					<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
+			  	 		<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.col"/> </b>
+							<font size=2>
+								<c:out value="${currentDto.question}"/> &nbsp <bean:message key="label.openPar"/> <bean:message key="label.weight"/> 
+								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/><bean:message key="label.closePar"/>
+							</font> </td>
+						</tr>	
+
+						<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.candidateAnswers}">
+										<tr>			
+											<td NOWRAP valign=top align=left>
+												<font size=2>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+												<c:out value="${answersData}"/> </font>
+											</td>	
+										</tr>
+									</c:forEach>		  	
+								</table>
+							</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.mark.only"/> </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:if test="${currentQuestionId == userData.questionUid}"> 			
+			  	 									<c:if test="${sessionScope.currentMonitoredToolSession == 'All'}"> 			
+														<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.mark}"/> </font>  </td>  
+											  			</tr>		
+													</c:if>														  					 									  			
+													
+			  	 									<c:if test="${sessionScope.currentMonitoredToolSession != 'All'}"> 			
+			  	 										<c:if test="${sessionScope.currentMonitoredToolSession == userData.sessionId}"> 			
+															<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.mark}"/> </font>  </td>  
+												  			</tr>														
+														</c:if>														  					 									  													  			
+													</c:if>														  					 									  													  			
+												</c:if>														  					 
+		 									</c:forEach>		  	
+										</c:forEach>		  	
+								</table>
+							</td>  
+			  			</tr>
+						
+					</c:forEach>		  	
+
+					<tr>			
+						<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.total"/> 
+									<bean:message key="label.openPar"/> <bean:message key="label.percent"/> 
+									<bean:message key="label.closePar"/>
+									</b>
+						</font> </td>
+					</tr>	
+		  	 		
+		  	 		
+		  	 		
+			</table>		  	 		
+				
 		</c:if>