Index: lams_tool_nb/conf/language/ApplicationResources.properties
===================================================================
diff -u -r8152940ff07851d35abd4dba60e6b8c808212067 -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d
--- lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8152940ff07851d35abd4dba60e6b8c808212067)
+++ lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
@@ -60,5 +60,7 @@
message.no.reflections =No reflections have yet been made.
message.no.reflection =No reflection has yet been made.
-
#======= End labels: Exported 53 labels for en AU =====
+
+label.edit = Edit
+message.no.reflection.available = No notebook available
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java
===================================================================
diff -u -r4aae0391a4892385de3df761a655e0ab8b1c0183 -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java (.../NbLearnerAction.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java (.../NbLearnerAction.java) (revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
@@ -39,6 +39,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
+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.ToolSessionManager;
@@ -87,6 +88,7 @@
Map map = new HashMap();
map.put(NoticeboardConstants.BUTTON_FINISH, "finish");
map.put(NoticeboardConstants.BUTTON_CONTINUE, "reflect");
+ map.put(NoticeboardConstants.BUTTON_EDIT, "reflect");
return map;
}
@@ -193,6 +195,12 @@
NoticeboardContent nbContent = nbService.retrieveNoticeboardBySessionID(toolSessionID);
request.setAttribute("reflectInstructions", nbContent.getReflectInstructions());
request.setAttribute("title", nbContent.getTitle());
+
+ // get the existing reflection entry
+ NotebookEntry entry = nbService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, NoticeboardConstants.TOOL_SIGNATURE, getUserID(request).intValue());
+ if (entry != null) {
+ request.setAttribute("reflectEntry", entry.getEntry());
+ }
return mapping.findForward(NoticeboardConstants.REFLECT_ON_ACTIVITY);
}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
diff -u -r9c247a818a3bc65c42e509265e09b281706445b8 -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java (.../NbLearnerStarterAction.java) (revision 9c247a818a3bc65c42e509265e09b281706445b8)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java (.../NbLearnerStarterAction.java) (revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
@@ -35,6 +35,8 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
+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.noticeboard.NbApplicationException;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
@@ -144,8 +146,6 @@
if ( isFlagSet(nbContent, NoticeboardConstants.FLAG_DEFINE_LATER) ) {
return mapping.findForward(NoticeboardConstants.DEFINE_LATER);
}
-
- request.setAttribute("reflectOnActivity", nbContent.getReflectOnActivity());
nbUser = nbService.retrieveNbUserBySession(userID, toolSessionID);
@@ -180,6 +180,19 @@
learnerForm.copyValuesIntoForm(nbContent, readOnly, mode.toString());
+ NotebookEntry notebookEntry = nbService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, NoticeboardConstants.TOOL_SIGNATURE, userID.intValue());
+ if (notebookEntry != null) {
+ request.setAttribute("reflectEntry", notebookEntry.getEntry());
+ }
+ request.setAttribute("reflectInstructions", nbContent.getReflectInstructions());
+ request.setAttribute("reflectOnActivity", nbContent.getReflectOnActivity());
+
+ Boolean userFinished = false;
+ if (nbUser.getUserStatus().equals(NoticeboardUser.COMPLETED)) {
+ userFinished = true;
+ }
+ request.setAttribute("userFinished", userFinished);
+
/*
* Checks to see if the runOffline flag is set.
* If the particular flag is set, control is forwarded to jsp page
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d
--- lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
+++ lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
@@ -8,26 +8,54 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
${reflectInstructions}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -r19be54d4ab8af4ef6e1fdb487e9e253f3478916d
--- lams_tool_nb/web/reflect.jsp (.../reflect.jsp) (revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_nb/web/reflect.jsp (.../reflect.jsp) (revision 19be54d4ab8af4ef6e1fdb487e9e253f3478916d)
@@ -6,19 +6,19 @@
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-