Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc)
@@ -21,7 +21,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 	<html:hidden property="responseId"/>	 
+	<html:hidden property="sessionId"/>	 
 	
+	
 		<c:if test="${(qaGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
 			<c:if test="${notebookEntriesExist != 'true' }"> 			
 				<table class="forms">
@@ -51,7 +53,7 @@
 
 				<c:if test="${(generalLearnerFlowDTO.requestLearningReport != 'true')}"> 	
 						<tr> 
-							<td NOWRAP  valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
+							<td NOWRAP width="60" 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="${requestScope.summaryToolSessions}">
 										<c:forEach var="toolSessionId" items="${requestScope.summaryToolSessionsId}">
@@ -83,212 +85,18 @@
 						<tr>
 					</c:if>			
 
-					<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
-			  	 		<tr>
-			  	 			<td> &nbsp&nbsp&nbsp</td>
-			  	 		</tr>
-						<tr>			
-							<td valign=top align=left><b>  <bean:message key="label.question"/> : </b> 
-								<c:out value="${currentDto.question}" escapeXml="false"/>
-							 </td>
-						</tr>	
-						
-						<tr> 
-							<td valign=top>
-								<table align=center>
+			<c:if test="${currentMonitoredToolSession != 'All'}"> 							
+					<jsp:include page="/monitoring/IndividualSessionSummary.jsp" />					
+			</c:if> 	    	  
 
-		  							<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}"> 			
-													<c:if test="${qaGeneralMonitoringDTO.editResponse != 'true'}">	  	 									 			
-														<tr> 
-															 <td  valign=top>  <c:out value="${userData.userName}"/>   </td>  
-															 <td  valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
-															 
-															  <td align=right valign=top width="150"> 
-																<b> <bean:message key="label.edit"/> </b>
-																<a title="<bean:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">
-							                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
-																</a> 
-															  </td>
-
-		   													 <td align=right valign=top> 				 
-																<c:if test="${userData.visible == 'true' }"> 			
-												                            <html:submit property="hideResponse" 
-												                                         styleClass="linkbutton" 
-												                                         onclick="submitResponse(${responseUid}, 'hideResponse');">						                                             
-												                                <bean:message key="label.hide"/>
-												                            </html:submit>
-																</c:if> 													
-												
-																<c:if test="${userData.visible != 'true' }"> 			
-												                            <html:submit property="showResponse" 
-												                                         styleClass="linkbutton" 
-												                                         onclick="submitResponse(${responseUid}, 'showResponse');">						                                             
-												                                <bean:message key="label.show"/>
-												                            </html:submit>
-																</c:if> 						
-														 	</td>	  	 
-														</tr>	 
-														
-														<tr>
-															 <td colspan=4  valign=top>   
-																<c:if test="${userData.visible != 'true' }"> 			
-													                         <i><bean:message key="label.response.hidden"/> </i> 
-																</c:if> 								
-																 <c:out value="${userData.responsePresentable}" escapeXml="false"/> 
-															 </td>
-														</tr>
-													</c:if>
-													
-													
-
-													<c:if test="${qaGeneralMonitoringDTO.editResponse == 'true'}">	  	
-														<c:if test="${editableResponseId == responseUid}">	  	 									 			
-															<tr> 
-																 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
-																 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
-													
-																  <td align=right valign=top width="150">  
-																  	<b> <bean:message key="label.save"/> </b>
-
-																	<a title="<bean:message key='label.tooltip.tick'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','updateResponse');">
-								                                                <img src="<c:out value="${tool}"/>images/tick.gif" border="0">
-																	</a> 
-																  </td>	  	 																	
-													
-
-			   													 <td align=right valign=top> 				 
-																	<c:if test="${userData.visible == 'true' }"> 			
-													                            <html:submit property="hideResponse" 
-													                                         styleClass="linkbutton" 
-													                                         onclick="submitResponse(${responseUid}, 'hideResponse');">						                                             
-													                                <bean:message key="label.hide"/>
-													                            </html:submit>
-																	</c:if> 													
-													
-																	<c:if test="${userData.visible != 'true' }"> 			
-													                            <html:submit property="showResponse" 
-													                                         styleClass="linkbutton" 
-													                                         onclick="submitResponse(${responseUid}, 'showResponse');">						                                             
-													                                <bean:message key="label.show"/>
-													                            </html:submit>
-																	</c:if> 						
-															 	</td>	  	 
-															</tr>
-
-															<tr>
-																 <td colspan=4 valign=top>   
-																	<c:if test="${userData.visible != 'true' }"> 			
-														                         <i><bean:message key="label.response.hidden"/> </i> 
-																	</c:if> 								
-									 						 			<textarea name="updatedResponse" rows=6 cols=60><c:out value="${userData.response}" escapeXml="false"/></textarea>
-																 </td>
-															</tr>
-															
-														</c:if>													
-
-
-
-														<c:if test="${editableResponseId != responseUid}">	  	 									 			
-															<tr> 
-																 <td valign=top>  <c:out value="${userData.userName}"/>   </td>  
-																 <td valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>														 
-
-																  <td align=right valign=top width="150"> 
-																	 <b> <bean:message key="label.edit"/> </b>
-																	<a title="<bean:message key='label.tooltip.edit'/>" href="javascript:;" onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">
-								                                                <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
-																	</a> 
-																  </td>	  	 
-
-			   													 <td align=right valign=top> 				 
-																	<c:if test="${userData.visible == 'true' }"> 			
-													                            <html:submit property="hideResponse" 
-													                                         styleClass="linkbutton" 
-													                                         onclick="submitResponse(${responseUid}, 'hideResponse');">						                                             
-													                                <bean:message key="label.hide"/>
-													                            </html:submit>
-																	</c:if> 													
-													
-																	<c:if test="${userData.visible != 'true' }"> 			
-													                            <html:submit property="showResponse" 
-													                                         styleClass="linkbutton" 
-													                                         onclick="submitResponse(${responseUid}, 'showResponse');">						                                             
-													                                <bean:message key="label.show"/>
-													                            </html:submit>
-																	</c:if> 						
-															 	</td>	  	 
-															</tr>
-
-															<tr>
-																 <td colspan=4 valign=top>   
-																	<c:if test="${userData.visible != 'true' }"> 			
-														                         <i><bean:message key="label.response.hidden"/> </i> 
-																	</c:if> 								
-																	 <c:out value="${userData.responsePresentable}" escapeXml="false"/> 
-																 </td>
-															</tr>
-															
-														</c:if>					
-												</c:if>													
-													
-											</c:if>														  					 									  													  			
-
-	 									</c:forEach>		  	
-									</c:forEach>		  	
-								</table>
-							</td>  
-			  			</tr>
-					</c:forEach>		  	
-
-				</table>
+			<c:if test="${currentMonitoredToolSession == 'All'}"> 							
+					<jsp:include page="/monitoring/AllSessionsSummary.jsp" />								
+					
+					<jsp:include page="/monitoring/Reflections.jsp" />										
+			</c:if> 	    	  
+		
+			</table>  	
 		</c:if>						
 
 
-				<c:if test="${notebookEntriesExist == 'true' }"> 			
-					<table class="forms">
-						
-								<tr>			
-									<td colspan=2 valign=top align=left>
-										<b>  <bean:message key="label.reflection"/>  </b> 
-									 </td>
-								</tr>	
-						
-						
-							<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
-					  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
-					  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
-					  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
-					  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
-								<tr>			
-									<td valign=top align=left>
-										 <c:out value="${userName}" escapeXml="false"/> 
-									 </td>
-	
-									<td valign=top align=left>
-										<c:url value="monitoring.do" var="openNotebook">
-											<c:param name="dispatch" value="openNotebook" />
-											<c:param name="uid" value="${reflectionUid}" />
-											<c:param name="userId" value="${userId}" />
-											<c:param name="userName" value="${userName}" />
-											<c:param name="sessionId" value="${sessionId}" />													
-											<c:param name="contentFolderID" value="${QaMonitoringForm.contentFolderID}" />																								
-										</c:url>
-		
-										<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
-											<bean:message key="label.view" />
-										</html:link>
-	
-									 </td>
-								</tr>	
-							</c:forEach>		
-				</table>  	
-			</c:if>						
-
-
 	
\ No newline at end of file