Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r77c1dcf81bdd4127b6a1373977cd481899141d31 -r77820149304ca90a67a3ec6f694644c66d0705ed --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 77c1dcf81bdd4127b6a1373977cd481899141d31) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 77820149304ca90a67a3ec6f694644c66d0705ed) @@ -851,7 +851,9 @@ toolContentObj.setDefineLater(Boolean.FALSE); toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setLimitedChar(5000); // this is the default value - + toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectInstructions(null); + // lockOnFinsh = ! isReusable Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_MB_REUSABLE); toolContentObj.setLockWhenFinished(bool != null ? ! bool.booleanValue() : false); @@ -919,7 +921,7 @@ } /** Set the description, throws away the title value as this is not supported in 2.0 */ - public void setReflectiveData(Long toolContentId, String title, String defaultInputValues) + public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException, DataMissingException { Forum toolContentObj = getForumByContentId(toolContentId); @@ -929,9 +931,8 @@ +" as the tool content does not exist."); } - // TODO Forum doesn't support reflection yet! - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); + toolContentObj.setReflectOnActivity(Boolean.TRUE); + toolContentObj.setReflectInstructions(description); } //*************************************************************************************************************** Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -r77820149304ca90a67a3ec6f694644c66d0705ed --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 77820149304ca90a67a3ec6f694644c66d0705ed) @@ -2628,9 +2628,8 @@ toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); - // TODO add reflection - //toolContentObj.setReflectInstructions(null); - //toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflect(Boolean.FALSE); + toolContentObj.setReflectionSubject(null); toolContentObj.setRunOffline(Boolean.FALSE.booleanValue()); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); @@ -2739,9 +2738,8 @@ +" as the tool content does not exist."); } - // TODO add reflection - // qaContent.setReflectOnActivity(Boolean.TRUE); - // qaContent.setReflectInstructions(description); + toolContentObj.setReflect(Boolean.TRUE); + toolContentObj.setReflectionSubject(description); } public Long createNotebookEntry(Long id, Integer idType, String signature, Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r407ec95b4825be357d61eefa7799b8fbd6a3c1bd -r77820149304ca90a67a3ec6f694644c66d0705ed --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 407ec95b4825be357d61eefa7799b8fbd6a3c1bd) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 77820149304ca90a67a3ec6f694644c66d0705ed) @@ -2092,9 +2092,8 @@ toolContentObj.setInstructions(null); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); - // TODO add reflection - //toolContentObj.setReflectInstructions(null); - //toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflect(Boolean.FALSE); + toolContentObj.setReflectionSubject(null); toolContentObj.setRunOffline(Boolean.FALSE.booleanValue()); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); toolContentObj.setQaContentId(toolContentId); @@ -2143,9 +2142,8 @@ +" as the tool content does not exist."); } - // TODO add reflection - // qaContent.setReflectOnActivity(Boolean.TRUE); - // qaContent.setReflectInstructions(description); + qaContent.setReflect(Boolean.TRUE); + qaContent.setReflectionSubject(description); } //========================================================================================= Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r9cd6be516aa221a17b218c27819ed892cd60e35f -r77820149304ca90a67a3ec6f694644c66d0705ed --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 9cd6be516aa221a17b218c27819ed892cd60e35f) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 77820149304ca90a67a3ec6f694644c66d0705ed) @@ -1006,6 +1006,8 @@ toolContentObj.setOnlineInstructions(null); toolContentObj.setRunOffline(Boolean.FALSE); toolContentObj.setUpdated(now); + toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectInstructions(null); toolContentObj.setRunAuto(Boolean.FALSE); Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_URL_RUNTIME_LEARNER_SUBMIT_FILE); @@ -1106,9 +1108,8 @@ +" as the tool content does not exist."); } - // TODO Share Resources doesn't support reflection yet! - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); + toolContentObj.setReflectOnActivity(Boolean.TRUE); + toolContentObj.setReflectInstructions(description); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r44294eea10eb00d82f20d67b00b0fc515e271eca -r77820149304ca90a67a3ec6f694644c66d0705ed --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 44294eea10eb00d82f20d67b00b0fc515e271eca) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 77820149304ca90a67a3ec6f694644c66d0705ed) @@ -795,7 +795,9 @@ toolContentObj.setUpdated(now); // 1.0.2 doesn't allow users to go back after completion, which is the equivalent of lock on finish. toolContentObj.setLockOnFinished(Boolean.TRUE); - + toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectInstructions(null); + SubmitUser suser = createContentUser(user, toolContentId); toolContentObj.setCreatedBy(suser); @@ -816,9 +818,8 @@ +" as the tool content does not exist."); } - // TODO Share Resources doesn't support reflection yet! - // toolContentObj.setReflectOnActivity(Boolean.TRUE); - // toolContentObj.setReflectInstructions(description); + toolContentObj.setReflectOnActivity(Boolean.TRUE); + toolContentObj.setReflectInstructions(description); } public SubmitUser getUserByUid(Long learnerID){ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r77820149304ca90a67a3ec6f694644c66d0705ed --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 77820149304ca90a67a3ec6f694644c66d0705ed) @@ -2642,9 +2642,8 @@ toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); - // TODO add reflection - //toolContentObj.setReflectInstructions(null); - //toolContentObj.setReflectOnActivity(Boolean.FALSE); + toolContentObj.setReflectionSubject(null); + toolContentObj.setReflect(Boolean.FALSE); toolContentObj.setRunOffline(Boolean.FALSE); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); @@ -2702,9 +2701,8 @@ +" as the tool content does not exist."); } - // TODO add reflection - // qaContent.setReflectOnActivity(Boolean.TRUE); - // qaContent.setReflectInstructions(description); + toolContentObj.setReflect(Boolean.TRUE); + toolContentObj.setReflectionSubject(description); } public Long createNotebookEntry(Long id, Integer idType, String signature,