Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.37 -r1.38 --- lams_tool_larsrc/conf/language/ApplicationResources.properties 3 Nov 2006 05:10:15 -0000 1.37 +++ lams_tool_larsrc/conf/language/ApplicationResources.properties 17 Nov 2006 02:06:36 -0000 1.38 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v diff -u -r1.30 -r1.31 --- lams_tool_larsrc/conf/xdoclet/struts-actions.xml 31 Aug 2006 06:39:03 -0000 1.30 +++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml 17 Nov 2006 02:06:36 -0000 1.31 @@ -211,7 +211,7 @@ Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v diff -u -r1.32 -r1.33 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 29 Sep 2006 05:00:25 -0000 1.32 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 17 Nov 2006 02:06:36 -0000 1.33 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v diff -u -r1.24 -r1.25 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java 14 Nov 2006 04:01:56 -0000 1.24 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java 17 Nov 2006 02:06:35 -0000 1.25 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java 17 Sep 2006 06:25:39 -0000 1.2 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java 17 Nov 2006 02:06:36 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v diff -u -r1.32 -r1.33 --- lams_tool_larsrc/web/pages/learning/learning.jsp 2 Nov 2006 07:56:18 -0000 1.32 +++ lams_tool_larsrc/web/pages/learning/learning.jsp 17 Nov 2006 02:06:36 -0000 1.33 @@ -211,12 +211,35 @@ <%-- end mode != teacher --%> + + + +
+

${sessionMap.reflectInstructions}

+ + + + + + + + +

+ + + + + + +
+
+ test="${sessionMap.reflectOn && (not sessionMap.userFinished)}"> Index: lams_tool_survey/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.18 -r1.19 --- lams_tool_survey/conf/language/ApplicationResources.properties 3 Nov 2006 05:20:31 -0000 1.18 +++ lams_tool_survey/conf/language/ApplicationResources.properties 17 Nov 2006 02:06:44 -0000 1.19 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/conf/xdoclet/struts-actions.xml,v diff -u -r1.8 -r1.9 --- lams_tool_survey/conf/xdoclet/struts-actions.xml 6 Oct 2006 01:10:08 -0000 1.8 +++ lams_tool_survey/conf/xdoclet/struts-actions.xml 17 Nov 2006 02:06:44 -0000 1.9 @@ -203,7 +203,7 @@ Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java,v diff -u -r1.12 -r1.13 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java 28 Sep 2006 05:44:02 -0000 1.12 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java 17 Nov 2006 02:06:43 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java,v diff -u -r1.12 -r1.13 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java 28 Sep 2006 06:21:43 -0000 1.12 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java 17 Nov 2006 02:06:44 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/ReflectionForm.java,v diff -u -r1.2 -r1.3 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/ReflectionForm.java 25 Sep 2006 23:20:03 -0000 1.2 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/ReflectionForm.java 17 Nov 2006 02:06:43 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/result.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_survey/web/pages/learning/result.jsp 8 Nov 2006 06:38:07 -0000 1.6 +++ lams_tool_survey/web/pages/learning/result.jsp 17 Nov 2006 02:06:44 -0000 1.7 @@ -90,20 +90,43 @@
- + + + + + + + + +
+

${sessionMap.reflectInstructions}

+ + + + + + + + +

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