Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -ra6b8145d81296213a6c9f9e7a23dee9a167eaff3 -r8522cd628329e0031e21b48f2750b1fd9b1842a6
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision a6b8145d81296213a6c9f9e7a23dee9a167eaff3)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
@@ -1,9 +1,9 @@
-<%--
+<%-- 
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 License Information: http://lamsfoundation.org/licensing/lams/2.0/
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as
+  it under the terms of the GNU General Public License version 2 as 
   published by the Free Software Foundation.
 
   This program is distributed in the hope that it will be useful,
@@ -13,128 +13,124 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
 
-		<c:if test="${sessionScope.userExceptionNoStudentActivity == 'true'}"> 	
-				<table class="forms" align="center">
+		<c:if test="${(mcGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
+			<c:if test="${notebookEntriesExist != 'true' }"> 			
+				<table align="center">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
-							<b> <bean:message key="error.noLearnerActivity"/> </b>
+							<b>  <bean:message key="error.noLearnerActivity"/> </b>
 						</td> 
 					<tr>
 				</table>
-		</c:if>						
+			</c:if>							
+		</c:if>			
 		
-		<c:if test="${sessionScope.userExceptionNoStudentActivity != 'true'}"> 	
+		<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}"> 	
+		
 			<html:hidden property="selectedToolSessionId"/>							
 			<input type="hidden" name="isToolSessionChanged"/>
 				<table class="forms">
 						<tr> 
-							<td NOWRAP  valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
-									<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
-									<c:forEach var="toolSessionName" items="${sessionScope.summaryToolSessions}">
-										<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessionsId}">
-											<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
+						<td NOWRAP  valign=top align=center>  <b> <bean:message key="label.selectGroup"/> </b>
+
+								<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
+								<c:forEach var="toolSessionName" items="${mcGeneralMonitoringDTO.summaryToolSessions}">
+									<c:forEach var="toolSessionId" items="${mcGeneralMonitoringDTO.summaryToolSessionsId}">
+										<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
+									
+											<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
 										
-												<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
-											
-													<c:set var="SELECTED_SESSION" scope="request" value=""/>
-													<c:if test="${sessionScope.selectionCase == 2}"> 			
-														<c:set var="currentMonitoredToolSession" scope="session" value="All"/>
-													</c:if>						
-													
-													<c:if test="${toolSessionId.value == sessionScope.currentMonitoredToolSession}"> 			
-															<c:set var="SELECTED_SESSION" scope="request" value="SELECTED"/>
-													</c:if>						
-													
-													<c:if test="${toolSessionId.value != 'All'}"> 		
-														<option value="<c:out value="${toolSessionId.value}"/>"  <c:out value="${requestScope.SELECTED_SESSION}"/>> <c:out value="${toolSessionName.value}"/>  </option>						
-													</c:if>						
-													
-													<c:if test="${toolSessionId.value == 'All'}"> 	
-														<option value="<c:out value="${toolSessionId.value}"/>"  <c:out value="${requestScope.SELECTED_SESSION}"/>>  All  </option>						
-													</c:if>						
-											</c:if>							
-										</c:forEach>		  	
+												<c:set var="SELECTED_SESSION" scope="request" value=""/>
+												<c:if test="${requestScope.selectionCase == 2}"> 			
+													<c:set var="currentMonitoredToolSession" scope="request" value="All"/>
+												</c:if>						
+												
+												<c:if test="${toolSessionId.value == mcGeneralMonitoringDTO.currentMonitoredToolSession}"> 			
+														<c:set var="SELECTED_SESSION" scope="request" value="SELECTED"/>
+												</c:if>						
+												
+												<c:if test="${toolSessionId.value != 'All'}"> 		
+													<option value="<c:out value="${toolSessionId.value}"/>"  <c:out value="${requestScope.SELECTED_SESSION}"/>> <c:out value="${toolSessionName.value}"/>  </option>						
+												</c:if>						
+												
+												<c:if test="${toolSessionId.value == 'All'}"> 	
+													<option value="<c:out value="${toolSessionId.value}"/>"  <c:out value="${requestScope.SELECTED_SESSION}"/>>  All  </option>						
+												</c:if>						
+										</c:if>							
 									</c:forEach>		  	
-									</select>
+								</c:forEach>		  	
+								</select>									
 							</td> 
 						<tr>					
-					
 
+
 					
-					<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
+		  	 		<c:set var="queIndex" scope="request" value="0"/>
+					<c:forEach var="currentDto" items="${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>  <bean:message key="label.question.col"/> </b>
-								<c:out value="${currentDto.question}"/>
+							<td NOWRAP valign=top align=left><b>  <bean:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
+								<c:out value="${currentDto.question}" escapeXml="false"/> &nbsp (<bean:message key="label.mark"/> <c:out value="${currentDto.mark}"/> )
 							 </td>
 						</tr>	
 						<tr>					
 							<td NOWRAP valign=top align=left>  <b> <bean:message key="label.mc.options.col"/>  </b> 
 								<table align=left>
-									<c:forEach var="answersData" items="${currentDto.candidateAnswers}">
+									<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
 										<tr>			
 											<td NOWRAP valign=top align=left>
-												&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-												<c:out value="${answersData}"/> 
+												&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+												<c:out value="${answersData.candidateAnswer}" escapeXml="false"/> 
+												
+												<c:if test="${answersData.correct == 'true'}"> 		
+													&nbsp (<bean:message key="label.correct"/>)
+												</c:if>																		
 											</td>	
 										</tr>
 									</c:forEach>		  	
 								</table>
 							</td>  
 						</tr>			
-						
-						<tr> 
-							<td NOWRAP class="formlabel" valign=top>
-								<table align=center>
-									<tr> 
-										 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  			</b> </td>  
-				  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/>  	</b></td>
-				  						 <td NOWRAP valign=top> <b>  <bean: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:if test="${currentQuestionId == userData.questionUid}"> 			
-			  	 									<c:if test="${sessionScope.currentMonitoredToolSession == 'All'}"> 			
-														<tr> 
-															 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
-									  						 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
-									  						 <td NOWRAP valign=top>   <c:out value="${userData.response}"/> </td>
-											  			</tr>		
-													</c:if>														  					 									  			
-													
-			  	 									<c:if test="${sessionScope.currentMonitoredToolSession != 'All'}"> 			
-			  	 										<c:if test="${sessionScope.currentMonitoredToolSession == userData.sessionId}"> 			
-															<tr>  
-																 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>  </td>  
-										  						 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
-										  						 <td NOWRAP valign=top>   <c:out value="${userData.response}"/>  </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> 
+		  	 				<bean:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
+		  	 			</td>
+		  	 		</tr>
 				</table>
-		</c:if>						
 
+			 <h2>    <bean:message key="label.studentMarks"/>  </h2>
 
-	
\ No newline at end of file
+
+				<c:if test="${mcGeneralMonitoringDTO.currentMonitoredToolSession =='All'}"> 						 
+					<jsp:include page="/monitoring/AllSessionsSummary.jsp" />
+					<jsp:include page="/monitoring/Reflections.jsp" />										
+				</c:if>						
+				<c:if test="${mcGeneralMonitoringDTO.currentMonitoredToolSession !='All'}"> 						 
+					<jsp:include page="/monitoring/IndividualSessionSummary.jsp" />
+				</c:if>						
+		</c:if>						
+		
+		
+			<c:if test="${noSessionsNotebookEntriesExist == 'true'}"> 							
+						<jsp:include page="/monitoring/Reflections.jsp" />
+			</c:if>						
+		
+		
+		
+		
+