Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.34 -r1.35
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	17 Oct 2006 20:32:56 -0000	1.34
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	20 May 2008 01:59:40 -0000	1.35
@@ -51,11 +51,14 @@
 			<html:hidden property="selectedToolSessionId"/>							
 			<input type="hidden" name="isToolSessionChanged"/>
 				<table class="forms">
+				
+				<c:if test="${fn:length(requestScope.summaryToolSessions) > 2 }">
+					<%-- When grouping is not enabled, we have only 2 items in summaryToolSessions.  The main toolSession and 'All' --%>
 
-				<c:if test="${(generalLearnerFlowDTO.requestLearningReport != 'true')}"> 	
+					<c:if test="${(generalLearnerFlowDTO.requestLearningReport != 'true')}"> 	
 						<tr> 
 							<td NOWRAP width="60" valign=top align=center> <b> <fmt:message key="label.selectGroup"/> </b>
-									<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
+								<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
 									<c:forEach var="toolSessionName" items="${requestScope.summaryToolSessions}">
 										<c:forEach var="toolSessionId" items="${requestScope.summaryToolSessionsId}">
 											<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
@@ -81,10 +84,11 @@
 											</c:if>							
 										</c:forEach>		  	
 									</c:forEach>		  	
-									</select>
+								</select>
 							</td> 
 						<tr>
-					</c:if>			
+					</c:if>
+				</c:if>			
 
 			<c:if test="${currentMonitoredToolSession != 'All'}"> 							
 					<jsp:include page="/monitoring/IndividualSessionSummary.jsp" />					
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	23 Nov 2006 07:07:25 -0000	1.16
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	20 May 2008 01:53:43 -0000	1.17
@@ -28,96 +28,96 @@
 
 
 				<table class="forms">
-				
-						<c:if test="${statsTabActive != 'true'}"> 							
-							<tr> 
-								<td colspan=2 align=center>
 
-						 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
-										<table>			
-											<tr> 
-												<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
-														<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
-														<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
-															<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
-																<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
-															
-																	<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
+						<c:if test="${fn:length(voteGeneralMonitoringDTO.summaryToolSessions) > 2 }">
+							<%-- When grouping is not enabled, we have only 2 items in summaryToolSessions.  The main toolSession and 'All' --%>
+							
+							<c:if test="${statsTabActive != 'true'}"> 							
+								<tr> 
+									<td colspan=2 align=center>
+	
+							 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
+											<table>			
+												<tr> 
+													<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
+															<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
+															<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
+																<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
+																	<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
 																
-																		<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 == requestScope.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:if test="${toolSessionName.key == toolSessionId.key}"> 			
+																	
+																			<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 == requestScope.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:forEach>		  	
-														</c:forEach>		  	
-														</select>
-													</td> 
-												<tr>
-											</table>
-									</c:if>		
-								</td> 
-							</tr>
-						</c:if> 
+															</select>
+														</td> 
+													<tr>
+												</table>
+										</c:if>		
+									</td> 
+								</tr>
+							</c:if>
+						 
 						
-						<c:if test="${statsTabActive == 'true'}"> 							
-							<tr> 
-								<td colspan=2 align=center>
-						 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
-										<table>			
-											<tr> 
-												<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
-														<select name="monitoredToolSessionIdStats" onchange="javascript:submitSession(this.value,'submitSession');">
-														<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
-															<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
-																<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
-															
-																	<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
+							<c:if test="${statsTabActive == 'true'}"> 							
+								<tr> 
+									<td colspan=2 align=center>
+							 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
+											<table>			
+												<tr> 
+													<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
+															<select name="monitoredToolSessionIdStats" onchange="javascript:submitSession(this.value,'submitSession');">
+															<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
+																<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
+																	<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
 																
-																		<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 == requestScope.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:if test="${toolSessionName.key == toolSessionId.key}"> 			
+																	
+																			<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 == requestScope.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:forEach>		  	
-														</c:forEach>		  	
-														</select>
-													</td> 
-												<tr>
-											</table>
-									</c:if>		
-								</td> 
-							</tr>
+															</select>
+														</td> 
+													<tr>
+												</table>
+										</c:if>		
+									</td> 
+								</tr>
+							</c:if>
 						</c:if> 
-
-
-						<tr>
-					 		<td NOWRAP colspan=2 > </td>
-						</tr>
 						
 						<c:forEach var="currentDto" items="${voteGeneralMonitoringDTO.listVoteAllSessionsDTO}">
 						
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	23 Nov 2006 07:07:25 -0000	1.17
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	20 May 2008 01:53:43 -0000	1.18
@@ -26,104 +26,101 @@
 
 
 				<table class="forms">
-
-						<c:if test="${statsTabActive != 'true'}"> 							
-							<tr> 
-								<td colspan=2 align=center>
-
-						 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
-										<table>			
-											<tr> 
-												<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
-														<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
-														<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
-															<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
-																<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
-															
-																	<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
+						
+						<c:if test="${fn:length(voteGeneralMonitoringDTO.summaryToolSessions) > 2 }">
+							<%-- When grouping is not enabled, we have only 2 items in summaryToolSessions.  The main toolSession and 'All' --%>
+							
+							<c:if test="${statsTabActive != 'true'}"> 							
+								<tr> 
+									<td colspan=2 align=center>
+	
+							 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
+											<table>			
+												<tr> 
+													<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
+															<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
+															<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
+																<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
+																	<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
 																
-																		<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 == requestScope.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:if test="${toolSessionName.key == toolSessionId.key}"> 			
+																	
+																			<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 == requestScope.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:forEach>		  	
-														</c:forEach>		  	
-														</select>
-													</td> 
-												<tr>
-											</table>
-									</c:if>		
-	
-								</td> 
-							</tr>
-						</c:if> 
+															</select>
+														</td> 
+													<tr>
+												</table>
+										</c:if>		
+		
+									</td> 
+								</tr>
+							</c:if>
 						
-						<c:if test="${statsTabActive == 'true'}"> 							
-							<tr> 
-								<td colspan=2 align=center>
-						 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
-										<table>			
-											<tr> 
-												<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
-														<select name="monitoredToolSessionIdStats" onchange="javascript:submitSession(this.value,'submitSession');">
-														<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
-															<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
-																<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
-															
-																	<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
+							<c:if test="${statsTabActive == 'true'}"> 							
+								<tr> 
+									<td colspan=2 align=center>
+							 			<c:if test="${(voteGeneralMonitoringDTO.requestLearningReport != 'true')}"> 	
+											<table>			
+												<tr> 
+													<td align=center valign=top> <b> <fmt:message key="label.group"/> </b>
+															<select name="monitoredToolSessionIdStats" onchange="javascript:submitSession(this.value,'submitSession');">
+															<c:forEach var="toolSessionName" items="${voteGeneralMonitoringDTO.summaryToolSessions}">
+																<c:forEach var="toolSessionId" items="${voteGeneralMonitoringDTO.summaryToolSessionsId}">
+																	<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
 																
-																		<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 == requestScope.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:if test="${toolSessionName.key == toolSessionId.key}"> 			
+																	
+																			<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 == requestScope.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:forEach>		  	
-														</c:forEach>		  	
-														</select>
-													</td> 
-												<tr>
-											</table>
-									</c:if>		
-								</td> 
-							</tr>
+															</select>
+														</td> 
+													<tr>
+												</table>
+										</c:if>		
+									</td> 
+								</tr>
+							</c:if> 
 						</c:if> 
 
-				
-
 						<tr>
-					 		<td NOWRAP colspan=2 > </td>
-						</tr>
-
-						<tr>
 					 		<td NOWRAP colspan=2 > <b>  <fmt:message key="label.groupName"/> </b><c:out value="${voteGeneralMonitoringDTO.groupName}"/>  </td>
 						</tr>
 
-
 	  					<tr>
 					 		<td NOWRAP> <b>  <fmt:message key="label.total.students"/> </b> </td>
 					 		<td>  <c:out value="${voteGeneralMonitoringDTO.sessionUserCount}"/> </td>