Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
===================================================================
diff -u -r2bef59c032438311b6dfadac874b0a7ee4cb72de -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	(.../LearningAction.java)	(revision 2bef59c032438311b6dfadac874b0a7ee4cb72de)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	(.../LearningAction.java)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -44,6 +44,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.ActionRedirect;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -59,6 +60,7 @@
 import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeItemComparator;
 import org.lamsfoundation.lams.tool.commonCartridge.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -111,7 +113,7 @@
 	    HttpServletResponse response) {
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	// save toolContentID into HTTPSession
@@ -145,6 +147,7 @@
 
 	// check whether there is only one commonCartridge item and run auto flag is true or not.
 	boolean runAuto = false;
+	Long runAutoItemUid = null;
 	int itemsNumber = 0;
 	if (commonCartridge.getCommonCartridgeItems() != null) {
 	    itemsNumber = commonCartridge.getCommonCartridgeItems().size();
@@ -154,7 +157,7 @@
 		// only visible item can be run auto.
 		if (!item.isHide()) {
 		    runAuto = true;
-		    request.setAttribute(CommonCartridgeConstants.ATTR_RESOURCE_ITEM_UID, item.getUid());
+		    runAutoItemUid = item.getUid();
 		}
 	    }
 	}
@@ -222,7 +225,17 @@
 	}
 	sessionMap.put(CommonCartridgeConstants.ATTR_RESOURCE, commonCartridge);
 
-	return mapping.findForward(CommonCartridgeConstants.SUCCESS);
+	if (runAuto) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("viewItem"));
+	    redirect.addParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	    redirect.addParameter(CommonCartridgeConstants.ATTR_TOOL_SESSION_ID, sessionId);
+	    redirect.addParameter(CommonCartridgeConstants.ATTR_RESOURCE_ITEM_UID, runAutoItemUid);
+	    redirect.addParameter(CentralConstants.PARAM_MODE, mode.toString());
+	    return redirect;
+	    
+	} else {
+	    return mapping.findForward(CommonCartridgeConstants.SUCCESS);
+	}
     }
 
     /**
@@ -239,7 +252,7 @@
 
 	// get back SessionMap
 	String sessionMapID = request.getParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	// get mode and ToolSessionID from sessionMAP
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -306,7 +319,7 @@
 	// get the existing reflection entry
 	ICommonCartridgeService submitFilesService = getCommonCartridgeService();
 
-	SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> map = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 		CommonCartridgeConstants.TOOL_SIGNATURE, user.getUserID());
@@ -333,7 +346,7 @@
 	Integer userId = refForm.getUserID();
 
 	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	ICommonCartridgeService service = getCommonCartridgeService();
@@ -360,7 +373,7 @@
     // Private method
     // *************************************************************************************
     private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) {
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	HttpSession ss = SessionManager.getSession();
@@ -410,7 +423,7 @@
      * @param name
      * @return
      */
-    private List getListFromSession(SessionMap sessionMap, String name) {
+    private List getListFromSession(SessionMap<String, Object> sessionMap, String name) {
 	List list = (List) sessionMap.get(name);
 	if (list == null) {
 	    list = new ArrayList();
@@ -454,7 +467,7 @@
     private void doComplete(HttpServletRequest request) {
 	// get back sessionMap
 	String sessionMapID = request.getParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	Long commonCartridgeItemUid = new Long(request.getParameter(CommonCartridgeConstants.PARAM_RESOURCE_ITEM_UID));
 	ICommonCartridgeService service = getCommonCartridgeService();
Index: lams_tool_imscc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r541434d3fc00f472166179add1f533967227fbab -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_imscc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 541434d3fc00f472166179add1f533967227fbab)
+++ lams_tool_imscc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -184,7 +184,8 @@
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.commonCartridge.web.action.LearningAction"
 			parameter="start" >
-			<forward name="success" path="/pages/learning/start.jsp" />
+			<forward name="viewItem" path="/reviewItem.do" redirect="true"/>
+			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />		
 		</action>
 		<!-- <action path="/learning/completeItem"
Fisheye: Tag 19a48bf35052a72202cc4867e68d5666f0d05898 refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/itemreview/initnav.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -rf68518e526127e0f1f096ac9f55bb693861b5050 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_imscc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision f68518e526127e0f1f096ac9f55bb693861b5050)
+++ lams_tool_imscc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -3,12 +3,12 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 
-	<c:set var="initNavUrl"><c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}</c:set>
+	<c:set var="nextInstructionUrl"><c:url value="/nextInstruction.do"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}</c:set>
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 		
 	<script type="text/javascript">
 		$(document).ready(function(){
-			$('#headerFrame').load('${initNavUrl}');
+			$('#headerFrame').load('${nextInstructionUrl}');
 		});
 		
 		function setIframeHeight() {
Fisheye: Tag 19a48bf35052a72202cc4867e68d5666f0d05898 refers to a dead (removed) revision in file `lams_tool_imscc/web/pages/learning/start.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -ra2b7aa6bb54db89884368a57361062202496095e -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision a2b7aa6bb54db89884368a57361062202496095e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -48,6 +48,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.ActionRedirect;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -134,17 +135,13 @@
     }
 
     /**
-     * Read resource data from database and put them into HttpSession. It will redirect to init.do directly after this
-     * method run successfully.
      *
-     * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-     *
      */
     private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	// save toolContentID into HTTPSession
@@ -178,6 +175,7 @@
 
 	// check whether there is only one resource item and run auto flag is true or not.
 	boolean runAuto = false;
+	Long runAutoItemUid = null;
 	int itemsNumber = 0;
 	if (resource.getResourceItems() != null) {
 	    itemsNumber = resource.getResourceItems().size();
@@ -186,7 +184,7 @@
 		// only visible item can be run auto.
 		if (!item.isHide()) {
 		    runAuto = true;
-		    request.setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID, item.getUid());
+		    runAutoItemUid = item.getUid();
 		}
 	    }
 	}
@@ -254,7 +252,17 @@
 	}
 	sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource);
 
-	return mapping.findForward(ResourceConstants.SUCCESS);
+	if (runAuto) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("viewItem"));
+	    redirect.addParameter(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	    redirect.addParameter(ResourceConstants.ATTR_TOOL_SESSION_ID, sessionId);
+	    redirect.addParameter(ResourceConstants.ATTR_RESOURCE_ITEM_UID, runAutoItemUid);
+	    return redirect;
+	    
+	} else {
+	    return mapping.findForward(ResourceConstants.SUCCESS);
+	}
+	
     }
 
     /**
@@ -271,7 +279,7 @@
 
 	// get back SessionMap
 	String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	// get mode and ToolSessionID from sessionMAP
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -323,7 +331,7 @@
 	    HttpServletResponse response) {
 	// get back SessionMap
 	String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
 	Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID);
@@ -428,7 +436,7 @@
 	// get the existing reflection entry
 	IResourceService submitFilesService = getResourceService();
 
-	SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> map = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 		ResourceConstants.TOOL_SIGNATURE, user.getUserID());
@@ -455,7 +463,7 @@
 	Integer userId = refForm.getUserID();
 
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	IResourceService service = getResourceService();
@@ -482,7 +490,7 @@
     // Private method
     // *************************************************************************************
     private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) {
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	HttpSession ss = SessionManager.getSession();
@@ -518,7 +526,7 @@
      * @param request
      * @return
      */
-    private SortedSet<ResourceItem> getResourceItemList(SessionMap sessionMap) {
+    private SortedSet<ResourceItem> getResourceItemList(SessionMap<String, Object> sessionMap) {
 	SortedSet<ResourceItem> list = (SortedSet<ResourceItem>) sessionMap
 		.get(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
 	if (list == null) {
@@ -653,7 +661,7 @@
     private void doComplete(HttpServletRequest request) {
 	// get back sessionMap
 	String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
 	IResourceService service = getResourceService();
Index: lams_tool_larsrc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_larsrc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_larsrc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -202,7 +202,8 @@
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="start" >
-			<forward name="success" path="/pages/learning/start.jsp" />
+			<forward name="success" path="/pages/learning/learning.jsp" />
+			<forward name="viewItem" path="/reviewItem.do" redirect="true"/>
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />	
 		</action>
 		<!-- <action path="/learning/completeItem"
Fisheye: Tag 19a48bf35052a72202cc4867e68d5666f0d05898 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/learning/start.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java	(.../LearningAction.java)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -32,6 +32,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
@@ -64,9 +65,7 @@
 
 /**
  *
- * @author Steve.Ni
- *
- * @version $Revision$
+ * @author Andrey Balan
  */
 public class LearningAction extends Action {
 
@@ -81,9 +80,6 @@
 	if (param.equals("start")) {
 	    return start(mapping, form, request, response);
 	}
-	if (param.equals("initPage")) {
-	    return initPage(mapping, form, request, response);
-	}
 	if (param.equals("saveUserSpreadsheet")) {
 	    return saveUserSpreadsheet(mapping, form, request, response);
 	}
@@ -104,17 +100,15 @@
 
     /**
      * Read spreadsheet data from database and put them into HttpSession. It will redirect to init.do directly after
-     * this
-     * method run successfully.
+     * this method run successfully.
      * 
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
-     * 
      */
     private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	//initial Session Map 
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	//save toolContentID into HTTPSession
@@ -126,7 +120,7 @@
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
 	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 
-//		get back the spreadsheet and item list and display them on page
+	//get back the spreadsheet and item list and display them on page
 	ISpreadsheetService service = getSpreadsheetService();
 	SpreadsheetUser spreadsheetUser = null;
 	if (mode != null && mode.isTeacher()) {
@@ -172,66 +166,37 @@
 
 	//add define later support
 	if (spreadsheet.isDefineLater()) {
-	    return mapping.findForward("defineLater");
+	    return mapping.findForward(SpreadsheetConstants.DEFINE_LATER);
 	}
 
-	//set contentInUse flag to true!
-	spreadsheet.setContentInUse(true);
-	spreadsheet.setDefineLater(false);
-	service.saveOrUpdateSpreadsheet(spreadsheet);
-
-	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
-		request, getServlet().getServletContext());
-	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
-
-	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
-
-	return mapping.findForward(SpreadsheetConstants.SUCCESS);
-    }
-
-    /**
-     * Display same entire authoring page content from HttpSession variable.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws ServletException
-     */
-    private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException {
-	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-//		SpreadsheetForm existForm = (SpreadsheetForm) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE_FORM);
-
-	//get mode and ToolSessionID from sessionMAP
-	ToolAccessMode mode = getAccessMode(request);
-	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-	//load up learner changes in spreadsheet if such option is activated in spreadsheet
-	ISpreadsheetService service = getSpreadsheetService();
-	Spreadsheet spreadsheet = (Spreadsheet) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE);
-	SpreadsheetUser spreadsheetUser = getCurrentUser(service, sessionId);
+	//set contentInUse flag to true
+	if (!spreadsheet.isContentInUse()) {
+	    spreadsheet.setContentInUse(true);
+	    service.saveOrUpdateSpreadsheet(spreadsheet);
+	}
+	
+	String code;
 	if (spreadsheet.isLearnerAllowedToSave() && !mode.isTeacher()
 		&& (spreadsheetUser.getUserModifiedSpreadsheet() != null)) {
-	    spreadsheet.setCode(spreadsheetUser.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet());
+	    code = spreadsheetUser.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet();
+	} else {
+	    code = spreadsheet.getCode();
 	}
+	sessionMap.put(SpreadsheetConstants.ATTR_CODE, StringEscapeUtils.escapeHtml(code));
+	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
 
-	SpreadsheetForm spreadsheetForm = (SpreadsheetForm) form;
-	spreadsheetForm.setSpreadsheet(spreadsheet);
-
 	if ((spreadsheetUser != null) && (spreadsheetUser.getUserModifiedSpreadsheet() != null)
 		&& (spreadsheetUser.getUserModifiedSpreadsheet().getMark() != null)
 		&& (spreadsheetUser.getUserModifiedSpreadsheet().getMark().getDateMarksReleased() != null)) {
 	    request.setAttribute(SpreadsheetConstants.ATTR_USER_MARK,
 		    spreadsheetUser.getUserModifiedSpreadsheet().getMark());
 	}
 
-	if (mode.isAuthor()) {
-	    return mapping.findForward(SpreadsheetConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(SpreadsheetConstants.DEFINE_LATER);
-	}
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, getServlet().getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
+	return mapping.findForward(SpreadsheetConstants.SUCCESS);
     }
 
     /**
@@ -248,7 +213,7 @@
 
 	//get back SessionMap
 	String sessionMapID = request.getParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	//get mode and ToolSessionID from sessionMAP
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
@@ -264,7 +229,7 @@
 
 	    SpreadsheetUser spreadsheetUser = getCurrentUser(service, sessionId);
 	    UserModifiedSpreadsheet userModifiedSpreadsheet = new UserModifiedSpreadsheet();
-	    String code = ((SpreadsheetForm) form).getSpreadsheet().getCode();
+	    String code = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_CODE);
 	    userModifiedSpreadsheet.setUserModifiedSpreadsheet(code);
 	    spreadsheetUser.setUserModifiedSpreadsheet(userModifiedSpreadsheet);
 	    service.saveOrUpdateUser(spreadsheetUser);
@@ -277,7 +242,7 @@
 	} else if ("continueReflect".equals(typeOfAction)) {
 	    conf = mapping.findForwardConfig("continueReflect");
 	} else {
-	    conf = mapping.findForwardConfig("initPage");
+	    conf = mapping.findForwardConfig("start");
 	}
 	ActionRedirect redirect = new ActionRedirect(conf);
 	redirect.addParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMapID);
@@ -300,7 +265,7 @@
 
 	//get back SessionMap
 	String sessionMapID = request.getParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 
 	//get mode and ToolSessionID from sessionMAP
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -347,7 +312,7 @@
 //		 get the existing reflection entry
 	ISpreadsheetService submitFilesService = getSpreadsheetService();
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long toolSessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 		SpreadsheetConstants.TOOL_SIGNATURE, user.getUserID());
@@ -374,7 +339,7 @@
 	Integer userId = refForm.getUserID();
 
 	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	ISpreadsheetService service = getSpreadsheetService();
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -57,54 +57,6 @@
 
 	return mapping.findForward(SpreadsheetConstants.ERROR);
     }
-//	/**
-//	 * Open url in popup window page.
-//	 * @param mapping
-//	 * @param form
-//	 * @param request
-//	 * @param response
-//	 * @return
-//	 */
-//	private ActionForward openUrlPopup(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-//		String url = request.getParameter(SpreadsheetConstants.PARAM_OPEN_URL_POPUP);
-//		String title = request.getParameter(SpreadsheetConstants.PARAM_TITLE);
-//		request.setAttribute(SpreadsheetConstants.PARAM_OPEN_URL_POPUP,url);
-//		request.setAttribute(SpreadsheetConstants.PARAM_TITLE,title);
-//		return mapping.findForward(SpreadsheetConstants.SUCCESS);
-//	}
-//	/**
-//	 * Return next instrucion to page. It need four input parameters, mode, itemIndex or itemUid, and insIdx.
-//	 * @param mapping
-//	 * @param form
-//	 * @param request
-//	 * @param response
-//	 * @return
-//	 */
-//	private ActionForward nextInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-//		String mode = request.getParameter(AttributeNames.ATTR_MODE);
-//
-//		String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
-//		SessionMap sesionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
-//
-//		int currIns = NumberUtils.stringToInt(request.getParameter(SpreadsheetConstants.PARAM_CURRENT_INSTRUCTION_INDEX),0);
-//
-//		//For Learner upload item, its instruction will display description/comment fields in ReosourceItem.
-//		if(!item.isCreateByAuthor()){
-//			List<SpreadsheetItemInstruction> navItems = new ArrayList<SpreadsheetItemInstruction>(1);
-//			//create a new instruction and put SpreadsheetItem description into it: just for display use.
-//			SpreadsheetItemInstruction ins = new SpreadsheetItemInstruction();
-//			ins.setSequenceId(1);
-//			ins.setDescription(item.getDescription());
-//			navItems.add(ins);
-//			navDto.setAllInstructions(navItems);
-//			instructions.add(ins);
-//		}else{
-//			navDto.setAllInstructions(new ArrayList(instructions));
-//		}
-//
-//		request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID,sessionMapID);
-//		return mapping.findForward(SpreadsheetConstants.SUCCESS);
-//	}
 
     /**
      * Display main frame to display instrcution and item content.
Index: lams_tool_spreadsheet/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_spreadsheet/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -95,27 +95,19 @@
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.LearningAction"
-			parameter="start">
-			<forward name="success" path="/pages/learning/start.jsp" />
-			<forward name="defineLater" path="/pages/learning/definelater.jsp" />		
-		</action>
-		<action path="/learning/init"
-			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.LearningAction"
-			parameter="initPage"
-			name="spreadsheetForm" 
+			parameter="start"
 			validate="false" 
-			scope="request">			
+			scope="request">
 			<forward name="success" path="/pages/learning/learning.jsp" />
-			<forward name="definelater" path="/pages/learning/definelater.jsp" />			
+			<forward name="definelater" path="/pages/learning/definelater.jsp" />		
 		</action>
 		<action path="/learning/saveUserSpreadsheet"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.LearningAction"
-			parameter="saveUserSpreadsheet" 			
-			name="spreadsheetForm" 
+			parameter="saveUserSpreadsheet"
 			validate="false" 
 			input="/pages/learning/learning.jsp" 
 			scope="request">
-			<forward name="initPage" redirect="true" path="/learning/init.do" />
+			<forward name="start" redirect="true" path="/learning/start.do" />
 			<forward name="continueReflect" redirect="true" path="/learning/newReflection.do" />			
 			<forward name="finishSession" redirect="true" path="/learning/finish.do" />
 		</action>
Index: lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html	(.../spreadsheet_offline.html)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html	(.../spreadsheet_offline.html)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -60,8 +60,8 @@
 <div id="source" align="center">
 
   <script>
-	var code = parent.document.getElementById("spreadsheet.code").value;
-	loadScriptFileAndCode(code);
+	var spreadsheetCode = parent.document.getElementById("spreadsheet-code").value;
+	loadScriptFileAndCode(spreadsheetCode);
   </script>
 
 </div>
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -30,9 +30,10 @@
         
     	function onSubmitHandler() {
         	var code = window.frames["externalSpreadsheet"].cellsToJS();
- 			document.getElementById("spreadsheet.code").value = code;
+ 			document.getElementById("spreadsheet-code").value = code;
          	return true;
     	}
+    	var spreadsheetCode = "${sessionMap.code}";
         
     </script>
 	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
Index: lams_tool_spreadsheet/web/pages/authoring/basic.jsp
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<html:hidden property="spreadsheet.code" styleId="spreadsheet.code"/>
+<html:hidden property="spreadsheet.code" styleId="spreadsheet-code"/>
 		
 <!-- Basic Tab Content -->
 <div class="form-group">
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -r0ef854d41e3d8fb6d65ec3949f23968c17399736 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0ef854d41e3d8fb6d65ec3949f23968c17399736)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -1,50 +1,39 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+<c:set var="spreadsheet" value="${sessionMap.spreadsheet}" />
+<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+<c:set var="language" value="${pageContext.response.locale.language}" />
 <%@ page import="org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants"%>
+
 <lams:html>
 <lams:head>
 	<title>
 		<fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
-
-	<%-- param has higher level for request attribute --%>
-	<c:if test="${not empty param.sessionMapID}">
-		<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	</c:if>
-
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	<c:set var="mode" value="${sessionMap.mode}" />
-	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
-	<c:set var="spreadsheet" value="${sessionMap.spreadsheet}" />
-	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
-	<c:set var="language" value="${pageContext.response.locale.language}" />
 	
 	<script type="text/javascript">
-	<!--
 		function finishSession(){
 			document.getElementById("finishButton").disabled = true;
-        	//var url = '<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&toolSessionID=${toolSessionID}"/>';
         	saveUserSpreadsheet("finishSession");
 			return false;
 		}
 		
 		function continueReflect(){
-			//var url = '<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 			saveUserSpreadsheet("continueReflect");
 		}
 		
 		//save changes made in spreadsheet
 		function saveUserSpreadsheet(typeOfAction){
 			var code = window.frames["externalSpreadsheet"].cellsToJS();
-			document.getElementById("spreadsheet.code").value = code;
-		
-			$("#learningForm").attr('action', '<c:url value="/learning/saveUserSpreadsheet.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&typeOfAction="/>' + typeOfAction);
-		    $("#learningForm").submit();
-		}
-		
-	-->        
+			code = encodeURIComponent(code);
+		    var url = '<c:url value="/learning/saveUserSpreadsheet.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&typeOfAction=' + typeOfAction + '&code=' + code;
+		    location.href = url;
+		}  
     </script>
 </lams:head>
 <body class="stripes">
@@ -69,9 +58,7 @@
 			<c:out value="${spreadsheet.instructions}" escapeXml="false"/>
 		</p>
 
-		<html:form action="learning/saveUserSpreadsheet" method="post" styleId="learningForm" enctype="multipart/form-data">
-			<html:hidden property="spreadsheet.code" styleId="spreadsheet.code"/>	
-		</html:form>
+		<input type=hidden name="spreadsheetCode" id="spreadsheet-code" value="${sessionMap.code}"/>
 		<br>
 		
 		<c:if test="${spreadsheet.markingEnabled}">
Fisheye: Tag 19a48bf35052a72202cc4867e68d5666f0d05898 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/learning/start.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -45,7 +45,7 @@
 				</lams:Alert>
 			</c:when>
 			<c:otherwise>
-			    <html:hidden property="spreadsheet.code" styleId="spreadsheet.code" value="${formBean.code}"/>	
+			    <html:hidden property="spreadsheetCode" styleId="spreadsheet-code" value="${formBean.code}"/>	
 				<iframe
 					id="externalSpreadsheet" name="externalSpreadsheet" src="${spreadsheetURL}"
 					style="width:99%" frameborder="no" height="385px"
Index: lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp
===================================================================
diff -u -r0acc4ca56f472b81307b4936c0cc797b71d5cf85 -r19a48bf35052a72202cc4867e68d5666f0d05898
--- lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp	(.../reviewitem.jsp)	(revision 0acc4ca56f472b81307b4936c0cc797b71d5cf85)
+++ lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp	(.../reviewitem.jsp)	(revision 19a48bf35052a72202cc4867e68d5666f0d05898)
@@ -22,7 +22,7 @@
 					</lams:Alert>
 				</c:when>
 				<c:otherwise>
-				    <html:hidden property="spreadsheet.code" styleId="spreadsheet.code" value="${code}"/>	
+				    <html:hidden property="spreadsheetCode" styleId="spreadsheet-code" value="${code}"/>	
 					<iframe
 						id="externalSpreadsheet" name="externalSpreadsheet" src="${spreadsheetURL}"
 						style="width:99%;" frameborder="no" height="385px"
Fisheye: Tag 19a48bf35052a72202cc4867e68d5666f0d05898 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learning/start.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?