Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -r9e2dc03fe28e3c80540446ea36654baeb862a888 -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision 9e2dc03fe28e3c80540446ea36654baeb862a888)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -13,6 +13,11 @@
 			<attribute name="javadoc_location" value="http://docs.oracle.com/cd/E17802_01/products/products/servlet/2.5/docs/servlet-2_5-mr2/"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jbossweb.sar/jbossweb.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jbossweb">
+		<attributes>
+			<attribute name="javadoc_location" value="http://www.jboss.org/file-access/default/members/jbossweb/freezone/docs/latest/api/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/conf/language/ApplicationResources_ar_JO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/conf/language/ApplicationResources_de_DE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/conf/language/ApplicationResources_mi_NZ.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/conf/language/ApplicationResources_pl_PL.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/conf/language/ApplicationResources_pt_BR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/conf/language/ApplicationResources_vi_VN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -red84afe5b317b35b156848df66a1a9332af0f4b1 -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision ed84afe5b317b35b156848df66a1a9332af0f4b1)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -170,6 +170,7 @@
 monitoring.label.time.taken  =Time taken
 output.desc.shared.items.output.definition.rsrc  =Share Resources: Uploaded URLs and paths to files
 label.submit  =Finish
+monitoring.label.actions  =Actions
+monitoring.label.views  =Views
 
-
 #======= End labels: Exported 164 labels for en AU =====
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -224,27 +224,20 @@
 			parameter="summary" >
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
+		<action path="/monitoring/getSubgridData"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
+			parameter="getSubgridData" >
+		</action>
 		<action path="/monitoring/listuser"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="listuser" >
 			<forward name="success" path="/pages/monitoring/userlist.jsp" />
 		</action>
-		<action path="/monitoring/hideitem"
+		<action path="/monitoring/changeItemVisibility"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
-			parameter="hideitem" >
-			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
+			parameter="changeItemVisibility" >
 		</action>
-		<action path="/monitoring/showitem"
-			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
-			parameter="showitem" >
-			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
-		</action>
 		
-		<action path="/monitoring/viewReflection"
-			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
-			parameter="viewReflection">
-			<forward name="success" path="/pages/monitoring/notebook.jsp" />
-		</action>
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.ClearSessionAction">
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -66,6 +66,8 @@
     public static final String PARAM_OPEN_URL_POPUP = "popupUrl";
 
     public static final String PARAM_TITLE = "title";
+    
+    public static final String PARAM_IS_HIDE_ITEM = "isHideItem";
 
     // for request attribute name
     public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java	(.../ResourceItemVisitDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java	(.../ResourceItemVisitDAO.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog;
 
 public interface ResourceItemVisitDAO extends DAO {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -23,18 +23,14 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.rsrc.dao.hibernate;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO;
-import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
-import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
-import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
 
 public class ResourceItemVisitDAOHibernate extends BaseDAOHibernate implements ResourceItemVisitDAO{
 	
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/GroupSummary.java
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/GroupSummary.java	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/GroupSummary.java	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -0,0 +1,63 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.rsrc.dto;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class GroupSummary {
+
+    private Long sessionId;
+    private String sessionName;
+    private List<ItemSummary> items;
+
+    public GroupSummary () {
+	items = new LinkedList<ItemSummary>();
+    }
+
+    public Long getSessionId() {
+	return sessionId;
+    }
+
+    public void setSessionId(Long sessionId) {
+	this.sessionId = sessionId;
+    }
+
+    public String getSessionName() {
+	return sessionName;
+    }
+
+    public void setSessionName(String sessionName) {
+	this.sessionName = sessionName;
+    }
+    
+    public List<ItemSummary> getItems() {
+	return items;
+    }
+
+    public void setItems(List<ItemSummary> items) {
+	this.items = items;
+    }
+}
+
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ItemSummary.java
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ItemSummary.java	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ItemSummary.java	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -0,0 +1,260 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.rsrc.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
+import org.lamsfoundation.lams.tool.rsrc.util.ResourceWebUtils;
+
+/**
+ * List contains following element: <br>
+ * 
+ * <li>session_id</li> <li>session_name</li> <li>ResourceItem.uid</li> <li>
+ * ResourceItem.item_type</li> <li>ResourceItem.create_by_author</li> <li>
+ * ResourceItem.is_hide</li> <li>ResourceItem.title</li> <li>User.login_name</li>
+ * <li>count(resource_item_uid)</li>
+ * 
+ * @author Steve.Ni
+ * 
+ * @version $Revision$
+ */
+public class ItemSummary {
+
+    private Long sessionId;
+    private String sessionName;
+    private Long itemUid;
+    private short itemType;
+    private boolean itemCreateByAuthor;
+    private boolean itemHide;
+    private String itemTitle;
+    private List<String> itemInstructions = new ArrayList<String>();
+    private String username;
+    private int viewNumber;
+
+    // following is used for export portfolio programs:
+    private String url;
+    private Long fileUuid;
+    private Long fileVersionId;
+    private String fileName;
+    private String attachmentLocalUrl;
+
+    // true: initial group item, false, belong to some group.
+    private boolean isInitGroup;
+
+    public ItemSummary() {
+    }
+
+    /**
+     * Contruction method for monitoring summary function.
+     * 
+     * <B>Don't not set isInitGroup and viewNumber fields</B>
+     * 
+     * @param sessionName
+     * @param item
+     * @param isInitGroup
+     */
+    public ItemSummary(ResourceItem item) {
+	this.sessionId = sessionId;
+	this.sessionName = sessionName;
+	if (item != null) {
+	    this.itemUid = item.getUid();
+	    this.itemType = item.getType();
+	    this.itemCreateByAuthor = item.isCreateByAuthor();
+	    this.itemHide = item.isHide();
+	    this.itemTitle = item.getTitle();
+	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
+	    this.url = ResourceWebUtils.protocol(item.getUrl());
+	    this.fileName = item.getFileName();
+	    this.fileUuid = item.getFileUuid();
+	    this.fileVersionId = item.getFileVersionId();
+	} else
+	    this.itemUid = new Long(-1);
+    }
+
+    /**
+     * Contruction method for export profolio function.
+     * 
+     * <B>Don't not set sessionId and viewNumber fields</B>
+     * 
+     * @param sessionName
+     * @param item
+     * @param isInitGroup
+     */
+    public ItemSummary(Long sessionId, String sessionName, ResourceItem item, boolean isInitGroup) {
+	this.sessionId = sessionId;
+	this.sessionName = sessionName;
+	if (item != null) {
+	    this.itemUid = item.getUid();
+	    this.itemType = item.getType();
+	    this.itemCreateByAuthor = item.isCreateByAuthor();
+	    this.itemHide = item.isHide();
+	    this.itemTitle = item.getTitle();
+	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
+	    this.url = ResourceWebUtils.protocol(item.getUrl());
+	    this.fileName = item.getFileName();
+	    this.fileUuid = item.getFileUuid();
+	    this.fileVersionId = item.getFileVersionId();
+
+	    for (ResourceItemInstruction instruction : (Set<ResourceItemInstruction>) item.getItemInstructions()) {
+		itemInstructions.add(instruction.getDescription());
+	    }
+	} else
+	    this.itemUid = new Long(-1);
+	this.isInitGroup = isInitGroup;
+    }
+
+    public boolean isItemCreateByAuthor() {
+	return itemCreateByAuthor;
+    }
+
+    public void setItemCreateByAuthor(boolean itemCreateByAuthor) {
+	this.itemCreateByAuthor = itemCreateByAuthor;
+    }
+
+    public boolean isItemHide() {
+	return itemHide;
+    }
+
+    public void setItemHide(boolean itemHide) {
+	this.itemHide = itemHide;
+    }
+
+    public String getItemTitle() {
+	return itemTitle;
+    }
+
+    public void setItemTitle(String itemTitle) {
+	this.itemTitle = itemTitle;
+    }
+
+    public short getItemType() {
+	return itemType;
+    }
+
+    public void setItemType(short itemType) {
+	this.itemType = itemType;
+    }
+
+    public Long getItemUid() {
+	return itemUid;
+    }
+
+    public void setItemUid(Long itemUid) {
+	this.itemUid = itemUid;
+    }
+
+    public Long getSessionId() {
+	return sessionId;
+    }
+
+    public void setSessionId(Long sessionId) {
+	this.sessionId = sessionId;
+    }
+
+    public String getSessionName() {
+	return sessionName;
+    }
+
+    public void setSessionName(String sessionName) {
+	this.sessionName = sessionName;
+    }
+
+    public String getUsername() {
+	return username;
+    }
+
+    public void setUsername(String username) {
+	this.username = username;
+    }
+
+    public int getViewNumber() {
+	return viewNumber;
+    }
+
+    public void setViewNumber(int viewNumber) {
+	this.viewNumber = viewNumber;
+    }
+
+    public Long getFileUuid() {
+	return fileUuid;
+    }
+
+    public void setFileUuid(Long fileUuid) {
+	this.fileUuid = fileUuid;
+    }
+
+    public Long getFileVersionId() {
+	return fileVersionId;
+    }
+
+    public void setFileVersionId(Long fileVersionId) {
+	this.fileVersionId = fileVersionId;
+    }
+
+    public String getUrl() {
+	return url;
+    }
+
+    public void setUrl(String url) {
+	this.url = url;
+    }
+
+    public boolean isInitGroup() {
+	return isInitGroup;
+    }
+
+    public void setInitGroup(boolean isInitGroup) {
+	this.isInitGroup = isInitGroup;
+    }
+
+    public String getAttachmentLocalUrl() {
+	return attachmentLocalUrl;
+    }
+
+    public void setAttachmentLocalUrl(String attachmentLocalUrl) {
+	this.attachmentLocalUrl = attachmentLocalUrl;
+    }
+
+    public String getFileName() {
+	return fileName;
+    }
+
+    public void setFileName(String fileName) {
+	this.fileName = fileName;
+    }
+
+    public List<String> getItemInstructions() {
+	return itemInstructions;
+    }
+
+    public void setItemInstructions(List<String> itemInstructions) {
+	this.itemInstructions = itemInstructions;
+    }
+
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java
===================================================================
diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -3,65 +3,67 @@
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
 
 /**
- * 
  * @author Dapeng Ni
- *
  */
 public class ReflectDTO {
-	private Long userUid;
-	private String fullName;
-	private String loginName;
-	private boolean hasRefection;
-	private String reflectInstrctions;
-	private boolean finishReflection;
-	private String reflect;
-	
-	public ReflectDTO(ResourceUser user) {
-		this.setLoginName(user.getLoginName());
-		this.setFullName(user.getFirstName()+" "+user.getLastName());
-		this.setUserUid(user.getUid());
-	}
-	
-	public boolean isFinishReflection() {
-		return finishReflection;
-	}
-	public void setFinishReflection(boolean finishReflection) {
-		this.finishReflection = finishReflection;
-	}
-	public String getFullName() {
-		return fullName;
-	}
-	public void setFullName(String fullName) {
-		this.fullName = fullName;
-	}
-	public boolean isHasRefection() {
-		return hasRefection;
-	}
-	public void setHasRefection(boolean hasRefection) {
-		this.hasRefection = hasRefection;
-	}
-	public String getLoginName() {
-		return loginName;
-	}
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-	public String getReflect() {
-		return reflect;
-	}
-	public void setReflect(String reflect) {
-		this.reflect = reflect;
-	}
-	public String getReflectInstrctions() {
-		return reflectInstrctions;
-	}
-	public void setReflectInstrctions(String reflectInstrctions) {
-		this.reflectInstrctions = reflectInstrctions;
-	}
-	public Long getUserUid() {
-		return userUid;
-	}
-	public void setUserUid(Long userUid) {
-		this.userUid = userUid;
-	}
+    private Long userUid;
+    private String fullName;
+    private String loginName;
+    private String reflectInstrctions;
+    private boolean finishReflection;
+    private String reflect;
+
+    public ReflectDTO(ResourceUser user) {
+	this.setLoginName(user.getLoginName());
+	this.setFullName(user.getFirstName() + " " + user.getLastName());
+	this.setUserUid(user.getUid());
+    }
+
+    public boolean isFinishReflection() {
+	return finishReflection;
+    }
+
+    public void setFinishReflection(boolean finishReflection) {
+	this.finishReflection = finishReflection;
+    }
+
+    public String getFullName() {
+	return fullName;
+    }
+
+    public void setFullName(String fullName) {
+	this.fullName = fullName;
+    }
+
+    public String getLoginName() {
+	return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+	this.loginName = loginName;
+    }
+
+    public String getReflect() {
+	return reflect;
+    }
+
+    public void setReflect(String reflect) {
+	this.reflect = reflect;
+    }
+
+    public String getReflectInstrctions() {
+	return reflectInstrctions;
+    }
+
+    public void setReflectInstrctions(String reflectInstrctions) {
+	this.reflectInstrctions = reflectInstrctions;
+    }
+
+    public Long getUserUid() {
+	return userUid;
+    }
+
+    public void setUserUid(Long userUid) {
+	this.userUid = userUid;
+    }
 }
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision bb597b8155375e6ac4dfe280f630d323b6e5e575)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -32,8 +32,9 @@
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.tool.rsrc.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
+import org.lamsfoundation.lams.tool.rsrc.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
@@ -197,7 +198,7 @@
      * @param contentId
      * @return
      */
-    List<List<Summary>> getSummary(Long contentId);
+    List<GroupSummary> getSummary(Long contentId);
 
     List<ResourceUser> getUserListBySessionItem(Long sessionId, Long itemUid);
 
@@ -211,17 +212,17 @@
     void setItemVisible(Long itemUid, boolean visible);
 
     /**
-     * Get resource item <code>Summary</code> list according to sessionId and skipHide flag.
+     * Get resource item <code>ItemSummary</code> list according to sessionId and skipHide flag.
      * 
      * @param sessionId
      * @param skipHide
      *                true, don't get resource item if its <code>isHide</code> flag is true. Otherwise, get all
      *                resource item
      * @return
      */
-    List<Summary> exportBySessionId(Long sessionId, boolean skipHide);
+    List<ItemSummary> exportBySessionId(Long sessionId, boolean skipHide);
 
-    List<List<Summary>> exportByContentId(Long contentId);
+    List<List<ItemSummary>> exportByContentId(Long contentId);
 
     /**
      * Create refection entry into notebook tool.
@@ -252,12 +253,12 @@
     void updateEntry(NotebookEntry notebookEntry);
 
     /**
-     * Get Reflect DTO list grouped by sessionID.
+     * Get Reflect DTO list.
      * 
      * @param contentId
      * @return
      */
-    Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry);
+    List<ReflectDTO> getReflectList(Long contentId);
 
     /**
      * Get user by UID
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision bb597b8155375e6ac4dfe280f630d323b6e5e575)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -35,6 +35,7 @@
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -81,8 +82,9 @@
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceSessionDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceUserDAO;
+import org.lamsfoundation.lams.tool.rsrc.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
+import org.lamsfoundation.lams.tool.rsrc.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.rsrc.ims.IContentPackageConverter;
 import org.lamsfoundation.lams.tool.rsrc.ims.IMSManifestException;
 import org.lamsfoundation.lams.tool.rsrc.ims.ImscpApplicationException;
@@ -313,22 +315,22 @@
     }
 
     @Override
-    public List<Summary> exportBySessionId(Long sessionId, boolean skipHide) {
+    public List<ItemSummary> exportBySessionId(Long sessionId, boolean skipHide) {
 	ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId);
 	if (session == null) {
 	    ResourceServiceImpl.log.error("Failed get ResourceSession by ID [" + sessionId + "]");
 	    return null;
 	}
 	// initial resource items list
-	List<Summary> itemList = new ArrayList();
+	List<ItemSummary> itemList = new ArrayList();
 	Set<ResourceItem> resList = session.getResource().getResourceItems();
 	for (ResourceItem item : resList) {
 	    if (skipHide && item.isHide()) {
 		continue;
 	    }
 	    // if item is create by author
 	    if (item.isCreateByAuthor()) {
-		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item, false);
+		ItemSummary sum = new ItemSummary(session.getSessionId(), session.getSessionName(), item, false);
 		itemList.add(sum);
 	    }
 	}
@@ -342,7 +344,7 @@
 
 	    // to skip all item create by author
 	    if (!item.isCreateByAuthor()) {
-		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item, false);
+		ItemSummary sum = new ItemSummary(session.getSessionId(), session.getSessionName(), item, false);
 		itemList.add(sum);
 	    }
 	}
@@ -351,36 +353,36 @@
     }
 
     @Override
-    public List<List<Summary>> exportByContentId(Long contentId) {
+    public List<List<ItemSummary>> exportByContentId(Long contentId) {
 	Resource resource = resourceDao.getByContentId(contentId);
-	List<List<Summary>> groupList = new ArrayList();
+	List<List<ItemSummary>> groupList = new ArrayList();
 
 	// create init resource items list
-	List<Summary> initList = new ArrayList();
+	List<ItemSummary> initList = new ArrayList();
 	groupList.add(initList);
 	Set<ResourceItem> resList = resource.getResourceItems();
 	for (ResourceItem item : resList) {
 	    if (item.isCreateByAuthor()) {
-		Summary sum = new Summary(null, null, item, true);
+		ItemSummary sum = new ItemSummary(null, null, item, true);
 		initList.add(sum);
 	    }
 	}
 
 	// session by session
 	List<ResourceSession> sessionList = resourceSessionDao.getByContentId(contentId);
 	for (ResourceSession session : sessionList) {
-	    List<Summary> group = new ArrayList<Summary>();
+	    List<ItemSummary> group = new ArrayList<ItemSummary>();
 	    // get this session's all resource items
 	    Set<ResourceItem> sessList = session.getResourceItems();
 	    for (ResourceItem item : sessList) {
 		// to skip all item create by author
 		if (!item.isCreateByAuthor()) {
-		    Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item, false);
+		    ItemSummary sum = new ItemSummary(session.getSessionId(), session.getSessionName(), item, false);
 		    group.add(sum);
 		}
 	    }
 	    if (group.size() == 0) {
-		group.add(new Summary(session.getSessionId(), session.getSessionName(), null, false));
+		group.add(new ItemSummary(session.getSessionId(), session.getSessionName(), null, false));
 	    }
 	    groupList.add(group);
 	}
@@ -496,84 +498,78 @@
     }
 
     @Override
-    public List<List<Summary>> getSummary(Long contentId) {
-	List<List<Summary>> groupList = new ArrayList<List<Summary>>();
-	List<Summary> group = new ArrayList<Summary>();
+    public List<GroupSummary> getSummary(Long contentId) {
+	List<GroupSummary> groupList = new ArrayList<GroupSummary>();
 
 	// get all item which is accessed by user
 	Map<Long, Integer> visitCountMap = resourceItemVisitDao.getSummary(contentId);
 
 	Resource resource = resourceDao.getByContentId(contentId);
-	Set<ResourceItem> resItemList = resource.getResourceItems();
+	Set<ResourceItem> items = resource.getResourceItems();
 
 	// get all sessions in a resource and retrieve all resource items under this session
 	// plus initial resource items by author creating (resItemList)
 	List<ResourceSession> sessionList = resourceSessionDao.getByContentId(contentId);
 	for (ResourceSession session : sessionList) {
 	    // one new group for one session.
-	    group = new ArrayList<Summary>();
+	    GroupSummary group = new GroupSummary();
+	    group.setSessionId(session.getSessionId());
+	    group.setSessionName(session.getSessionName());
+	    
 	    // firstly, put all initial resource item into this group.
-	    for (ResourceItem item : resItemList) {
-		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item);
+	    for (ResourceItem item : items) {
+		ItemSummary itemSummary = new ItemSummary(item);
 		// set viewNumber according visit log
 		if (visitCountMap.containsKey(item.getUid())) {
-		    sum.setViewNumber(visitCountMap.get(item.getUid()).intValue());
+		    itemSummary.setViewNumber(visitCountMap.get(item.getUid()).intValue());
 		}
-		group.add(sum);
+		group.getItems().add(itemSummary);
 	    }
+	    
 	    // get this session's all resource items
 	    Set<ResourceItem> sessItemList = session.getResourceItems();
 	    for (ResourceItem item : sessItemList) {
 		// to skip all item create by author
 		if (!item.isCreateByAuthor()) {
-		    Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item);
+		    ItemSummary itemSummary = new ItemSummary(item);
 		    // set viewNumber according visit log
 		    if (visitCountMap.containsKey(item.getUid())) {
-			sum.setViewNumber(visitCountMap.get(item.getUid()).intValue());
+			itemSummary.setViewNumber(visitCountMap.get(item.getUid()).intValue());
 		    }
-		    group.add(sum);
+		    group.getItems().add(itemSummary);
 		}
 	    }
-	    // so far no any item available, so just put session name info to Summary
-	    if (group.size() == 0) {
-		group.add(new Summary(session.getSessionId(), session.getSessionName(), null));
-	    }
+	    
 	    groupList.add(group);
 	}
 
 	return groupList;
-
     }
 
     @Override
-    public Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry) {
-	Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();
+    public List<ReflectDTO> getReflectList(Long contentId) {
+	List<ReflectDTO> reflections = new LinkedList<ReflectDTO>();
 
 	List<ResourceSession> sessionList = resourceSessionDao.getByContentId(contentId);
 	for (ResourceSession session : sessionList) {
 	    Long sessionId = session.getSessionId();
-	    boolean hasRefection = session.getResource().isReflectOnActivity();
-	    Set<ReflectDTO> list = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
 	    // get all users in this session
 	    List<ResourceUser> users = resourceUserDao.getBySessionID(sessionId);
 	    for (ResourceUser user : users) {
-		ReflectDTO ref = new ReflectDTO(user);
 
-		if (setEntry) {
-		    NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
-			    ResourceConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-		    if (entry != null) {
-			ref.setReflect(entry.getEntry());
-		    }
+		NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+			ResourceConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+		if (entry != null) {
+		    ReflectDTO ref = new ReflectDTO(user);
+		    ref.setReflect(entry.getEntry());
+		    reflections.add(ref);
 		}
 
-		ref.setHasRefection(hasRefection);
-		list.add(ref);
 	    }
-	    map.put(sessionId, list);
+	    
 	}
 
-	return map;
+	return reflections;
     }
 
     @Override
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision bb597b8155375e6ac4dfe280f630d323b6e5e575)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -78,7 +78,6 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * 
  * @author Steve.Ni
  * 
  * @version $Revision$
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -25,9 +25,10 @@
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -38,15 +39,20 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
+import org.lamsfoundation.lams.tool.rsrc.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
+import org.lamsfoundation.lams.tool.rsrc.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -58,23 +64,22 @@
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+	    HttpServletResponse response) throws IOException, ServletException, JSONException {
 	String param = mapping.getParameter();
 
 	request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
 
 	if (param.equals("summary")) {
 	    return summary(mapping, form, request, response);
 	}
-
 	if (param.equals("listuser")) {
 	    return listuser(mapping, form, request, response);
 	}
-	if (param.equals("showitem")) {
-	    return showitem(mapping, form, request, response);
+	if (param.equals("changeItemVisibility")) {
+	    return changeItemVisibility(mapping, form, request, response);
 	}
-	if (param.equals("hideitem")) {
-	    return hideitem(mapping, form, request, response);
+	if (param.equals("getSubgridData")) {
+	    return getSubgridData(mapping, form, request, response);
 	}
 	if (param.equals("viewReflection")) {
 	    return viewReflection(mapping, form, request, response);
@@ -83,60 +88,6 @@
 	return mapping.findForward(ResourceConstants.ERROR);
     }
 
-    private ActionForward hideitem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
-	IResourceService service = getResourceService();
-	service.setItemVisible(itemUid, false);
-
-	// get back SessionMap
-	String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-
-	// update session value
-	List<List> groupList = (List<List>) sessionMap.get(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);
-    }
-
-    private ActionForward showitem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
-	IResourceService service = getResourceService();
-	service.setItemVisible(itemUid, true);
-
-	// get back SessionMap
-	String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-
-	// update session value
-	List<List> groupList = (List<List>) sessionMap.get(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);
-    }
-
     private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	// initial Session Map
@@ -149,18 +100,21 @@
 
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	IResourceService service = getResourceService();
-	List<List<Summary>> groupList = service.getSummary(contentId);
+	List<GroupSummary> groupList = service.getSummary(contentId);
 
 	Resource resource = service.getResourceByContentId(contentId);
+	
+	// Create reflectList if reflection is enabled.
+	if (resource.isReflectOnActivity()) {
+	    List<ReflectDTO> relectList = service.getReflectList(contentId);
+	    sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, relectList);
+	}
 
-	Map<Long, Set<ReflectDTO>> relectList = service.getReflectList(contentId, false);
-
 	// cache into sessionMap
 	sessionMap.put(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
 	sessionMap.put(ResourceConstants.PAGE_EDITABLE, resource.isContentInUse());
 	sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource);
 	sessionMap.put(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId);
-	sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, relectList);
 	sessionMap.put(ResourceConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
 	return mapping.findForward(ResourceConstants.SUCCESS);
     }
@@ -178,7 +132,56 @@
 	request.setAttribute(ResourceConstants.ATTR_USER_LIST, list);
 	return mapping.findForward(ResourceConstants.SUCCESS);
     }
+    
+    private ActionForward getSubgridData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
 
+	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.ATTR_RESOURCE_ITEM_UID);
+	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	IResourceService service = getResourceService();
+	List<ResourceUser> userList = service.getUserListBySessionItem(sessionId, itemUid);
+	
+	JSONArray rows = new JSONArray();
+	for (ResourceUser user : userList) {
+	    DateFormat sfm = new SimpleDateFormat("HH:mm:ss");
+	    
+	    JSONArray userData = new JSONArray();
+	    userData.put(user.getUserId());
+	    userData.put(user.getFirstName() + " " + user.getLastName());
+	    userData.put(user.getAccessDate());
+	    userData.put(user.getCompleteDate());
+	    Date timeTaken = DateUtil.convertToUTC(user.getTimeTaken());
+	    userData.put(sfm.format(timeTaken));
+	    
+	    JSONObject userRow = new JSONObject();
+	    userRow.put("id", user.getUserId());
+	    userRow.put("cell", userData);
+	    
+	    rows.put(userRow);
+	}
+
+	JSONObject responseJSON = new JSONObject();
+	responseJSON.put("total", 1);
+	responseJSON.put("page", 1);
+	responseJSON.put("records", rows.length());
+	responseJSON.put("rows", rows);
+	    
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().write(responseJSON.toString());
+	return null;
+    }
+
+    private ActionForward changeItemVisibility(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
+	boolean isHideItem = WebUtil.readBooleanParam(request, ResourceConstants.PARAM_IS_HIDE_ITEM);
+	IResourceService service = getResourceService();
+	service.setItemVisible(itemUid, !isHideItem);
+
+	return null;
+    }
+
     private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -28,6 +28,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -45,7 +46,7 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
+import org.lamsfoundation.lams.tool.rsrc.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
@@ -139,10 +140,10 @@
 		}
 		
 		
-		List<Summary> group = service.exportBySessionId(toolSessionID,true);
+		List<ItemSummary> group = service.exportBySessionId(toolSessionID,true);
 		saveFileToLocal(group, directoryName);
 		
-		List<List> groupList = new ArrayList<List>();
+		List<List<ItemSummary>> groupList = new ArrayList<List<ItemSummary>>();
 		if(group.size() > 0)
 			groupList.add(group);
 		
@@ -151,15 +152,14 @@
 		
 		// Create reflectList if reflection is enabled.
 		if (content.isReflectOnActivity()) {
+		    	List<ReflectDTO> reflectList = new LinkedList<ReflectDTO>();
+			
 			// Create reflectList, need to follow same structure used in teacher
 			// see service.getReflectList();
-			Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();  
-			Set<ReflectDTO> reflectDTOSet = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
-			reflectDTOSet.add(getReflectionEntry(learner));
-			map.put(toolSessionID, reflectDTOSet);
+			reflectList.add(getReflectionEntry(learner));
 			
 			// Add reflectList to sessionMap
-			sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, map);
+			sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, reflectList);
 		}
 		
 		sessionMap.put(ResourceConstants.ATTR_TITLE, content.getTitle());
@@ -184,9 +184,9 @@
 			logger.error(error);
 			throw new ResourceApplicationException(error);
 		}
-		List<List<Summary>> groupList = service.exportByContentId(toolContentID);
+		List<List<ItemSummary>> groupList = service.exportByContentId(toolContentID);
 		if(groupList != null) {
-			for (List<Summary> list : groupList) {
+			for (List<ItemSummary> list : groupList) {
 				saveFileToLocal(list, directoryName);
 			}
 		}
@@ -196,7 +196,7 @@
 		
 		// Create reflectList if reflection is enabled.
 		if (content.isReflectOnActivity()) {
-			Map<Long, Set<ReflectDTO>> reflectList = service.getReflectList(content.getContentId(), true);
+		    	List<ReflectDTO> reflectList = service.getReflectList(content.getContentId());
 			// Add reflectList to sessionMap
 			sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, reflectList);
 		}
@@ -207,19 +207,19 @@
 		sessionMap.put(ResourceConstants.ATTR_SUMMARY_LIST, groupList);
 	}
 
-    private void saveFileToLocal(List<Summary> list, String directoryName) {
+    private void saveFileToLocal(List<ItemSummary> list, String directoryName) {
     	handler = getToolContentHandler();
-		for (Summary summary : list) {
+		for (ItemSummary itemSummary : list) {
 			//for learning object, it just display "No offline package available" information.
-			if(summary.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT 
-				|| summary.getItemType() == ResourceConstants.RESOURCE_TYPE_URL
-				|| summary.getItemType() == 0){
+			if(itemSummary.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT 
+				|| itemSummary.getItemType() == ResourceConstants.RESOURCE_TYPE_URL
+				|| itemSummary.getItemType() == 0){
 			    continue;
 			}
 				
 			try{
 				int idx= 1;
-				String userName = summary.getUsername();
+				String userName = itemSummary.getUsername();
 				String localDir;
 				while(true){
 					localDir = FileUtil.getFullPath(directoryName,userName + "/" + idx);
@@ -230,8 +230,8 @@
 					}
 					idx++;
 				}
-				summary.setAttachmentLocalUrl(userName + "/" + idx + "/" + summary.getFileUuid() + '.' + FileUtil.getFileExtension(summary.getFileName()));
-				handler.saveFile(summary.getFileUuid(), FileUtil.getFullPath(directoryName, summary.getAttachmentLocalUrl()));
+				itemSummary.setAttachmentLocalUrl(userName + "/" + idx + "/" + itemSummary.getFileUuid() + '.' + FileUtil.getFileExtension(itemSummary.getFileName()));
+				handler.saveFile(itemSummary.getFileUuid(), FileUtil.getFullPath(directoryName, itemSummary.getAttachmentLocalUrl()));
 			} catch (Exception e) {
 				logger.error("Export forum topic attachment failed: " + e.toString());
 			}
Index: lams_tool_larsrc/web/common/tabbedheader.jsp
===================================================================
diff -u -re9e2a6b00397afa86d303bfbc6ca3649744a982e -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
+++ lams_tool_larsrc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -7,7 +7,6 @@
 	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css style="tabbed"/>
 
-
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r2f3123819df4f065b86f1efc486f04622bd71281 -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 2f3123819df4f065b86f1efc486f04622bd71281)
+++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -186,30 +186,23 @@
 				</c:forEach>
 			</table>
 
-			<%-- Display reflection entries --%>
-			<c:if test="${not group[0].initGroup}">
-
-				<c:if test="${sessionMap.reflectOn}">
-					<%-- End all answers for this question --%>
-					<h3>
-						<fmt:message key="label.export.reflection" />
-					</h3>
-					<c:set var="reflectDTOSet"
-						value="${sessionMap.reflectList[group[0].sessionId]}" />
-					<c:forEach var="reflectDTO" items="${reflectDTOSet}">
-						<h4>
-							${reflectDTO.fullName}
-						</h4>
-						<p>
-							<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
-						</p>
-					</c:forEach>
-				</c:if>
-
-			</c:if>
-
 		</c:forEach>
 
+		<%-- Display reflection entries --%>
+		<c:if test="${sessionMap.reflectOn}">
+			<h3>
+				<fmt:message key="label.export.reflection" />
+			</h3>
+			<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
+				<h4>
+					${reflectDTO.fullName}
+				</h4>
+				<p>
+					<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+				</p>
+			</c:forEach>
+		</c:if>
+
 	</div>
 	<!--closes content-->
 
Index: lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -0,0 +1,138 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<h1>
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.th.advancedSettings" />
+	</a>
+</h1>
+<br />
+
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+<table class="alternative-color">
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.lock.on.finished" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.resource.lockWhenFinished == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.run.content.auto" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.resource.runAuto == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.mini.number.resources.view" />
+		</td>
+		
+		<td>
+			${sessionMap.resource.miniViewResourceNumber}
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.resource.allowAddUrls == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.allow.learner.add.files" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.resource.allowAddFiles == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advanced.notify.onassigmentsubmit" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.resource.notifyTeachersOnAssigmentSumbit == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<fmt:message key="monitor.summary.td.addNotebook" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.resource.reflectOnActivity == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<c:choose>
+		<c:when test="${sessionMap.resource.reflectOnActivity == true}">
+			<tr>
+				<td>
+					<fmt:message key="monitor.summary.td.notebookInstructions" />
+				</td>
+				<td>
+					${sessionMap.resource.reflectInstructions}	
+				</td>
+			</tr>
+		</c:when>
+	</c:choose>
+</table>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -6,28 +6,38 @@
 
 <lams:html>
 	<lams:head>
-		 <%@ include file="/common/tabbedheader.jsp" %>
-	 <script>
+		<%@ include file="/common/tabbedheader.jsp" %>
+		<style media="screen,projection" type="text/css">
+			#tabbody1 {
+				margin-left: 15px;
+			}
+			
+			table.forms {
+				margin-left: 15px;
+			}
+		</style>
+		 
+		<script>
 			var initialTabId = "${initialTabId}";
-
-		   function init(){
-			 	if (initialTabId) {
+	
+			function init(){
+				if (initialTabId) {
 					selectTab(initialTabId);
 				} else {
 					selectTab(1);
 				}
-	        }     
-	        
-	        function doSelectTab(tabId) {
-		    	// end optional tab controller stuff
-		    	selectTab(tabId);
-	        } 
-	        
-		    function viewItem(itemUid,sessionMapID){
-				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid + "&sessionMapID="+sessionMapID;
+		    }     
+		        
+		    function doSelectTab(tabId) {
+			   // end optional tab controller stuff
+			   selectTab(tabId);
+		    } 
+		        
+			function viewItem(itemUid){
+				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid + "&sessionMapID=${sessionMapID}";
 				launchPopup(myUrl,"MonitoringReview");
 			}
-	    </script>		 
+		</script>		 
 	</lams:head>
 	<body class="stripes" onLoad="init()">
 	<div id="page">
Fisheye: Tag d926a01b391e585bd535135a7360205f36cde6e6 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/monitoring/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/monitoring/reflections.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/monitoring/reflections.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/monitoring/reflections.jsp	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -0,0 +1,37 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<br>
+<h2>
+	<fmt:message key="title.reflection"/>
+</h2>
+
+<table class="forms">
+
+	<tr>
+		<th style="width: 20%">
+			<fmt:message key="monitoring.user.fullname"/>
+		</th>
+		<th style="width: 20%">
+			<fmt:message key="monitoring.label.user.loginname"/>
+		</th>
+		<th>
+			<fmt:message key="monitoring.user.reflection"/>
+		</th>
+	</tr>
+										
+	<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
+		<tr>
+			<td>
+				${reflectDTO.fullName}
+			</td>
+			<td>
+				${reflectDTO.loginName}
+			</td>
+			<td>
+				<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+			</td>
+		</tr>
+	</c:forEach>
+
+</table>
+<br>
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -2,32 +2,28 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-
 <table cellspacing="3">
+
 	<c:if test="${empty summaryList}">
 		<div align="center">
 			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 		</div>
 	</c:if>
+	
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-		<c:set var="groupSize" value="${fn:length(group)}" />
-		<c:forEach var="item" items="${group}" varStatus="status">
+		<c:forEach var="item" items="${group.items}" varStatus="status">
+		
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
 				<tr>
 					<td colspan="4">
 						<c:if test="${sessionMap.isGroupedActivity}">
-							<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B> 
+							<B><fmt:message key="monitoring.label.group" /> ${group.sessionName}</B> 
 						</c:if>
-						<SPAN style="font-size: 12px;"> 
-							<c:if test="${firstGroup.index==0}">
-								<fmt:message key="monitoring.summary.note" />
-							</c:if> 
-						</SPAN>
 					</td>
 				</tr>
 				<tr>
-					<th width="20%" align="center">
+					<th width="20%">
 						<fmt:message key="monitoring.label.type" />
 					</th>
 					<th width="35%">
@@ -41,17 +37,7 @@
 					</th>
 				</tr>
 			</c:if>
-			<c:if test="${item.itemUid == -1}">
 				<tr>
-					<td colspan="4">
-						<div align="left">
-							<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
-						</div>
-					</td>
-				</tr>
-			</c:if>
-			<c:if test="${item.itemUid != -1}">
-				<tr>
 					<td>
 						<c:choose>
 							<c:when test="${item.itemType == 1}">
@@ -73,14 +59,14 @@
 					</td>
 					<td>
 						<c:if test="${!item.itemCreateByAuthor}">
-										${item.username}
-									</c:if>
+							${item.username}
+						</c:if>
 					</td>
 					<td align="center">
 						<c:choose>
 							<c:when test="${item.viewNumber > 0}">
 								<c:set var="listUrl">
-									<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}' />
+									<c:url value='/monitoring/listuser.do?toolSessionID=${group.sessionId}&itemUid=${item.itemUid}' />
 								</c:set>
 								<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
 							</c:when>
@@ -90,7 +76,6 @@
 						</c:choose>
 					</td>
 				</tr>
-			</c:if>
 		</c:forEach>
 	</c:forEach>
 </table>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -rd926a01b391e585bd535135a7360205f36cde6e6
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
@@ -1,300 +1,192 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+<style media="screen,projection" type="text/css">
+	#user-dropdown-div {padding-left: 30px; margin-top: -5px; margin-bottom: 50px;}
+	.bottom-buttons {margin: 20px 20px 0px; padding-bottom: 20px;}
+	.section-header {padding-left: 20px; margin-bottom: 15px; margin-top: 60px;}
+	.ui-jqgrid tr.jqgrow td {
+	    white-space: normal !important;
+	    height:auto;
+	    vertical-align:text-top;
+	    padding-top:2px;
+	}
+</style>
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.lock.on.finished" />
-		</td>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript">
+	$(document).ready(function(){
 		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.lockWhenFinished == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.run.content.auto" />
-		</td>
+		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
 		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.runAuto == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.mini.number.resources.view" />
-		</td>
+			jQuery("#group${groupSummary.sessionId}").jqGrid({
+				datatype: "local",
+				height: 'auto',
+				autowidth: true,
+				shrinkToFit: false,
+			   	colNames:['#',
+						'sessionId',
+						'itemUid',
+						"<fmt:message key="monitoring.label.title" />",
+						"<fmt:message key="monitoring.label.type" />",
+					    "<fmt:message key="monitoring.label.suggest" />",
+					    "<fmt:message key="monitoring.label.views" />",
+					    "<fmt:message key="monitoring.label.actions" />" 
+				],
+			   	colModel:[
+			   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
+			   		{name:'sessionId', index:'sessionId', width:0, hidden: true},
+			   		{name:'itemUid', index:'itemUid', width:0, hidden: true},
+			   		{name:'title', index:'title', width:260},
+			   		{name:'type', index:'type', width:90},
+			   		{name:'suggest', index:'suggest', width:160},
+			   		{name:'viewNumber', index:'viewNumber', width:100, align:"right", sorttype:"int"},
+			   		{name:'actions', index:'actions', width:120, align:"center"}		
+			   	],
+			   	caption: "${groupSummary.sessionName}",
+				subGrid: true,
+				subGridRowExpanded: function(subgrid_id, row_id) {
+					var subgridTableId = subgrid_id+"_t";
+					var sessionId = jQuery("#group${groupSummary.sessionId}").getRowData(row_id)["sessionId"];
+					var itemUid = jQuery("#group${groupSummary.sessionId}").getRowData(row_id)["itemUid"];
+					   
+					jQuery("#"+subgrid_id).html("<table id='" + subgridTableId + "' class='scroll'></table>");
+					   
+					jQuery("#"+subgridTableId).jqGrid({
+						datatype: "json",
+						url: "<c:url value='/monitoring/getSubgridData.do'/>?itemUid=" + itemUid + '&toolSessionID=' + sessionId,
+						height: "100%",
+						autowidth:true,
+						colNames: [
+						   '',
+						   "<fmt:message key="monitoring.label.user.name"/>",
+						   "<fmt:message key="monitoring.label.access.time"/>", 
+						   "<fmt:message key="monitoring.label.complete.time"/>", 
+						   "<fmt:message key="monitoring.label.time.taken"/>"
+						],
+						colModel:[
+						   {name:'id', index:'id', hidden:true},
+						   {name:'userName',index:'userName'},
+						   {name:'startTime', index:'startTime', width:140, align:"center"},
+						   {name:'completeTime', index:'completeTime', width:140, align:"center"},
+						   {name:'timeTaken',index:'timeTaken', width:70, align:"center"}
+						],
+						loadError: function(xhr,st,err) {
+					    	jQuery("#"+subgridTableId).clearGridData();
+					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
+					    }
+					})
+				}
+			});
+			
+   	        <c:forEach var="item" items="${groupSummary.items}" varStatus="i">
+				<c:choose>
+					<c:when test="${item.itemHide}">
+						<c:set var="changeItemVisibility"><a href='#nogo' onclick='javascript:changeItemVisibility(this, ${item.itemUid}, false); return false;'> <fmt:message key='monitoring.label.show' /> </a></c:set>
+					</c:when>
+					<c:otherwise>
+						<c:set var="changeItemVisibility"><a href='#nogo' onclick='javascript:changeItemVisibility(this, ${item.itemUid}, true); return false;'> <fmt:message key='monitoring.label.hide' /> </a></c:set>
+					</c:otherwise>
+				</c:choose>
+				
+				<c:choose>
+					<c:when test="${item.itemType == 1}">
+						<c:set var="itemTypeLabel"><fmt:message key="label.authoring.basic.resource.url" /></c:set>
+					</c:when>
+					<c:when test="${item.itemType == 2}">
+						<c:set var="itemTypeLabel"><fmt:message key="label.authoring.basic.resource.file" /></c:set>
+					</c:when>
+					<c:when test="${item.itemType == 3}">
+						<c:set var="itemTypeLabel"><fmt:message key="label.authoring.basic.resource.website" /></c:set>
+					</c:when>
+					<c:when test="${item.itemType == 4}">
+						<c:set var="itemTypeLabel"><fmt:message key="label.authoring.basic.resource.learning.object" /></c:set>
+					</c:when>
+				</c:choose>
+   	        
+   	     		jQuery("#group${groupSummary.sessionId}").addRowData(${i.index + 1}, {
+   	   	     		id:		"${i.index + 1}",
+   	   	     		sessionId:	"${groupSummary.sessionId}",
+   	   	     		itemUid:	"${item.itemUid}",
+   	   	     		title:	"<a href='#nogo' onclick='javascript:viewItem(${item.itemUid}); return false;'>${item.itemTitle}</a>",
+   	   	     		type:	"${itemTypeLabel}",
+   	   	     		suggest:	"${item.username}",
+   	   	     		viewNumber:"	${item.viewNumber}",
+   	   	     		actions:	"${changeItemVisibility}"
+   	   	   	    });
+	        </c:forEach>
+			
+		</c:forEach>
+        
+		//jqgrid autowidth (http://stackoverflow.com/a/1610197)
+		$(window).bind('resize', function() {
+			var grid;
+		    if (grid = jQuery(".ui-jqgrid-btable:visible")) {
+		    	grid.each(function(index) {
+		        	var gridId = $(this).attr('id');
+		        	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+		        	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+		    	});
+		    }
+		});
 		
-		<td>
-			${sessionMap.resource.miniViewResourceNumber}
-		</td>
-	</tr>
+	});
 	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.allowAddUrls == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.learner.add.files" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.allowAddFiles == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.notify.onassigmentsubmit" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.notifyTeachersOnAssigmentSumbit == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.resource.reflectOnActivity == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${sessionMap.resource.reflectOnActivity == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					${sessionMap.resource.reflectInstructions}	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
-</div>
+	function changeItemVisibility(linkObject, itemUid, isHideItem) {
+		<c:set var="hideShowLink"><a href='<c:url value='/monitoring/changeItemVisibility.do'/>?sessionMapID=${sessionMapID}&itemUid=${item.itemUid}' class='button'> <fmt:message key='monitoring.label.show' /> </a></c:set>
+        $.ajax({
+            url: '<c:url value="/monitoring/changeItemVisibility.do"/>',
+            data: 'sessionMapID=${sessionMapID}&itemUid=' + itemUid + '&isHideItem=' + isHideItem,
+            dataType: 'json',
+            type: 'post',
+            success: function (json) {
+            	if (isHideItem) {
+            		linkObject.innerHTML = '<fmt:message key='monitoring.label.show' />' ;
+            		linkObject.onclick = function (){
+            			changeItemVisibility(this, itemUid, false); 
+            			return false;
+            		}
+            	} else {
+            		linkObject.innerHTML = '<fmt:message key='monitoring.label.hide' />' ;
+            		linkObject.onclick = function (){
+            			changeItemVisibility(this, itemUid, true); 
+            			return false;
+            		}
+            	}
+            }
+       	});
+	}
 
+</script>
 
-
-
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 	</div>
 </c:if>
 
-<table cellpadding="0">
-	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-		<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.first}">
-				<c:if test="${sessionMap.isGroupedActivity}">
-					<tr>
-						<td colspan="5">
-							<B><fmt:message key="monitoring.label.group" /> ${item.sessionName}</B> 
-						</td>
-					</tr>
-				</c:if>
-				
-				<c:if test="${firstGroup.index==0}">
-					<tr>
-						<td colspan="5">
-							<SPAN style="font-size: 12px;"> 
-								<fmt:message key="monitoring.summary.note" />
-							</SPAN>
-						</td>
-					</tr>
-				</c:if> 
-				
-				<tr>
-					<th width="18%" align="center">
-						<fmt:message key="monitoring.label.type" />
-					</th>
-					<th width="25%">
-						<fmt:message key="monitoring.label.title" />
-					</th>
-					<th width="20%">
-						<fmt:message key="monitoring.label.suggest" />
-					</th>
-					<th width="22%" align="center">
-						<fmt:message key="monitoring.label.number.learners" />
-					</th>
-					<th width="15%">
-						<!--hide/show-->
-					</th>
-				</tr>
-				<%-- End group title display --%>
-			</c:if>
-			<c:if test="${item.itemUid == -1}">
-				<tr>
-					<td colspan="5">
-						<div class="align-left">
-							<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
-						</div>
-					</td>
-				</tr>
-			</c:if>
-			<c:if test="${item.itemUid != -1}">
-				<tr>
-					<td>
-						<c:choose>
-							<c:when test="${item.itemType == 1}">
-								<fmt:message key="label.authoring.basic.resource.url" />
-							</c:when>
-							<c:when test="${item.itemType == 2}">
-								<fmt:message key="label.authoring.basic.resource.file" />
-							</c:when>
-							<c:when test="${item.itemType == 3}">
-								<fmt:message key="label.authoring.basic.resource.website" />
-							</c:when>
-							<c:when test="${item.itemType == 4}">
-								<fmt:message key="label.authoring.basic.resource.learning.object" />
-							</c:when>
-						</c:choose>
-					</td>
-					<td>
-						<a href="javascript:;" onclick="viewItem(${item.itemUid},'${sessionMapID}')">${item.itemTitle}</a>
-					</td>
-					<td>
-						<c:if test="${!item.itemCreateByAuthor}">
-											${item.username}
-										</c:if>
-					</td>
-					<td align="center">
-						<c:choose>
-							<c:when test="${item.viewNumber > 0}">
-								<c:set var="listUrl">
-									<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}' />
-								</c:set>
-								<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
-							</c:when>
-							<c:otherwise>
-									0
-							</c:otherwise>
-						</c:choose>
-					</td>
-					<td align="center">
-						<c:choose>
-							<c:when test="${item.itemHide}">
-								<a href="<c:url value='/monitoring/showitem.do'/>?sessionMapID=${sessionMapID}&itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.show" /> </a>
-							</c:when>
-							<c:otherwise>
-								<a href="<c:url value='/monitoring/hideitem.do'/>?sessionMapID=${sessionMapID}&itemUid=${item.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
-							</c:otherwise>
-						</c:choose>
-					</td>
-				</tr>
-			</c:if>
-			
-				<%-- Reflection list  --%>
-				<c:if test="${sessionMap.resource.reflectOnActivity && status.last}">
-					<c:set var="userList" value="${sessionMap.reflectList[item.sessionId]}"/>
-					<c:forEach var="user" items="${userList}" varStatus="refStatus">
-						<c:if test="${refStatus.first}">
-							<tr>
-								<td colspan="5">
-									<h2><fmt:message key="title.reflection"/>	</h2>
-								</td>
-							</tr>
-							<tr>
-								<th colspan="2">
-									<fmt:message key="monitoring.user.fullname"/>
-								</th>
-								<th colspan="2">
-									<fmt:message key="monitoring.label.user.loginname"/>
-								</th>
-								<th>
-									<fmt:message key="monitoring.user.reflection"/>
-								</th>
-							</tr>
-						</c:if>
-						<tr>
-							<td colspan="2">
-								${user.fullName}
-							</td>
-							<td colspan="2">
-								${user.loginName}
-							</td>
-							<td >
-								<c:set var="viewReflection">
-									<c:url value="/monitoring/viewReflection.do?toolSessionID=${item.sessionId}&userUid=${user.userUid}"/>
-								</c:set>
-								<html:link href="javascript:launchPopup('${viewReflection}')">
-									<fmt:message key="label.view" />
-								</html:link>
-							</td>
-						</tr>
-					</c:forEach>
-				</c:if>
-			
-		</c:forEach>
+<c:forEach var="groupSummary" items="${summaryList}">
+	
+	<c:if test="${sessionMap.isGroupedActivity}">
+		<h1>
+			<fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}
+		</h1>
+		<br>
+	</c:if>
+	
+	<table id="group${groupSummary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+	<br>
 		
-	</c:forEach>
-</table>
+</c:forEach>
+	
+<c:if test="${sessionMap.resource.reflectOnActivity}">
+	<%@ include file="reflections.jsp"%>
+</c:if>
+
+<%@ include file="advanceoptions.jsp"%>