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.4 -r1.5
--- lams_tool_lamc/web/monitoring/Summary.jsp	21 Jun 2006 00:55:28 -0000	1.4
+++ lams_tool_lamc/web/monitoring/Summary.jsp	24 Jun 2006 01:56:01 -0000	1.5
@@ -85,13 +85,9 @@
 					  	</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}"/>
@@ -136,87 +132,13 @@
 				</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>		  	
-			</table>		  	 		
+				<c:if test="${sessionScope.currentMonitoredToolSession =='All'}"> 						 
+					<jsp:include page="/monitoring/SummaryAllSessions.jsp" />
+				</c:if>						
+				<c:if test="${sessionScope.currentMonitoredToolSession !='All'}"> 						 
+					<jsp:include page="/monitoring/SummaryIndividualSession.jsp" />
+				</c:if>						
 				
 		</c:if>