Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -84,8 +84,6 @@ public static final String ATTR_RESOURCE = "resource"; - public static final String ATTR_RUN_AUTO = "runAuto"; - public static final String ATTR_RATE_ITEMS = "rateItems"; public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20220217.sql =================================================================== diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20220217.sql (.../patch20220217.sql) (revision 326782acda142b33013dcb8a4b57ef62a5669914) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20220217.sql (.../patch20220217.sql) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -19,6 +19,10 @@ DROP COLUMN ims_schema, DROP COLUMN init_item; +-- remove auto run functionality +ALTER TABLE tl_larsrc11_resource DROP COLUMN allow_auto_run; + + -- Put all sql statements above here -- If there were no errors, commit and restore autocommit to on Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java =================================================================== diff -u -r66bda55b4291ff10c230b0ab5227dab5fa058a8a -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -46,8 +46,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; @@ -78,10 +76,6 @@ private String instructions; // advance - - @Column(name = "allow_auto_run") - private boolean runAuto; - @Column(name = "mini_view_resource_number") private int miniViewResourceNumber; @@ -391,18 +385,8 @@ miniViewResourceNumber = minViewResourceNumber; } - public boolean isRunAuto() { - return runAuto; - } - - public void setRunAuto(boolean runAuto) { - this.runAuto = runAuto; - } - /** * For display use - * - * @return */ public String getMiniViewNumberStr() { return miniViewNumberStr; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r326782acda142b33013dcb8a4b57ef62a5669914 -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 326782acda142b33013dcb8a4b57ef62a5669914) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -1146,7 +1146,6 @@ resource.setReflectOnActivity( JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); resource.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - resource.setRunAuto(JsonUtil.optBoolean(toolContentJSON, "runAuto", Boolean.FALSE)); resource.setContentInUse(false); resource.setDefineLater(false); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -r0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10 -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 0c5d2aefd17a667d8222d8f1bb8b05aa4034ed10) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -176,26 +176,6 @@ // check whether finish lock is on/off boolean lock = resource.getLockWhenFinished() && (resourceUser != null) && resourceUser.isSessionFinished(); - // check whether there is only one resource item and run auto flag is true or not. - boolean runAuto = false; - Long runAutoItemUid = null; - if (resource.isRunAuto() && items != null) { - int itemsNumber = 0; - for (ResourceItem item : items) { - // only visible item can be run auto. - if (!item.isHide()) { - itemsNumber++; - runAutoItemUid = item.getUid(); - } - } - // can't autorun if there is more than one! - if (itemsNumber == 1) { - runAuto = true; - } else { - runAutoItemUid = null; - } - } - // get notebook entry String entryText = new String(); if (resourceUser != null) { @@ -220,7 +200,6 @@ sessionMap.put(ResourceConstants.ATTR_REFLECTION_ON, resource.isReflectOnActivity()); sessionMap.put(ResourceConstants.ATTR_REFLECTION_INSTRUCTION, resource.getReflectInstructions()); sessionMap.put(ResourceConstants.ATTR_REFLECTION_ENTRY, entryText); - sessionMap.put(ResourceConstants.ATTR_RUN_AUTO, new Boolean(runAuto)); // add define later support if (resource.isDefineLater()) { @@ -280,22 +259,7 @@ numItemsCompleted >= resource.getMiniViewResourceNumber()); sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource); - - if (runAuto) { - String redirectURL = "redirect:/reviewItem.do"; - redirectURL = WebUtil.appendParameterToURL(redirectURL, ResourceConstants.ATTR_SESSION_MAP_ID, - sessionMap.getSessionID()); - redirectURL = WebUtil.appendParameterToURL(redirectURL, ResourceConstants.ATTR_TOOL_SESSION_ID, - sessionId.toString()); - redirectURL = WebUtil.appendParameterToURL(redirectURL, ResourceConstants.ATTR_RESOURCE_ITEM_UID, - runAutoItemUid.toString()); - redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.ATTR_MODE, mode.toString()); - return redirectURL; - - } else { - return "pages/learning/learning"; - } - + return "pages/learning/learning"; } /** @@ -316,21 +280,8 @@ .getAttribute(sessionMapID); // get mode and ToolSessionID from sessionMAP - ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - // auto run mode, when use finish the only one resource item, mark it as complete then finish this activity as - // well. - String resourceItemUid = request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID); - if (resourceItemUid != null) { - doComplete(request); - // NOTE:So far this flag is useless(31/08/2006). - // set flag, then finish page can know redir target is parent(AUTO_RUN) or self(normal) - request.setAttribute(ResourceConstants.ATTR_RUN_AUTO, true); - } else { - request.setAttribute(ResourceConstants.ATTR_RUN_AUTO, false); - } - if (!validateBeforeFinish(request, sessionMapID)) { return "pages/learning/learning"; } @@ -340,7 +291,7 @@ try { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = user.getUserID().longValue(); nextActivityUrl = resourceService.finishToolSession(sessionId, userID); request.setAttribute(ResourceConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); Index: lams_tool_larsrc/web/pages/authoring/advance.jsp =================================================================== diff -u -r77491c8baf27f5b5d8705ea6b306e8db142389e7 -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 77491c8baf27f5b5d8705ea6b306e8db142389e7) +++ lams_tool_larsrc/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -4,11 +4,6 @@ -
- -
-
Index: lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp =================================================================== diff -u -r77491c8baf27f5b5d8705ea6b306e8db142389e7 -r694dd2c529990a94c17576dce6c98e5b821532e0 --- lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp (.../advanceoptions.jsp) (revision 77491c8baf27f5b5d8705ea6b306e8db142389e7) +++ lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp (.../advanceoptions.jsp) (revision 694dd2c529990a94c17576dce6c98e5b821532e0) @@ -23,23 +23,6 @@ - - - - - - - - - - - - - - - - -