Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	7 Jan 2006 16:14:01 -0000	1.4
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	9 Jan 2006 15:39:32 -0000	1.5
@@ -8,53 +8,55 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 
-		<table class="forms" align=left>
-		<tr> 
-			<td NOWRAP class="formlabel" valign=top align=right> 
-					<select name="toolSessionId1" onchange="selectToolSession();">
-					<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessions}">
-							<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}"/>> Group <c:out value="${toolSessionId.key}"/>  </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:forEach>		  	
-					</select>
-			</td> 
-		<tr>
-
+		<html:hidden property="selectedToolSessionId"/>							
 		<input type="hidden" name="isToolSessionChanged"/>
-		<tr> <td> &nbsp&nbsp&nbsp </td> </tr>
-		<tr> <td> &nbsp&nbsp&nbsp </td> </tr>
-		
 		<tr> <td NOWRAP class="formlabel" valign=top align=left> 
 			<table align=left>
+				<tr> 
+					<td NOWRAP class="formlabel" valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
+							<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
+							<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessions}">
+									<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}"/>> Group <c:out value="${toolSessionId.key}"/>  </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:forEach>		  	
+							</select>
+					</td> 
+				<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> </td>
-						<td NOWRAP valign=top align=left> <font size=2> <c:out value="${currentDto.question}"/> </font> </td>
+						<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question.col"/> </b>
+							<c:out value="${currentDto.question}"/>
+						</font> </td>
 					</tr>	
 					<tr>					
-						<td NOWRAP valign=top align=left> <font size=2> <b> <bean:message key="label.mc.options.col"/> </b> </font></td>  
-						<td NOWRAP valign=top align=left>
+						<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> <c:out value="${answersData}"/> </font>
+											<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>		  	
@@ -75,15 +77,27 @@
 		  							<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}"> 			
-												<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.attemptTime}"/> </font> </td>
-							  						 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.timeZone}"/> </font> </td>
-							  						 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
-									  			</tr>		
-										</c:if>														  					 
+		  	 									<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.attemptTime}"/> </font> </td>
+								  						 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.timeZone}"/> </font> </td>
+								  						 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </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.attemptTime}"/> </font> </td>
+									  						 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.timeZone}"/> </font> </td>
+									  						 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
+											  			</tr>														
+													</c:if>														  					 									  													  			
+												</c:if>														  					 									  													  			
+											</c:if>														  					 
 	 									</c:forEach>		  	
 									</c:forEach>		  	
 							</table>
@@ -92,8 +106,6 @@
 					
 				</c:forEach>		  	
 			</table>
-		</td> </tr>
-	</table>
 
 	
 <SCRIPT language="JavaScript">