Index: lams_tool_lamc/web/monitoring/Stats.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Stats.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_lamc/web/monitoring/Stats.jsp	17 Oct 2006 20:35:24 -0000	1.21
+++ lams_tool_lamc/web/monitoring/Stats.jsp	17 Aug 2007 03:54:30 -0000	1.22
@@ -30,7 +30,7 @@
 				  				<b> <fmt:message key="count.total.user" /> </b>
 				  			</td>
 							<td NOWRAP valign=top>
-							  	  <c:out value="${mcStatsDTO.countAllUsers}"/>
+							  	  <c:out value="${mcGeneralMonitoringDTO.countAllUsers}"/>
 							</td> 
 						</tr>
 						
@@ -39,7 +39,7 @@
 				  				<b>  <fmt:message key="count.finished.session" /> </b>
 				  			</td>
 							<td NOWRAP valign=top>
-							  	 <c:out value="${mcStatsDTO.countSessionComplete}"/>
+							  	 <c:out value="${mcGeneralMonitoringDTO.countSessionComplete}"/>
 							</td> 
 						</tr>
 		</table>
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	22 Nov 2006 06:30:08 -0000	1.22
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	17 Aug 2007 03:54:30 -0000	1.23
@@ -42,30 +42,19 @@
 						<td NOWRAP  valign=top align=center>  <b> <fmt: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: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>		  	
+								<c:forEach var="toolSessionEntry" items="${mcGeneralMonitoringDTO.summaryToolSessions}">
+										<c:set var="SELECTED_SESSION" scope="request" value=""/>
+										<c:if test="${toolSessionEntry.key == mcGeneralMonitoringDTO.currentMonitoredToolSession}"> 			
+												<c:set var="SELECTED_SESSION" scope="request" value="SELECTED"/>
+										</c:if>						
+										<c:choose>										
+										<c:when test="${toolSessionId.value == 'All'}"> 	
+											<option value="<c:out value="${toolSessionEntry.key}"/>"  <c:out value="${requestScope.SELECTED_SESSION}"/>>All</option>						
+										</c:when>		
+										<c:otherwise> 		
+											<option value="<c:out value="${toolSessionEntry.key}"/>"  <c:out value="${requestScope.SELECTED_SESSION}"/>><c:out value="${toolSessionEntry.value}"/></option>						
+										</c:otherwise>						
+										</c:choose>				
 								</c:forEach>		  	
 								</select>									
 							</td>