Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java =================================================================== diff -u -rdbea7168e28392b806b1f6f607b7bcdbb647597a -red9b148a60d17bfcf4fc8033ce313b7f8d2ab652 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision dbea7168e28392b806b1f6f607b7bcdbb647597a) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision ed9b148a60d17bfcf4fc8033ce313b7f8d2ab652) @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -48,6 +50,7 @@ import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction; import org.lamsfoundation.lams.tool.rsrc.service.IResourceService; +import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -211,7 +214,7 @@ if(ResourceConstants.MODE_AUTHOR_SESSION.equals(mode)){ int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),0); //authoring: does not save item yet, so only has ItemList from session and identity by Index - List resourceList = getResourceItemList(sessionMap); + List resourceList = new ArrayList(getResourceItemList(sessionMap)); item = resourceList.get(itemIdx); }else{ Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID)); @@ -276,23 +279,13 @@ * @param request * @return */ - private List getResourceItemList(SessionMap sessionMap) { - return getListFromSession(sessionMap,ResourceConstants.ATTR_RESOURCE_ITEM_LIST); - } - /** - * Get java.util.List from HttpSession by given name. - * - * @param request - * @param name - * @return - */ - private List getListFromSession(SessionMap sessionMap,String name) { - List list = (List) sessionMap.get(name); + private SortedSet getResourceItemList(SessionMap sessionMap) { + SortedSet list = (SortedSet) sessionMap.get(ResourceConstants.ATTR_RESOURCE_ITEM_LIST); if(list == null){ - list = new ArrayList(); - sessionMap.put(name,list); + list = new TreeSet(new ResourceItemComparator()); + sessionMap.put(ResourceConstants.ATTR_RESOURCE_ITEM_LIST,list); } return list; - } + } } Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp =================================================================== diff -u -r9cd6be516aa221a17b218c27819ed892cd60e35f -red9b148a60d17bfcf4fc8033ce313b7f8d2ab652 --- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision 9cd6be516aa221a17b218c27819ed892cd60e35f) +++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision ed9b148a60d17bfcf4fc8033ce313b7f8d2ab652) @@ -2,6 +2,23 @@ "http://www.w3.org/TR/html4/strict.dtd"> <%@ include file="/common/taglibs.jsp"%> +<%-- runAuto and reflectOn does not set when authoring preview mode then set false as default value --%> + + + + + + + + + + + + + + + + @@ -19,7 +36,7 @@ //learner and author(preview mode) will mark the finish if(${mode == "learner"} || ${mode == "author"}){ var reqIDVar = new Date(); - if(${sessionMap.runAuto}){ + if(${runAuto}){ //set complete flag and finish this activity as well. window.parent.location.href=''; }else{ @@ -66,7 +83,7 @@ - +