Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -140,7 +140,7 @@
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="start" >
-			<forward name="success" path="/pages/learning/learningframe.jsp" />
+			<forward name="success" path="/pages/learning/start.jsp" />
 		</action>
 		<action path="/learning/completeItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
@@ -151,6 +151,7 @@
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
 			parameter="finish" >
+			<forward name="success" path="/pages/learning/finish.jsp" />
 		</action>
 		
 		<action path="/learning/saveOrUpdateItem"
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -rc8f42df13810316bf19cfe3239ad45fe881b886e -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision c8f42df13810316bf19cfe3239ad45fe881b886e)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -70,6 +70,7 @@
    resource_item_uid bigint,
    user_uid bigint,
    complete bit,
+   session_id bigint,
    primary key (uid)
 );
 create table tl_larsrc11_session (
@@ -104,7 +105,6 @@
 
 
 
-
 INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`) VALUES
   (2,NULL,NULL,NULL,'LAMS Shared Resources','\0','\0','Instruction','Online instruction','Offline instruction',1,1,${default_content_id},1,1,1,1);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_larsrc/db/sql/table-schema.sql
===================================================================
diff -u -rc8f42df13810316bf19cfe3239ad45fe881b886e -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/db/sql/table-schema.sql	(.../table-schema.sql)	(revision c8f42df13810316bf19cfe3239ad45fe881b886e)
+++ lams_tool_larsrc/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -79,6 +79,7 @@
    resource_item_uid bigint,
    user_uid bigint,
    complete bit,
+   session_id bigint,
    primary key (uid)
 );
 create table tl_larsrc11_session (
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -59,7 +59,9 @@
 	public static final String ATT_LEARNING_OBJECT = "cpPackage";
 	public static final String ATTR_RESOURCE_REVIEW_URL = "resourceItemReviewUrl";
 	public static final String ATTR_RESOURCE = "resource";
-	
+	public static final String ATTR_RUN_AUTO = "runAuto";
+	public static final String ATTR_RESOURCE_ITEM_UID = "itemUid";
+	public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
 	public static final String ERROR_MSG_URL_BLANK = "error.resource.item.url.blank";
@@ -68,10 +70,6 @@
 	public static final String ERROR_MSG_INVALID_URL = "error.resource.item.invalid.url";
 	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
 	
-	//mode
-	public static final String MODE = "mode";
-	public static final String AUTHOR_MODE = "author_mode";
-	public static final String MONITOR_MODE = "monitor_mode";
 	
 
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java	(.../ResourceItemVisitDAO.java)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java	(.../ResourceItemVisitDAO.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -29,5 +29,5 @@
 
 	public ResourceItemVisitLog getResourceItemLog(Long itemUid,Long userId);
 
-	public int getUserViewLogCount(Long userUid);
+	public int getUserViewLogCount(Long sessionId, Long userUid);
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
===================================================================
diff -u -rc8f42df13810316bf19cfe3239ad45fe881b886e -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision c8f42df13810316bf19cfe3239ad45fe881b886e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -32,7 +32,7 @@
 	
 	private static final String FIND_BY_ITEM_AND_USER = "from " + ResourceItemVisitLog.class.getName() + " as r where r.user.userId = ? and r.resourceItem.uid=?";
 	private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from " + ResourceItemVisitLog.class.getName() 
-			+ " as r where r.user.userId =?";
+			+ " as r where  r.sessionId=? and  r.user.userId =?";
 
 	public ResourceItemVisitLog getResourceItemLog(Long itemUid,Long userId){
 		List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid});
@@ -41,8 +41,8 @@
 		return (ResourceItemVisitLog) list.get(0);
 	}
 
-	public int getUserViewLogCount(Long userUid) {
-		List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER,new Object[]{userUid});
+	public int getUserViewLogCount(Long toolSessionId ,Long userUid) {
+		List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER,new Object[]{toolSessionId, 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/model/ResourceItemVisitLog.hbm.xml
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml	(.../ResourceItemVisitLog.hbm.xml)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -61,6 +61,14 @@
             column="complete"
         />
 
+        <property
+            name="sessionId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="session_id"
+        />
+
         <!--
             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
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	(.../ResourceItemVisitLog.java)	(revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java	(.../ResourceItemVisitLog.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -39,6 +39,8 @@
 	private ResourceItem resourceItem;
 	private boolean complete;
 	private Date accessDate;
+	private Long sessionId;
+	
 	/**
 	 * @hibernate.property column="access_date"
 	 * @return
@@ -92,6 +94,18 @@
 	public void setComplete(boolean complete) {
 		this.complete = complete;
 	}
+	/**
+	 * @hibernate.property column="session_id"
+	 * @return
+	 */
+	public Long getSessionId() {
+		return sessionId;
+	}
+	public void setSessionId(Long sessionId) {
+		this.sessionId = sessionId;
+	}
+
+
 	
 	
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -80,8 +80,8 @@
 	void saveOrUpdateResourceSession(ResourceSession resSession);
 	
 	void retrieveComplete(List<ResourceItem> resourceItemList, ResourceUser user);
-	void setItemComplete(Long resourceItemUid, Long userId);
-	void setItemAccess(Long resourceItemUid, Long userId);
+	void setItemComplete(Long resourceItemUid, Long userId , Long sessionId);
+	void setItemAccess(Long resourceItemUid, Long userId, Long sessionId);
 	/**
 	 * the reqired number minus the count of view of the given user.
 	 * @param userUid
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -rfaa2c4cb1a645e2c7bdc48e57717dae8decf8783 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision faa2c4cb1a645e2c7bdc48e57717dae8decf8783)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -326,22 +326,23 @@
 	}
 
 
-	public void setItemComplete(Long resourceItemUid, Long userId) {
+	public void setItemComplete(Long resourceItemUid, Long userId, Long sessionId) {
 		ResourceItemVisitLog log = resourceItemVisitDao.getResourceItemLog(resourceItemUid,userId);
 		if(log == null){
 			log = new ResourceItemVisitLog();
 			ResourceItem item = resourceItemDao.getByUid(resourceItemUid);
 			log.setResourceItem(item);
 			ResourceUser user = resourceUserDao.getUserByUserID(userId); 
 			log.setUser(user);
+			log.setSessionId(sessionId);
 			log.setAccessDate(new Timestamp(new Date().getTime()));
 		}
 		log.setComplete(true);
 		resourceItemVisitDao.saveObject(log);
 	}
 
 
-	public void setItemAccess(Long resourceItemUid, Long userId){
+	public void setItemAccess(Long resourceItemUid, Long userId, Long sessionId){
 		ResourceItemVisitLog log = resourceItemVisitDao.getResourceItemLog(resourceItemUid,userId);
 		if(log == null){
 			log = new ResourceItemVisitLog();
@@ -350,6 +351,7 @@
 			ResourceUser user = resourceUserDao.getUserByUserID(userId); 
 			log.setUser(user);
 			log.setComplete(false);
+			log.setSessionId(sessionId);
 			log.setAccessDate(new Timestamp(new Date().getTime()));
 			resourceItemVisitDao.saveObject(log);
 		}
@@ -373,7 +375,7 @@
 	}
 
 	public int checkMiniView(Long toolSessionId, Long userUid) {
-		int miniView = resourceItemVisitDao.getUserViewLogCount(userUid);
+		int miniView = resourceItemVisitDao.getUserViewLogCount(toolSessionId,userUid);
 		ResourceSession session = resourceSessionDao.getSessionBySessionId(toolSessionId);
 		if(session == null){
 			log.error("Failed get session by ID [" + toolSessionId + "]");
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -56,6 +56,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+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.ResourceAttachment;
@@ -93,8 +94,8 @@
 		
 		String param = mapping.getParameter();
 		//-----------------------Resource Author function ---------------------------
+		request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR);
 		if(param.equals("start")){
-			request.getSession().setAttribute(ResourceConstants.MODE,ResourceConstants.AUTHOR_MODE);
 			return start(mapping, form, request, response);
 		}
 	  	if (param.equals("initPage")) {
@@ -460,8 +461,8 @@
 		ActionMessages messages = new ActionMessages();
 		messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("authoring.save.success"));
 		this.addMessages(request,messages);
-    	String mode = (String) request.getSession().getAttribute(ResourceConstants.MODE);
-    	if(StringUtils.equals(mode,ResourceConstants.AUTHOR_MODE))
+		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+    	if(mode.isAuthor())
     		return mapping.findForward("author");
     	else
     		return mapping.findForward("monitor");
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -rfaa2c4cb1a645e2c7bdc48e57717dae8decf8783 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision faa2c4cb1a645e2c7bdc48e57717dae8decf8783)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -76,6 +76,7 @@
 			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 		
 		String param = mapping.getParameter();
+		request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.LEARNER);
 		//-----------------------Resource Learner function ---------------------------
 		if(param.equals("start")){
 			return start(mapping, form, request, response);
@@ -94,6 +95,11 @@
 	}
 	
 	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		//auto run mode, when use finish the only one resource item, mark it as complete then finish this activity as well.
+		Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		if(resourceItemUid != null)
+			doComplete(request);
+		
 		Long sessionId = (Long) request.getSession().getAttribute(
 				AttributeNames.PARAM_TOOL_SESSION_ID);
 		HttpSession ss = SessionManager.getSession();
@@ -110,44 +116,29 @@
 			return mapping.getInputForward();
 			
 		}
-		ToolAccessMode mode = (ToolAccessMode) request.getSession()
-				.getAttribute(AttributeNames.ATTR_MODE);
-		if (mode == ToolAccessMode.LEARNER) {
+		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
+		if (mode.isLearner()) {
 			// 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);
+				request.setAttribute(ResourceConstants.ATTR_NEXT_ACTIVITY_URL,nextActivityUrl);
+				return mapping.findForward("finish");
 			} catch (ResourceApplicationException e) {
 				log.error("Failed get next activity url:" + e.getMessage());
 			}
-			return null;
 		}
 
 		return mapping.findForward("success");
 	}
 
 	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		
-		Long resourceItemUid = 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(resourceItemUid,new Long(user.getUserID().intValue()));
-		
-		//set resource item complete tag
-		List<ResourceItem> resourceItemList = getResourceItemList(request);
-		for(ResourceItem item:resourceItemList){
-			if(item.getUid().equals(resourceItemUid)){
-				item.setComplete(true);
-				break;
-			}
-		}
+		doComplete(request);
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
+
+	
 	/**
 	 * Save file or url resource item into database.
 	 * @param mapping
@@ -265,6 +256,20 @@
 		service.retrieveComplete(resourceItemList, resourceUser);
 		
 		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE,resource);
+		
+		//check whether there is only one resource item and run auto flag is true or not.
+		boolean runAuto = false;
+		int itemsNumber = 0;
+		if(resource.getResourceItems() != null){
+			itemsNumber = resource.getResourceItems().size();
+			if(resource.isRunAuto() && itemsNumber == 1){
+				runAuto = true;
+				ResourceItem item = (ResourceItem) resource.getResourceItems().iterator().next();
+				request.setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,item.getUid());
+			}
+		}
+		request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,new Boolean(runAuto));
+		
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	//*************************************************************************************
@@ -356,6 +361,27 @@
 		}
 		return errors;
 	}
+	/**
+	 * Set complete flag for given resource item.
+	 * @param request
+	 */
+	private void doComplete(HttpServletRequest request) {
+		Long resourceItemUid = 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);
+		Long sessionId =  (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		service.setItemComplete(resourceItemUid,new Long(user.getUserID().intValue()),sessionId);
+		
+		//set resource item complete tag
+		List<ResourceItem> resourceItemList = getResourceItemList(request);
+		for(ResourceItem item:resourceItemList){
+			if(item.getUid().equals(resourceItemUid)){
+				item.setComplete(true);
+				break;
+			}
+		}
+	}
 
-
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -39,6 +39,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
@@ -81,22 +82,26 @@
 	}
 
 	private ActionForward reviewItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
-		Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
 		ResourceItem item = null;
-		if(itemIdx != -1){
+		if(mode.isAuthor()){
+			int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
 			//authoring: does not save item yet, so only has ItemList from session and identity by Index
 			List<ResourceItem> resourceList = getResourceItemList(request);
 			item = resourceList.get(itemIdx);
-		}else if(itemUid != null){
+		}else if(mode.isLearner()){
+			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+			//save itemUid to HttpSession
+			request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,itemUid);
+			Long sessionId =  (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
 			//learning, list from database, so get item by Uid
 //			get back the resource and item list and display them on page
 			IResourceService service = getResourceService();			
 			item = service.getResourceItemByUid(itemUid);
 			HttpSession ss = SessionManager.getSession();
 			//get back login user DTO
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			service.setItemAccess(itemUid,new Long(user.getUserID().intValue()));
+			service.setItemAccess(itemUid,new Long(user.getUserID().intValue()),sessionId);
 		}
 		if(item != null){
 			Set instructions = item.getItemInstructions();
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -12,9 +12,20 @@
 		
 		function finish()
 		{
-			window.parent.opener.location.href='urlcontent.do?method=setContentDone&sessionId=27534&urlId=7365&mode=resume&actor=learner';
-			window.parent.opener=null;
-			window.parent.close();
+			if(${mode.learner}){
+			   var reqIDVar = new Date();
+			   //if auto run mode, the opener will be null
+			   if(window.parent.opener != null) 
+				   window.parent.opener.parent.frames['learningFrame'].location.href="<c:url value="/learning/completeItem.do"/>?itemUid=${itemUid}&reqID="+reqIDVar.getTime();
+			   else{
+			   //set complete flag and finish this activity as well.
+			       window.parent.opener.parent.frames['learningFrame'].location.href='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&itemUid=${itemUid}"/>';
+			   }
+			}
+		   if(window.parent.opener != null) {
+				window.parent.opener=null;
+				window.parent.close();
+			}
 		}
 
 		function finishIns(){
Index: lams_tool_larsrc/web/pages/learning/finish.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/learning/finish.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/learning/finish.jsp	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -0,0 +1,12 @@
+<%@ include file="/common/taglibs.jsp"%>
+<%-- This page just for : redir finish page to parent rather that part of the frame --%>
+<html>
+	<body>
+	<script type="text/javascript">
+	<!--
+		parent.location = ${nextActivityUrl};
+	-->        
+    </script>
+	
+	<body>
+</html>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rfaa2c4cb1a645e2c7bdc48e57717dae8decf8783 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision faa2c4cb1a645e2c7bdc48e57717dae8decf8783)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -20,7 +20,7 @@
 		}
 		function checkNew(){
  		    var reqIDVar = new Date();
-			parent.frames['learningFrame'].location= "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+			parent.frames['learningFrame'].location= "<c:url value="/pages/learning/learning.jsp"/>?reqID="+reqIDVar.getTime();
  		    return false;
 		}
 		function viewItem(itemUid){
@@ -32,16 +32,13 @@
 			return false;
 		}
 		function finishSession(){
-			parent.location ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&mode=learner"/>';
+			parent.frames['learningFrame'].location ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
 	-->        
     </script>
 </head>
 <body>
-	<script type="text/javascript">
-		alert("enter");
-    </script>
 	<table border="0" align="center" class="forms" width="95%">
 		<tr>
 			<td>
Index: lams_tool_larsrc/web/pages/learning/start.jsp
===================================================================
diff -u -r6b786496dac3e368e8a686373ac4e3cdee391c47 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 6b786496dac3e368e8a686373ac4e3cdee391c47)
+++ lams_tool_larsrc/web/pages/learning/start.jsp	(.../start.jsp)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -1,12 +1,18 @@
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 <html>
-<body>
-<form action="<c:url value='/learning/init.do'/>" method="post" id="startForm">
-	<input type="hidden" name="toolContentID" value="${toolContentID}"/>
-</form>
+	<body>
 
-<script type="text/javascript">
-document.getElementById("startForm").submit();
-</script>
-<body>
-</html>
\ No newline at end of file
+		<c:choose>
+			<c:when test="${runAuto}">
+				<script type="text/javascript">
+					document.location = "<c:url value="/reviewItem.do"/>?itemUid=${itemUid}";
+				</script>
+			</c:when>
+			<c:otherwise>
+				<script type="text/javascript">
+					document.location = "<c:url value="/pages/learning/learningframe.jsp"/>"
+				</script>
+			</c:otherwise>
+		</c:choose>
+	<body>
+</html>
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
diff -u -rfaa2c4cb1a645e2c7bdc48e57717dae8decf8783 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision faa2c4cb1a645e2c7bdc48e57717dae8decf8783)
+++ lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -1,11 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
 <html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
 	</head>
 	<body>
 		<script type="text/javascript">
-			parent.frames['learningFrame'].location  = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}";
+			var reqIDVar = new Date();
+			parent.frames['learningFrame'].location  = "${tool}/pages/learning/learning.jsp?reqID="+reqIDVar.getTime();
 		</script>
 		<div style="align:center">
 			<c:if test="${addType == 1}">