Index: lams_tool_lamc/web/monitoring/Summary.jsp
===================================================================
diff -u -r8924c33e8d628e97e7e3668ada071f38b6372c02 -rae7f0d44518e7b49d09bd544cc12bf7bce242cb3
--- lams_tool_lamc/web/monitoring/Summary.jsp	(.../Summary.jsp)	(revision 8924c33e8d628e97e7e3668ada071f38b6372c02)
+++ lams_tool_lamc/web/monitoring/Summary.jsp	(.../Summary.jsp)	(revision ae7f0d44518e7b49d09bd544cc12bf7bce242cb3)
@@ -92,17 +92,18 @@
 						</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.col"/> </b>
+							<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"/> )
+								<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>					
@@ -115,7 +116,7 @@
 												<c:out value="${answersData.candidateAnswer}"/> 
 												
 												<c:if test="${answersData.correct == 'true'}"> 		
-													&nbsp ( <bean:message key="label.correct"/> )
+													&nbsp (<bean:message key="label.correct"/>)
 												</c:if>																		
 												</font>
 											</td>	
@@ -133,89 +134,88 @@
 		  	 			</td>
 		  	 		</tr>
 				</table>
-				
 
+			 <h2>    <bean:message key="label.studentMarks"/>  </h2>
+			 
+
 			<table width="80%" cellspacing="8" align="center" class="forms">
 		  	 		<tr>
-					  	<th scope="col" valign=top> 
-						    <bean:message key="label.studentMarks"/> 
-					  	</th>
-		  	 		</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="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
-			  	 		<tr>
-			  	 			<td> &nbsp&nbsp&nbsp</td>
-			  	 		</tr>
+					<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}"/>
 
-						<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.weight"/> 
-								<c:out value="${currentDto.weight}"/>  <bean:message key="label.percent"/> )
-							</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 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>		  	
-								</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.percent"/> )
-									</b>
-						</font> </td>
-					</tr>	
-		  	 		
-		  	 		
-		  	 		
+									<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>