Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	20 Apr 2006 04:44:16 -0000	1.9
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	24 Apr 2006 06:57:51 -0000	1.10
@@ -103,7 +103,8 @@
 label.learning.title=Shared Resource Learning
 label.learning.heading=Shared Resources
 label.resoruce.to.review=Resources to view
-label.learning.minmum.review=You must view at least {0} of the resources.
+label.learning.minimum.review=You must view at least {0} of the resources.
+lable.learning.minimum.view.number.less=You at least view other {0} of the resources.
 label.check.for.new=Check for new
 label.suggest.new=Suggest a new
 label.learning.new.file=New file details:
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.14 -r1.15
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	20 Apr 2006 04:44:16 -0000	1.14
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	24 Apr 2006 06:57:52 -0000	1.15
@@ -142,6 +142,21 @@
 			parameter="start" >
 			<forward name="success" path="/pages/learning/learningframe.jsp" />
 		</action>
+		<action path="/learning/viewItem"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
+			parameter="view" >
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>
+		<action path="/learning/completeItem"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
+			parameter="complete" >
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>
+		<action path="/learning/finish"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
+			input="/pages/learning/learning.jsp"
+			parameter="finish" >
+		</action>
 		
 		<action path="/learning/saveOrUpdateItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
Index: lams_tool_larsrc/conf/xdoclet/struts-plugins.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-plugins.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/conf/xdoclet/struts-plugins.xml	22 Mar 2006 05:34:56 -0000	1.2
+++ lams_tool_larsrc/conf/xdoclet/struts-plugins.xml	24 Apr 2006 06:57:52 -0000	1.3
@@ -1,9 +1,10 @@
 <!-- Put custom struts plugin here -->
+<!--
 <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
 	<set-property property="pathnames"
 		value="/WEB-INF/struts/validator-rules.xml,/WEB-INF/validation.xml" />
 </plug-in>
-
+-->
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml"/>
 </plug-in>
Index: lams_tool_larsrc/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/tool_insert.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/db/sql/tool_insert.sql	6 Apr 2006 06:58:12 -0000	1.3
+++ lams_tool_larsrc/db/sql/tool_insert.sql	24 Apr 2006 06:57:52 -0000	1.4
@@ -41,9 +41,9 @@
 0,
 2,
 1,
-'tool/larsrc11/learning/viewResource.do?mode=learner',
-'tool/larsrc11/learning/viewResource.do?mode=author',
-'tool/larsrc11/learning/viewResource.do?mode=teacher',
+'tool/larsrc11/learning/start.do?mode=learner',
+'tool/larsrc11/learning/start.do?mode=author',
+'tool/larsrc11/learning/start.do?mode=teacher',
 'tool/larsrc11/authoring/start.do',
 'tool/larsrc11/monitoring.do',
 'tool/larsrc11/defineLater.do',
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.13 -r1.14
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	20 Apr 2006 05:31:42 -0000	1.13
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	24 Apr 2006 06:57:51 -0000	1.14
@@ -45,6 +45,7 @@
 	public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
 	public static final String PARAM_FILE_UUID = "fileUuid";
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
+	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
 	
 	//for request attribute name
 	public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	20 Apr 2006 05:31:42 -0000	1.4
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	24 Apr 2006 06:57:51 -0000	1.5
@@ -111,6 +111,11 @@
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setAsDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setAsRunOffline">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="setItemComplete">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="setItemAccess">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="finishToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
             </props>
         </property>
     </bean>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java	6 Apr 2006 06:58:12 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java	24 Apr 2006 06:57:51 -0000	1.4
@@ -25,6 +25,8 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
+
 public interface ResourceItemDAO extends DAO {
 	
 	/**
@@ -34,4 +36,6 @@
 	 */
 	List getAuthoringItems(Long resourceUid);
 
+	ResourceItem getByUid(Long resourceItemUid);
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java	24 Apr 2006 06:57:51 -0000	1.1
@@ -0,0 +1,33 @@
+/****************************************************************
+ * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id: ResourceItemVisitDAO.java,v 1.1 2006/04/24 06:57:51 steven Exp $$ */
+package org.lamsfoundation.lams.tool.rsrc.dao;
+
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog;
+
+public interface ResourceItemVisitDAO extends DAO {
+
+	public ResourceItemVisitLog getResourceItemLog(Long userUid,Long itemUid);
+
+	public int getUserViewLogCount(Long userUid);
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java	3 Apr 2006 13:24:23 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java	24 Apr 2006 06:57:51 -0000	1.4
@@ -27,6 +27,6 @@
 
 public interface ResourceUserDAO extends DAO {
 
-	ResourceUser getUserByUserID(Class<ResourceUser> name, Long userUid);
+	ResourceUser getUserByUserID( Long userUid);
 
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java	6 Apr 2006 06:58:12 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java	24 Apr 2006 06:57:52 -0000	1.4
@@ -37,4 +37,8 @@
 		return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS,resourceUid); 
 	}
 
+	public ResourceItem getByUid(Long resourceItemUid) {
+		return (ResourceItem) this.getObject(ResourceItem.class,resourceItemUid);
+	}
+
 }
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	24 Apr 2006 06:57:52 -0000	1.1
@@ -0,0 +1,51 @@
+/****************************************************************
+ * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id: ResourceItemVisitDAOHibernate.java,v 1.1 2006/04/24 06:57:52 steven Exp $$ */
+package org.lamsfoundation.lams.tool.rsrc.dao.hibernate;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog;
+
+public class ResourceItemVisitDAOHibernate extends BaseDAOHibernate implements ResourceItemVisitDAO{
+	
+	private static final String FIND_BY_ITEM_AND_USER = "from " + ResourceItemVisitLog.class.getName() + " where user.uid = ? and resourceItem.uid=?";
+	private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from " + ResourceItemVisitLog.class.getName() 
+			+ " where user.uid = ?";
+
+	public ResourceItemVisitLog getResourceItemLog(Long userUid,Long itemUid){
+		List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userUid,itemUid});
+		if(list == null || list.size() ==0)
+			return null;
+		return (ResourceItemVisitLog) list.get(0);
+	}
+
+	public int getUserViewLogCount(Long userUid) {
+		List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER,new Object[]{userUid});
+		if(list == null || list.size() ==0)
+			return 0;
+		return ((Integer) list.get(0)).intValue();
+	}
+
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java	3 Apr 2006 13:24:23 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java	24 Apr 2006 06:57:51 -0000	1.4
@@ -32,7 +32,7 @@
 public class ResourceUserDAOHibernate extends BaseDAOHibernate implements ResourceUserDAO{
 	
 	private static final String FIND_BY_USER_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =?";
-	public ResourceUser getUserByUserID(Class<ResourceUser> name, Long userUid) {
+	public ResourceUser getUserByUserID(Long userUid) {
 		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID,userUid);
 		if(list == null || list.size() == 0)
 			return null;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	20 Apr 2006 04:44:16 -0000	1.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	24 Apr 2006 06:57:51 -0000	1.7
@@ -105,6 +105,23 @@
   		try{
   			resource = (Resource) super.clone();
   			resource.setUid(null);
+  			if(resourceItems != null){
+  				Iterator iter = resourceItems.iterator();
+  				Set set = new HashSet();
+  				while(iter.hasNext()){
+  					ResourceItem item = (ResourceItem)iter.next(); 
+  					ResourceItem newItem = (ResourceItem) item.clone();
+//  					if toolContentHandle is null, just clone old file without duplicate it in repository
+  					if(toolContentHandler != null){
+						//duplicate file node in repository
+						NodeKey keys = toolContentHandler.copyFile(item.getFileUuid());
+						newItem.setFileUuid(keys.getUuid());
+						newItem.setFileVersionId(keys.getVersion());
+  					}
+					set.add(newItem);
+  				}
+  				resource.resourceItems = set;
+  			}
   			//clone attachment
   			if(attachments != null){
   				Iterator iter = attachments.iterator();
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	10 Apr 2006 07:15:15 -0000	1.8
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	24 Apr 2006 06:57:51 -0000	1.9
@@ -24,17 +24,23 @@
 package org.lamsfoundation.lams.tool.rsrc.model;
 
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.contentrepository.NodeKey;
+
 /**
  * Resource
  * @author Dapeng Ni
  *
  * @hibernate.class  table="tl_larsrc11_resource_item"
  *
  */
-public class ResourceItem {
-
+public class ResourceItem  implements Cloneable{
+	private static final Logger log = Logger.getLogger(ResourceItem.class);
+	
 	private Long uid;
 	//Resource Type:1=URL,2=File,3=Website,4=Learning Object
 	private short type;
@@ -67,6 +73,32 @@
 	private Date createDate;
 	private ResourceUser createBy;
 	
+	//***********************************************
+	//DTO fields:
+	private boolean complete;
+	
+    public Object clone(){
+    	ResourceItem obj = null;
+		try {
+			obj = (ResourceItem) super.clone();
+//			clone attachment
+  			if(itemInstructions != null){
+  				Iterator iter = itemInstructions.iterator();
+  				Set set = new HashSet();
+  				while(iter.hasNext()){
+  					ResourceItemInstruction instruct = (ResourceItemInstruction)iter.next(); 
+  					ResourceItemInstruction newInsruct = (ResourceItemInstruction) instruct.clone();
+					set.add(newInsruct);
+  				}
+  				obj.itemInstructions = set;
+  			}
+			((ResourceItem)obj).setUid(null);
+		} catch (CloneNotSupportedException e) {
+			log.error("When clone " + ResourceItem.class + " failed");
+		}
+		
+		return obj;
+	}	
 //    **********************************************************
 	  	//		Get/Set methods
 //	  **********************************************************
@@ -256,4 +288,11 @@
 	    public void setFileName(String name) {
 	        this.fileName = name;
 	    }
+	    
+		public void setComplete(boolean complete) {
+			this.complete=complete;
+		}
+		public boolean isComplete() {
+			return complete;
+		}
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	3 Apr 2006 13:24:23 -0000	1.2
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	24 Apr 2006 06:57:51 -0000	1.3
@@ -24,19 +24,32 @@
 package org.lamsfoundation.lams.tool.rsrc.model;
 
 import java.util.Set;
+
+import org.apache.log4j.Logger;
 /**
  * @hibernate.class table="tl_larsrc11_item_instruction"
  * @author Steve.Ni
  * 
  * @version $Revision$
  */
-public class ResourceItemInstruction {
-
+public class ResourceItemInstruction  implements Cloneable{
+	private static final Logger log = Logger.getLogger(ResourceItemInstruction.class);
+	
 	private Long uid;
 	private int sequenceId;
 	private String description;
 
-
+    public Object clone(){
+		Object obj = null;
+		try {
+			obj = super.clone();
+			((ResourceItemInstruction)obj).setUid(null);
+		} catch (CloneNotSupportedException e) {
+			log.error("When clone " + ResourceItemInstruction.class + " failed");
+		}
+		
+		return obj;
+	}
 // **********************************************************
 	  	//		Get/Set methods
 //	  **********************************************************
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItemVisitLog.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	24 Apr 2006 06:57:51 -0000	1.2
@@ -53,6 +53,14 @@
             column="user_uid"
         />
 
+        <property
+            name="complete"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="complete"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ResourceItemVisitLog.xml
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	24 Apr 2006 06:57:51 -0000	1.2
@@ -37,6 +37,7 @@
 	private Long uid;
 	private ResourceUser user;
 	private ResourceItem resourceItem;
+	private boolean complete;
 	private Date accessDate;
 	/**
 	 * @hibernate.property column="access_date"
@@ -81,6 +82,16 @@
 	public void setUser(ResourceUser user) {
 		this.user = user;
 	}
+	/**
+	 * @hibernate.property column="complete"
+	 * @return
+	 */
+	public boolean isComplete() {
+		return complete;
+	}
+	public void setComplete(boolean complete) {
+		this.complete = complete;
+	}
 	
 	
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceSession.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	24 Mar 2006 06:23:55 -0000	1.2
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml	24 Apr 2006 06:57:51 -0000	1.3
@@ -79,8 +79,8 @@
         <set
             name="resourceItems"
             lazy="true"
-            inverse="true"
-            cascade="none"
+            inverse="false"
+            cascade="all"
             sort="unsorted"
             order-by="create_date desc"
         >
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java	3 Apr 2006 13:24:23 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java	24 Apr 2006 06:57:51 -0000	1.4
@@ -153,8 +153,8 @@
 	 * 
 	 * 
 	 * @hibernate.set lazy="true"
-	 *                inverse="true"
-	 *                cascade="none"
+	 *                inverse="false"
+	 *                cascade="all"
 	 *                order-by="create_date desc"
 	 * @hibernate.collection-key column="session_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.rsrc.model.ResourceItem"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	20 Apr 2006 04:44:16 -0000	1.9
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	24 Apr 2006 06:57:51 -0000	1.10
@@ -32,6 +32,7 @@
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
+import org.lamsfoundation.lams.usermanagement.User;
 
 /**
  * @author Dapeng.Ni
@@ -77,5 +78,22 @@
 	ResourceSession getResourceSessionBySessionId(Long sessionId);
 
 	void saveOrUpdateResourceSession(ResourceSession resSession);
+	
+	void retrieveComplete(List<ResourceItem> resourceItemList, ResourceUser user);
+	void setItemComplete(Long resourceItemUid, Long userUid);
+	void setItemAccess(Long resourceItemUid, Long userUid);
+	/**
+	 * the reqired number minus the count of view of the given user.
+	 * @param userUid
+	 * @return
+	 */
+	int checkMiniView(Long toolSessionId, Long userUid);
+	/**
+	 * If success return next activity's url, otherwise return null.
+	 * @param toolSessionId
+	 * @param userId
+	 * @return
+	 */
+	String finishToolSession(Long toolSessionId, Long userId)  throws ResourceApplicationException;
 }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.11 -r1.12
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	20 Apr 2006 05:31:42 -0000	1.11
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	24 Apr 2006 06:57:51 -0000	1.12
@@ -27,7 +27,9 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -58,6 +60,7 @@
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceAttachmentDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemDAO;
+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.ims.IContentPackageConverter;
@@ -67,6 +70,7 @@
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 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;
 import org.lamsfoundation.lams.tool.rsrc.util.ResourceToolContentHandler;
@@ -90,6 +94,7 @@
 	private ResourceAttachmentDAO resourceAttachmentDao;
 	private ResourceUserDAO resourceUserDao;
 	private ResourceSessionDAO resourceSessionDao;
+	private ResourceItemVisitDAO resourceItemVisitDao;
 	//tool service
 	private ResourceToolContentHandler resourceToolContentHandler;
 	private MessageService messageService;
@@ -235,7 +240,7 @@
 
 	public ResourceUser getUserByID(Long userUid) {
 		
-		return (ResourceUser) resourceUserDao.getUserByUserID(ResourceUser.class,userUid);
+		return (ResourceUser) resourceUserDao.getUserByUserID(userUid);
 		
 	}
 
@@ -293,7 +298,7 @@
 		ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId);
 		//construct dto fields;
 		Resource res = session.getResource();
-		res.setMinViewNumber(messageService.getMessage("label.learning.minmum.review"
+		res.setMinViewNumber(messageService.getMessage("label.learning.minimum.review"
 				,new Object[new Integer(res.getMinViewResourceNumber())]));
 		return res;
 	}
@@ -307,6 +312,66 @@
 	}
 
 
+
+	public void retrieveComplete(List<ResourceItem> resourceItemList, ResourceUser user) {
+		for(ResourceItem item:resourceItemList){
+			ResourceItemVisitLog log = resourceItemVisitDao.getResourceItemLog(user.getUid(),item.getUid());
+			item.setComplete(log.isComplete());
+		}
+	}
+
+
+	public void setItemComplete(Long resourceItemUid, Long userUid) {
+		ResourceItemVisitLog log = resourceItemVisitDao.getResourceItemLog(resourceItemUid,userUid);
+		log.setComplete(true);
+		resourceItemVisitDao.saveObject(log);
+	}
+
+
+	public void setItemAccess(Long resourceItemUid, Long userUid){
+		ResourceItemVisitLog log = resourceItemVisitDao.getResourceItemLog(userUid,resourceItemUid);
+		if(log == null){
+			log = new ResourceItemVisitLog();
+			ResourceItem item = resourceItemDao.getByUid(resourceItemUid);
+			log.setResourceItem(item);
+			ResourceUser user = resourceUserDao.getUserByUserID(userUid); 
+			log.setUser(user);
+			log.setComplete(false);
+			log.setAccessDate(new Timestamp(new Date().getTime()));
+			resourceItemVisitDao.saveObject(log);
+		}
+	}
+
+
+	public String finishToolSession(Long toolSessionId, Long userId) throws ResourceApplicationException {
+		ResourceSession session = resourceSessionDao.getSessionBySessionId(toolSessionId);
+		session.setStatus(ResourceConstants.COMPLETED);
+		resourceSessionDao.saveObject(session);
+		
+		String nextUrl = null;
+		try {
+			nextUrl = this.leaveToolSession(toolSessionId,userId);
+		} catch (DataMissingException e) {
+			throw new ResourceApplicationException(e);
+		} catch (ToolException e) {
+			throw new ResourceApplicationException(e);
+		}
+		return nextUrl;
+	}
+
+	public int checkMiniView(Long toolSessionId, Long userUid) {
+		int miniView = resourceItemVisitDao.getUserViewLogCount(userUid);
+		ResourceSession session = resourceSessionDao.getSessionBySessionId(toolSessionId);
+		if(session == null){
+			log.error("Failed get session by ID [" + toolSessionId + "]");
+			return 0;
+		}
+		int reqView = session.getResource().getMinViewResourceNumber();
+		
+		return (reqView - miniView);
+	}
+
+
 	//*****************************************************************************
 	// private methods
 	//*****************************************************************************
@@ -494,6 +559,13 @@
 		this.toolService = toolService;
 	}
 
+	public ResourceItemVisitDAO getResourceItemVisitDao() {
+		return resourceItemVisitDao;
+	}
+	public void setResourceItemVisitDao(ResourceItemVisitDAO resourceItemVisitDao) {
+		this.resourceItemVisitDao = resourceItemVisitDao;
+	}
+
 	//*******************************************************************************
 	//ToolContentManager, ToolSessionManager methods
 	//*******************************************************************************
@@ -513,7 +585,7 @@
 		Resource toContent = Resource.newInstance(resource,toContentId,resourceToolContentHandler);
 		resourceDao.saveObject(toContent);
 		
-		//save resource items
+		//save resource items as well
 		Set items = toContent.getResourceItems();
 		if(items != null){
 			Iterator iter = items.iterator();
@@ -605,4 +677,5 @@
 		resourceSessionDao.deleteBySessionId(toolSessionId);
 	}
 
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	24 Apr 2006 06:57:52 -0000	1.2
@@ -40,23 +40,24 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 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.tool.rsrc.service.ResourceApplicationException;
 import org.lamsfoundation.lams.tool.rsrc.service.UploadResourceFileException;
-import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceForm;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -79,11 +80,74 @@
 		if(param.equals("start")){
 			return start(mapping, form, request, response);
 		}
+		if(param.equals("complete")){
+			return complete(mapping, form, request, response);
+		}
+		if(param.equals("view")){
+			return view(mapping, form, request, response);
+		}
+		if(param.equals("finish")){
+			return finish(mapping, form, request, response);
+		}
         if (param.equals("saveOrUpdateItem")) {
         	return saveOrUpdateItem(mapping, form, request, response);
         }
 		return  mapping.findForward(ResourceConstants.ERROR);
 	}
+	
+	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		Long sessionId = (Long) request.getSession().getAttribute(
+				AttributeNames.PARAM_TOOL_SESSION_ID);
+		HttpSession ss = SessionManager.getSession();
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		Long userID = new Long(user.getUserID().longValue());
+		
+		IResourceService service = getResourceService();
+		int miniViewFlag = service.checkMiniView(sessionId,userID);
+		//if current user view less than reqired view count number, then just return error message.
+		if(miniViewFlag > 0){
+			ActionMessages errors = new ActionMessages();
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionError("lable.learning.minimum.view.number.less",miniViewFlag));
+			this.addErrors(request,errors);
+			return mapping.getInputForward();
+			
+		}
+		ToolAccessMode mode = (ToolAccessMode) request.getSession()
+				.getAttribute(AttributeNames.ATTR_MODE);
+		if (mode == ToolAccessMode.LEARNER) {
+			// get sessionId from HttpServletRequest
+			String nextActivityUrl = null ;
+			try {
+				nextActivityUrl = service.finishToolSession(sessionId,userID);
+				response.sendRedirect(nextActivityUrl);
+			} catch (IOException e) {
+				log.error("Failed send redirect:" + nextActivityUrl);
+			} catch (ResourceApplicationException e) {
+				log.error("Failed get next activity url:" + e.getMessage());
+			}
+			return null;
+		}
+
+		return mapping.findForward("success");
+	}
+	private ActionForward view(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		Long resourceUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		IResourceService service = getResourceService();
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		service.setItemAccess(resourceUid,new Long(user.getUserID().intValue()));
+		return  mapping.findForward(ResourceConstants.SUCCESS);
+	}
+	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		Long resourceUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		IResourceService service = getResourceService();
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		service.setItemComplete(resourceUid,new Long(user.getUserID().intValue()));
+		return  mapping.findForward(ResourceConstants.SUCCESS);
+	}
 	/**
 	 * Save file or url resource item into database.
 	 * @param mapping
@@ -148,6 +212,7 @@
 		}
 		items.add(item);
 		service.saveOrUpdateResourceSession(resSession);
+		request.setAttribute("addType",new Short(type));
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	/**
@@ -164,6 +229,15 @@
 		
 //		get back the resource and item list and display them on page
 		IResourceService service = getResourceService();
+		//try to get form system session
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		ResourceUser resourceUser = service.getUserByID(new Long(user.getUserID().intValue()));
+		if(resourceUser == null){
+			resourceUser = new ResourceUser(user,null);
+			service.createUser(resourceUser);
+		}
 
 		List items = null;
 		Resource resource;
@@ -180,6 +254,9 @@
 		if(items != null)
 			resourceItemList.addAll(items);
 		
+		//set complete flag for display purpose
+		service.retrieveComplete(resourceItemList, resourceUser);
+		
 		request.setAttribute(ResourceConstants.ATTR_RESOURCE,resource);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	24 Apr 2006 06:57:51 -0000	1.2
@@ -42,7 +42,7 @@
 									<fmt:message key="label.authoring.basic.resource.file.input" />
 									<input type="file" name="file" size="25"  /> 
 								</td>
-								<td>
+								<td  align="center" valign="bottom">
 									<input type="submit" name="add" value="<fmt:message key="button.upload"/>" class="buttonStyle">
 								</td>
 							</tr>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	24 Apr 2006 06:57:51 -0000	1.2
@@ -39,10 +39,10 @@
 							</tr>
 							<tr>
 								<td>
-									<fmt:message key="label.authoring.basic.resource.file.input" />
+									<fmt:message key="label.authoring.basic.resource.url.input" />
 									<input type="url" name="url" size="40"  /> 
 								</td>
-								<td>
+								<td align="center" valign="bottom">
 									<input type="submit" name="add" value="<fmt:message key="button.upload"/>" class="buttonStyle">
 								</td>
 							</tr>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/learning/learning.jsp	20 Apr 2006 04:44:16 -0000	1.1
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	24 Apr 2006 06:57:51 -0000	1.2
@@ -14,6 +14,18 @@
 			parent.newResourceFrame.location = "<c:url value="/pages/learning/addfile.jsp"/>";
 	      	parent.newResourceFrame.focus();
 		}
+		function checkNew(){
+			parent.learningFrame.location = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}";
+		}
+		function viewItem(itemUid){
+			parent.learningFrame.location = "<c:url value="/learning/viewItem.do"/>?itemUid=" + itemUid;
+		}
+		function completeItem(itemUid){
+			parent.learningFrame.location = "<c:url value="/learning/completeItem.do"/>?itemUid=" + itemUid;
+		}
+		function finishSession(){
+			location.href='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&mode=learner"/>';
+		}
 	-->        
     </script>
 </head>
@@ -32,6 +44,7 @@
 			</td>
 		</tr>
 	</table>
+	<%@ include file="/common/messages.jsp"%>
 	<table border="0" align="center" class="forms" width="95%">
 		<tr>
 			<th scope="col">
@@ -41,22 +54,30 @@
 				<fmt:message key="label.completed" />
 			</th>
 			<th scope="col" style="width:200px">
-				<a href="javascript:;" style="width:120px" class="button"><fmt:message key="label.check.for.new" /></a>
+				<a href="javascript:;" style="width:120px" class="button" onclick="checkNew()"><fmt:message key="label.check.for.new" /></a>
 			</th>
 		</tr>
 		<c:forEach var="item" items="${resourceList}">
 			<tr>
-				<td></td>
-				<td></td>
+				<td>${item.title}</td>
 				<td>
-					<a href="javascript:;" class="button"><fmt:message key="label.view" /></a>
-					<a href="javascript:;" class="button"><fmt:message key="label.completed" /></a>
+					<c:if test="${item.complete}">
+						<img src="<html:rewrite page='/includes/images/cross.gif'/>" border="0">
+					</c:if>
+				
 				</td>
+				
+				<td>
+					<a href="javascript:;" class="button" onclick="viewItem(${item.uid})" ><fmt:message key="label.view" /></a>
+					<a href="javascript:;" class="button" onclick="completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
+				</td>
 			</tr>
 		</c:forEach>
 		<tr>
 			<td colspan="3" align="right">
-				<a href="javascript:;" class="button"><fmt:message key="label.finished" /></a>
+				<a href="javascript:;" class="button" onclick="finishSession()">
+					<fmt:message key="label.finished" />
+				</a>
 			</td>
 		</tr>
 		<c:if test="${resource.minViewNumber}">
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/success.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/learning/success.jsp	24 Apr 2006 06:57:51 -0000	1.1
@@ -0,0 +1,19 @@
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+	</head>
+	<body>
+		<script type="text/javascript">
+			parent.learningFrame.location = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}";
+		</script>
+		<div style="align:center">
+			<c:if test="${addType == 1}">
+				Add URL success, <a href="<c:url value='/pages/learning/addurl.jsp'/>" target="newResourceFrame">click here to return</a>.
+			</c:if>
+			<c:if test="${addType == 2}">
+				Add File success, <a href="<c:url value='/pages/learning/addfile.jsp'/>" target="newResourceFrame">click here to return</a>.
+			</c:if>
+		</div>
+	</body>
+</html>
\ No newline at end of file