Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== diff -u -r8152940ff07851d35abd4dba60e6b8c808212067 -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8152940ff07851d35abd4dba60e6b8c808212067) +++ lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -160,3 +160,5 @@ #======= End labels: Exported 151 labels for en AU ===== + +message.no.reflection.available = No notebook available \ No newline at end of file Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml =================================================================== diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_larsrc/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb) +++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -211,7 +211,7 @@ Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -rf8ab6c53122ad8a79807dbbb92c8ea9da96ad3eb -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision f8ab6c53122ad8a79807dbbb92c8ea9da96ad3eb) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -77,6 +77,7 @@ public static final String ATTR_ADD_RESOURCE_TYPE = "addType"; public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag"; public static final String ATTR_TITLE = "title"; + public static final String ATTR_USER_FINISHED = "userFinished"; //error message keys public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank"; @@ -91,6 +92,8 @@ public static final String MODE_AUTHOR_SESSION = "author_session"; public static final String ATTR_REFLECTION_ON = "reflectOn"; public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions"; + public static final String ATTR_REFLECTION_ENTRY = "reflectEntry"; + public static final String ATTR_REFLECT_LIST = "reflectList"; public static final String ATTR_USER_UID = "userUid"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java =================================================================== diff -u -rd98c24894416acdfefeeb94e9c3bbe31eef0ba0c -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision d98c24894416acdfefeeb94e9c3bbe31eef0ba0c) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -48,6 +48,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.rsrc.ResourceConstants; @@ -177,16 +178,27 @@ } } + // get notebook entry + String entryText = new String(); + NotebookEntry notebookEntry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, + ResourceConstants.TOOL_SIGNATURE, resourceUser.getUserId().intValue()); + + if (notebookEntry != null) { + entryText = notebookEntry.getEntry(); + } + //basic information sessionMap.put(ResourceConstants.ATTR_TITLE,resource.getTitle()); sessionMap.put(ResourceConstants.ATTR_RESOURCE_INSTRUCTION,resource.getInstructions()); sessionMap.put(ResourceConstants.ATTR_FINISH_LOCK,lock); + sessionMap.put(ResourceConstants.ATTR_USER_FINISHED, resourceUser.isSessionFinished()); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId); sessionMap.put(AttributeNames.ATTR_MODE,mode); //reflection information 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 @@ -393,6 +405,17 @@ refForm.setUserID(user.getUserID()); refForm.setSessionMapID(sessionMapID); +// get the existing reflection entry + IResourceService submitFilesService = getResourceService(); + + SessionMap map = (SessionMap)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()); + + if (entry != null) { + refForm.setEntryText(entry.getEntry()); + } + return mapping.findForward(ResourceConstants.SUCCESS); } /** Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -46,25 +46,6 @@ private String sessionMapID; private String entryText; - /** - * MessageForm validation method from STRUCT interface. - * - */ - public ActionErrors validate(ActionMapping mapping, - javax.servlet.http.HttpServletRequest request) { - ActionErrors errors = new ActionErrors(); - try{ - if (StringUtils.isBlank(entryText)) { - ActionMessage error = new ActionMessage("error.reflection.emtpy"); - errors.add(ActionMessages.GLOBAL_MESSAGE, error); - } - - } catch (Exception e) { - logger.error(e); - } - return errors; - } - public String getEntryText() { return entryText; } Index: lams_tool_larsrc/web/pages/learning/learning.jsp =================================================================== diff -u -r0f400d3c81efcd88e1de2171cf5723c4b0f9182f -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 0f400d3c81efcd88e1de2171cf5723c4b0f9182f) +++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -211,12 +211,35 @@ <%-- end mode != teacher --%> + + + +
+

${sessionMap.reflectInstructions}

+ + + + + + + + +

+ + + + + + +
+
+ test="${sessionMap.reflectOn && (not sessionMap.userFinished)}"> Index: lams_tool_survey/conf/language/ApplicationResources.properties =================================================================== diff -u -rf133c7627b73e0f32e0e6ce6752fa85a5e382868 -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_survey/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision f133c7627b73e0f32e0e6ce6752fa85a5e382868) +++ lams_tool_survey/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -150,3 +150,5 @@ #======= End labels: Exported 141 labels for en AU ===== + +message.no.reflection.available = No notebook available \ No newline at end of file Index: lams_tool_survey/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r7ed78ed8506a377056c19c18d0c105cafc384f44 -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_survey/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 7ed78ed8506a377056c19c18d0c105cafc384f44) +++ lams_tool_survey/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -203,7 +203,7 @@ Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== diff -u -r103eacc68afe9e0df0c7bae49c482eb34873165a -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 103eacc68afe9e0df0c7bae49c482eb34873165a) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java (.../SurveyConstants.java) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -73,6 +73,7 @@ public static final String ATTR_REFLECTION_ON = "reflectOn"; public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions"; public static final String ATTR_REFLECT_LIST = "reflectList"; + public static final String ATTR_REFLECTION_ENTRY = "reflectEntry"; public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; public static final String PAGE_EDITABLE = "isPageEditable"; public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag"; @@ -106,6 +107,7 @@ public static final String ATTR_QUESTION_UID = "questionUid"; public static final String ATTR_SUMMARY_LIST = "summaryList"; public static final String ATTR_SURVEY = "survey"; + public static final String ATTR_USER_FINISHED = "userFinished"; //POSITION public static int POSITION_INSIDE = 0; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java =================================================================== diff -u -r777fe5cc6b9431c87be6665efdd098d3bda5af88 -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision 777fe5cc6b9431c87be6665efdd098d3bda5af88) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -47,6 +47,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.survey.SurveyConstants; @@ -150,17 +151,28 @@ //check whehter finish lock is on/off boolean lock = survey.getLockWhenFinished() && surveyUser.isSessionFinished(); + // get notebook entry + String entryText = new String(); + NotebookEntry notebookEntry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, + SurveyConstants.TOOL_SIGNATURE, surveyUser.getUserId().intValue()); + + if (notebookEntry != null) { + entryText = notebookEntry.getEntry(); + } + //basic information sessionMap.put(SurveyConstants.ATTR_TITLE,survey.getTitle()); sessionMap.put(SurveyConstants.ATTR_SURVEY_INSTRUCTION,survey.getInstructions()); sessionMap.put(SurveyConstants.ATTR_FINISH_LOCK,lock); sessionMap.put(SurveyConstants.ATTR_SHOW_ON_ONE_PAGE,survey.isShowOnePage()); + sessionMap.put(SurveyConstants.ATTR_USER_FINISHED, surveyUser.isSessionFinished()); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId); sessionMap.put(AttributeNames.ATTR_MODE,mode); //reflection information sessionMap.put(SurveyConstants.ATTR_REFLECTION_ON,survey.isReflectOnActivity()); sessionMap.put(SurveyConstants.ATTR_REFLECTION_INSTRUCTION,survey.getReflectInstructions()); + sessionMap.put(SurveyConstants.ATTR_REFLECTION_ENTRY, entryText); //add define later support if(survey.isDefineLater()){ @@ -389,6 +401,17 @@ refForm.setUserID(user.getUserID()); refForm.setSessionMapID(sessionMapID); + // get the existing reflection entry + ISurveyService submitFilesService = getSurveyService(); + + SessionMap map = (SessionMap)request.getSession().getAttribute(sessionMapID); + Long toolSessionID = (Long)map.get(AttributeNames.PARAM_TOOL_SESSION_ID); + NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, SurveyConstants.TOOL_SIGNATURE, user.getUserID()); + + if (entry != null) { + refForm.setEntryText(entry.getEntry()); + } + return mapping.findForward(SurveyConstants.SUCCESS); } /** Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/ReflectionForm.java =================================================================== diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -46,25 +46,6 @@ private String sessionMapID; private String entryText; - /** - * MessageForm validation method from STRUCT interface. - * - */ - public ActionErrors validate(ActionMapping mapping, - javax.servlet.http.HttpServletRequest request) { - ActionErrors errors = new ActionErrors(); - try{ - if (StringUtils.isBlank(entryText)) { - ActionMessage error = new ActionMessage("error.reflection.emtpy"); - errors.add(ActionMessages.GLOBAL_MESSAGE, error); - } - - } catch (Exception e) { - logger.error(e); - } - return errors; - } - public String getEntryText() { return entryText; } Index: lams_tool_survey/web/pages/learning/result.jsp =================================================================== diff -u -rd3b1565d338179ac42949c5d54758c8d9c9c7f16 -r1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad --- lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision d3b1565d338179ac42949c5d54758c8d9c9c7f16) +++ lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision 1ee653aae7ac1b2ae1e30254a8e6bd2dcdf95bad) @@ -90,20 +90,43 @@
- + + + + + + + + +
+

${sessionMap.reflectInstructions}

+ + + + + + + + +

+ + + + + + +
+ +
- - - - - + test="${sessionMap.reflectOn && mode != 'teacher' && (not sessionMap.userFinished)}">