Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	2 May 2006 02:23:29 -0000	1.20
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	2 May 2006 04:07:37 -0000	1.21
@@ -175,7 +175,7 @@
 		<action path="/monitoring/listuser"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="listuser" >
-			<forward name="success" path="/pages/monitoring/listuser.jsp" />
+			<forward name="success" path="/pages/monitoring/userlist.jsp" />
 		</action>
 		<action path="/monitoring/hideitem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	2 May 2006 02:23:29 -0000	1.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	2 May 2006 04:07:37 -0000	1.7
@@ -78,6 +78,7 @@
 		int idx=0;
 		for(Object[] list : result){
 			Summary sum = new Summary();
+			idx=0;
 			sum.setSessionId((Long) list[idx++]);
 			sum.setSessionName((String) list[idx++]);
 			sum.setItemUid((Long) list[idx++]);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	2 May 2006 02:23:29 -0000	1.2
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	2 May 2006 04:07:37 -0000	1.3
@@ -75,6 +75,19 @@
 		Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 		IResourceService service = getResourceService();
 		service.setItemVisible(itemUid,false);
+		
+		//update session value
+		List<List> groupList = (List<List>) request.getSession().getAttribute(ResourceConstants.ATTR_SUMMARY_LIST);
+		if(groupList != null)
+			for(List<Summary> group : groupList){
+				for(Summary sum: group){
+					if(itemUid.equals(sum.getItemUid())){
+						sum.setItemHide(true);
+						break;
+					}
+				}
+			}
+
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
@@ -83,6 +96,18 @@
 		Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 		IResourceService service = getResourceService();
 		service.setItemVisible(itemUid,true);
+		
+		//update session value
+		List<List> groupList = (List<List>) request.getSession().getAttribute(ResourceConstants.ATTR_SUMMARY_LIST);
+		if(groupList != null)
+			for(List<Summary> group : groupList){
+				for(Summary sum: group){
+					if(itemUid.equals(sum.getItemUid())){
+						sum.setItemHide(false);
+						break;
+					}
+				}
+			}
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/statistic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	2 May 2006 02:23:29 -0000	1.2
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	2 May 2006 04:07:37 -0000	1.3
@@ -2,6 +2,7 @@
 
 <table border="0" cellspacing="3" width="98%">
 	<c:forEach var="group" items="${summaryList}">
+		<c:set var="groupSize" value="${fn:length(group)}"/>
 		<c:forEach var="item" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
@@ -28,7 +29,7 @@
 									<fmt:message key="monitoring.label.number.learners" />
 								</th>
 							</tr>
-							</c:if>
+				</c:if>
 							<tr>
 								<td>
 									<c:choose>
@@ -61,11 +62,11 @@
 									<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
 								</td>
 							</tr>
-							<c:if test="${status.index == 0}">
+				<c:if test="${status.count == groupSize}">
 						</table>
 					</td>
 				</tr>
-							</c:if>
+				</c:if>
 		</c:forEach>
 	</c:forEach>
 </table>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/summary.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	2 May 2006 02:23:29 -0000	1.2
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	2 May 2006 04:07:37 -0000	1.3
@@ -2,6 +2,7 @@
 
 <table border="0" cellspacing="3" width="98%">
 	<c:forEach var="group" items="${summaryList}">
+		<c:set var="groupSize" value="${fn:length(group)}"/>
 		<c:forEach var="item" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
@@ -31,7 +32,7 @@
 									<!--hide/show-->
 								</th>
 							</tr>
-							</c:if>
+				</c:if>
 							<tr>
 								<td>
 									<c:choose>
@@ -63,24 +64,24 @@
 									</c:set>
 									<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
 								</td>
-								<td>
+								<td align="center">
 									<c:if test="${!item.itemCreateByAuthor}">
 										<c:choose>
 											<c:when test="${item.itemHide}">
-												<a href="<c:url value='/monitoring/showitem.do'/>?itemUid=${item.itemUid}"> <fmt:message key="monitoring.label.show" /> </a>
+												<a href="<c:url value='/monitoring/showitem.do'/>?itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.show" /> </a>
 											</c:when>
 											<c:otherwise>
-												<a href="<c:url value='/monitoring/hideitem.do'/>?itemUid=${item.itemUid}"> <fmt:message key="monitoring.label.hide" /> </a>
+												<a href="<c:url value='/monitoring/hideitem.do'/>?itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
 											</c:otherwise>
 										</c:choose>
 									</c:if>
 								</td>
 							</tr>
-							<c:if test="${status.index == 0}">
+				<c:if test="${status.count == groupSize}">
 						</table>
 					</td>
 				</tr>
-							</c:if>
+				</c:if>
 		</c:forEach>
 	</c:forEach>
 </table>
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/userlist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	1 May 2006 06:30:50 -0000	1.1
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	2 May 2006 04:07:37 -0000	1.2
@@ -13,13 +13,13 @@
 				<fmt:message key="monitoring.label.user.name" />
 			</th>
 		</tr>
-		<c:forEach var="user" items="userList">
+		<c:forEach var="user" items="${userList}">
 			<tr>
 				<td>
 					${user.loginName}
 				</td>
 				<td>
-					${user.firstName},${user.secondName}
+					${user.firstName},${user.lastName}
 				</td>
 			</tr>
 		</c:forEach>