Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -236,6 +236,22 @@
             column="minimum_reply"
         />
 
+        <property
+            name="reflectInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="reflect_instructions"
+        />
+
+        <property
+            name="reflectOnActivity"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="reflect_on_activity"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -158,4 +158,12 @@
 
 #======= End labels: Exported 148 labels for en AU =====
 topic.message.attachment.hidden=Message attachment hidden
-message.posting.limiting=Posting Limits
\ No newline at end of file
+message.posting.limiting=Posting Limits
+advanced.reflectOnActivity=Reflect on forum
+error.reflection.emtpy=Please input reflection for forum tool
+title.reflection=Reflection
+label.continue=Continue
+monitoring.user.fullname=Name
+monitoring.user.loginname=Login name
+monitoring.user.reflection=Refection
+page.title.monitoring.view.reflection=View Reflection
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -22,8 +22,7 @@
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="request" 
-			parameter="updateContent" 
+			scope="request" 			parameter="updateContent" 
 			validate="false">
 			<forward name="author" path="tiles:/authoring/forum/main" />
 			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
@@ -209,10 +208,31 @@
 				
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			input="tiles:/learning/forum/viewForum" 
 			parameter="finish">
-			<forward name="defineLater" path="tiles:/learning/forum/defineLater" />
-			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
+		
+		<!--  ========= Reflection =============== -->
+		<action path="/learning/newReflection"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="reflectionForm" 
+			validate="false" 
+			parameter="newReflection" 
+			input="tiles:/learning/forum/viewForum" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/reflection" />
+		</action>
+		
+		<action path="/learning/submitReflection"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="reflectionForm" 
+			validate="true" 
+			input="tiles:/learning/reflection"
+			parameter="submitReflection" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/reflection" />
+		</action>
+		
 		<!-- ========== END: Learning  Definitions ============================== -->
 		
 		<!-- ========== START: Monitoring  Definitions ============================== -->
@@ -292,6 +312,11 @@
 			parameter="viewTopicTree">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopicTree" />
 		</action>
+		<action path="/monitoring/viewReflection"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			parameter="viewReflection">
+			<forward name="success" path="tiles:/monitoring/forum/viewReflection" />
+		</action>
 
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -rf6f0e93d2134d055aadd9414aee1b588f0669c19 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -42,6 +42,8 @@
    minimum_reply integer,
    limited_of_chars integer,
    limited_input_flag smallint,
+   reflect_instructions varchar(255),
+   reflect_on_activity smallint, 
    primary key (uid)
 );
 create table tl_lafrum11_forum_user (
@@ -113,5 +115,5 @@
 alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
 
 
-INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor, allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",${default_content_id},0,0,0,0,0,1,0,1,1,0,0,1,5000);
+INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor, allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",${default_content_id},0,0,0,0,0,1,0,1,1,0,0,1,5000,0);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -rf6f0e93d2134d055aadd9414aee1b588f0669c19 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -19,7 +19,7 @@
 drop table if exists tl_lafrum11_report;
 drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid));
-create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, primary key (uid));
+create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
 create table tl_lafrum11_forum_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), session_finished bit, primary key (uid));
 create table tl_lafrum11_message (uid bigint not null auto_increment, create_date datetime, last_reply_date datetime, update_date datetime, create_by bigint, modified_by bigint, subject varchar(255), body text, is_authored bit, is_anonymous bit, forum_session_uid bigint, parent_uid bigint, forum_uid bigint, reply_number integer, hide_flag bit, report_id bigint, primary key (uid));
 create table tl_lafrum11_message_seq (uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid));
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -0,0 +1,77 @@
+package org.lamsfoundation.lams.tool.forum.dto;
+
+import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
+
+public class UserDTO {
+
+	private Long userUid;
+	private String fullName;
+	private String loginName;
+	private int noOfPosts;
+	private boolean hasRefection;
+	private String reflectInstrctions;
+	private boolean finishReflection;
+	private String reflect;
+	
+	public UserDTO(){
+	}
+	
+	public UserDTO(ForumUser user) {
+		this.setLoginName(user.getLoginName());
+		this.setFullName(user.getFirstName()+" "+user.getLastName());
+		this.setUserUid(user.getUid());
+		
+	}
+	public String getFullName() {
+		return fullName;
+	}
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+	public boolean isHasRefection() {
+		return hasRefection;
+	}
+	public void setHasRefection(boolean hasRefection) {
+		this.hasRefection = hasRefection;
+	}
+	public String getLoginName() {
+		return loginName;
+	}
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+	public int getNoOfPosts() {
+		return noOfPosts;
+	}
+	public void setNoOfPosts(int noOfPosts) {
+		this.noOfPosts = noOfPosts;
+	}
+	public Long getUserUid() {
+		return userUid;
+	}
+	public void setUserUid(Long userUid) {
+		this.userUid = userUid;
+	}
+	public String getReflect() {
+		return reflect;
+	}
+	public void setReflect(String reflection) {
+		this.reflect = reflection;
+	}
+
+	public String getReflectInstrctions() {
+		return reflectInstrctions;
+	}
+
+	public void setReflectInstrctions(String reflectInstrctions) {
+		this.reflectInstrctions = reflectInstrctions;
+	}
+
+	public boolean isFinishReflection() {
+		return finishReflection;
+	}
+
+	public void setFinishReflection(boolean finishReflection) {
+		this.finishReflection = finishReflection;
+	}
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -r33a3ed3f118b3e599ed6ef024c1b92a6f94225b1 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 33a3ed3f118b3e599ed6ef024c1b92a6f94225b1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -105,6 +105,7 @@
    		</property>
    		<property name="auditService"><ref bean="auditService"/></property>
    		<property name="messageService"><ref bean="forumMessageService"/></property>
+  		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
     </bean>
 
     <bean id="forumService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -236,6 +236,22 @@
             column="minimum_reply"
         />
 
+        <property
+            name="reflectInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="reflect_instructions"
+        />
+
+        <property
+            name="reflectOnActivity"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="reflect_on_activity"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -77,6 +77,9 @@
 	private int limitedChar;
     private boolean limitedInput;
     
+	private boolean reflectOnActivity;
+	private String reflectInstructions;
+
     //********* Non Persist fields
 	private ForumToolContentHandler toolContentHandler;
     
@@ -536,4 +539,24 @@
 	public void setMinimumReply(int minimumReply) {
 		this.minimumReply = minimumReply;
 	}
+	/**
+	 * @hibernate.property column="reflect_instructions"
+	 * @return
+	 */	
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}
+	/**
+	 * @hibernate.property column="reflect_on_activity"
+	 * @return
+	 */		
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r33a3ed3f118b3e599ed6ef024c1b92a6f94225b1 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 33a3ed3f118b3e599ed6ef024c1b92a6f94225b1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -57,6 +57,8 @@
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
@@ -118,7 +120,9 @@
 	private IAuditService auditService;
     private MessageService messageService;
     private IExportToolContentService exportContentService;
-    private IUserManagementService userManagementService; 
+    private IUserManagementService userManagementService;
+	private ICoreNotebookService coreNotebookService;
+	
 	//---------------------------------------------------------------------
     // Inversion of Control Methods - Method injection
     //---------------------------------------------------------------------
@@ -570,7 +574,17 @@
 
     }
 
-
+	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText) {
+		return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", entryText);
+	}
+	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID){
+		List<NotebookEntry> list = coreNotebookService.getEntry(sessionId, idType, signature, userID);
+		if (list == null || list.isEmpty()) {
+			return null;
+		} else {
+			return list.get(0);
+		}
+	}
     //***************************************************************************************************************
     // ToolContentManager and ToolSessionManager methods
     //***************************************************************************************************************
@@ -1026,6 +1040,12 @@
 		this.forumReportDAO = forumReportDAO;
 	}
 
-	
+	public ICoreNotebookService getCoreNotebookService() {
+		return coreNotebookService;
+	}
 
+	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
+		this.coreNotebookService = coreNotebookService;
+	}
+
 }
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r33a3ed3f118b3e599ed6ef024c1b92a6f94225b1 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 33a3ed3f118b3e599ed6ef024c1b92a6f94225b1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -27,7 +27,9 @@
 import java.util.List;
 
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.lamsfoundation.lams.tool.forum.dto.UserDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
@@ -267,7 +269,7 @@
      * @param sessionID
      * @return
      */
-	public List getUsersBySessionId(Long sessionID);
+    public List getUsersBySessionId(Long sessionID);
 	/**
 	 * Get user by uid
 	 * @param userUid
@@ -301,4 +303,14 @@
 	 * @param currentUser
 	 */
 	public void finishUserSession(ForumUser currentUser);
+	/**
+	 * Create refection entry into notebook tool.
+	 * @param sessionId
+	 * @param notebook_tool
+	 * @param tool_signature
+	 * @param userId
+	 * @param entryText
+	 */
+	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText);
+	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -86,6 +86,7 @@
 	public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList";
 	public static final String ATTR_TOPIC = "topic";
 	public static final String ATTR_USER= "user";
+	public static final String ATTR_USER_UID= "userUid";
 	public static final String ATTR_REPORT = "report";
 	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 	
@@ -98,6 +99,8 @@
 	public static final String ATTR_PARENT_TOPIC_ID = "parentID";
 
 	public static final String ATTR_TOPIC_ID = "topicID";
+	public static final String ATTR_REFLECTION_ON = "reflectOn";
+	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
 
 
 	
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r33a3ed3f118b3e599ed6ef024c1b92a6f94225b1 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 33a3ed3f118b3e599ed6ef024c1b92a6f94225b1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -903,7 +903,8 @@
 				}
 			}
 			if(!form.getForum().isAllowNewTopic()){
-				if(form.getForum().getMaximumReply() < form.getForum().getMinimumReply()){
+				if(form.getForum().getMaximumReply() !=0 
+						&& (form.getForum().getMaximumReply() < form.getForum().getMinimumReply())){
 					ActionMessage error = new ActionMessage("error.min.less.max");
 					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 				}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r33a3ed3f118b3e599ed6ef024c1b92a6f94225b1 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 33a3ed3f118b3e599ed6ef024c1b92a6f94225b1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -44,6 +44,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -60,6 +61,7 @@
 import org.lamsfoundation.lams.tool.forum.service.IForumService;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
+import org.lamsfoundation.lams.tool.forum.web.forms.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -118,9 +120,21 @@
 		if (param.equals("updateMessageHideFlag")) {
 			return updateMessageHideFlag(mapping, form, request, response);
 		}
+		
+		//================ Reflection =======================
+		if (param.equals("newReflection")) {
+			return newReflection(mapping, form, request, response);
+		}
+		if (param.equals("submitReflection")) {
+			return submitReflection(mapping, form, request, response);
+		}
+		
+		
 		return mapping.findForward("error");
 	}
 
+
+
 	// ==========================================================================================
 	// Forum level methods
 	// ==========================================================================================
@@ -201,6 +215,8 @@
 		sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
 		sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
 		sessionMap.put(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle());
+		sessionMap.put(ForumConstants.ATTR_REFLECTION_ON,forum.isReflectOnActivity());
+		sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION,forum.getReflectInstructions());
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 		sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions());
 		
@@ -229,39 +245,29 @@
 	 */
 	private ActionForward finish(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
-		Long sessionId = WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID);
-		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, MODE_OPTIONAL);
 		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		
+		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		
 		forumService = getForumManager();
 		
 		if (mode == ToolAccessMode.LEARNER || mode==ToolAccessMode.AUTHOR) {
-			ForumToolSession session = forumService.getSessionBySessionId(sessionId);
-			Forum forum = session.getForum();
-			// get session from shared session.
-			HttpSession ss = SessionManager.getSession();
-			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			Long userID = new Long(user.getUserID().longValue());
-			if(!forum.getRunOffline() && !forum.isAllowNewTopic()){
-				int postNum = forumService.getTopicsNum(userID,sessionId);
-				if(postNum < forum.getMinimumReply()){
-					ActionMessages errors = new ActionMessages();
-					errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.less.mini.post",(forum.getMinimumReply() - postNum)));
-					saveErrors(request, errors);
-					// get all root topic to display on init page
-					List rootTopics = forumService.getRootTopics(sessionId);
-					request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
-					request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID );
-					return mapping.findForward("success");
-				}
-			}
+			if(!validateBeforeFinish(mapping, request, sessionMapID, sessionId))
+				return mapping.getInputForward();
 
 			String nextActivityUrl;
 			try {
+//				 get session from shared session.
+				HttpSession ss = SessionManager.getSession();
+				UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+				Long userID = new Long(user.getUserID().longValue());
+				
+				//finish current session for user
 				forumService.finishUserSession(getCurrentUser(request, sessionId));
 				ToolSessionManager sessionMgrService = ForumServiceProxy.getToolSessionManager(getServlet().getServletContext());
-				nextActivityUrl = sessionMgrService.leaveToolSession(sessionId,
-						userID);
+				nextActivityUrl = sessionMgrService.leaveToolSession(sessionId,userID);
 				response.sendRedirect(nextActivityUrl);
 			} catch (DataMissingException e) {
 				throw new ForumException(e);
@@ -277,9 +283,64 @@
 		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
 		
-		return mapping.findForward("success");
+		return mapping.getInputForward();
 	}
 
+
+
+	/**
+	 * Submit reflection form input database.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		ReflectionForm refForm = (ReflectionForm) form;
+		Integer userId = refForm.getUserID();
+		
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		
+		forumService.createNotebookEntry(sessionId, 
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				ForumConstants.TOOL_SIGNATURE, 
+				userId,
+				refForm.getEntryText());
+
+		return finish(mapping, form, request, response);
+	}
+	
+	/**
+	 * Display empty reflection form.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		
+		//get session value
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		if(!validateBeforeFinish(mapping, request, sessionMapID, sessionId))
+			return mapping.getInputForward();
+
+		ReflectionForm refForm = (ReflectionForm) form;
+		HttpSession ss = SessionManager.getSession();
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		
+		refForm.setUserID(user.getUserID());
+		refForm.setSessionMapID(sessionMapID);
+		
+		return mapping.findForward("success");
+	}
 	// ==========================================================================================
 	// Topic level methods
 	// ==========================================================================================
@@ -456,7 +517,7 @@
 		if(forum != null){
 			if(!forum.isAllowNewTopic()){
 				int posts = forumService.getTopicsNum(forumUser.getUserId(), sessionId);
-				if(posts >= forum.getMaximumReply())
+				if(forum.getMaximumReply() != 0 && (posts >= forum.getMaximumReply()))
 					sessionMap.put(ForumConstants.ATTR_NO_MORE_POSTS, Boolean.TRUE);
 			}
 		}
@@ -624,6 +685,33 @@
 	// Utility methods
 	// ==========================================================================================
 	/**
+	 * Validation method to check whether user posts meet minimum number.
+	 */
+	private boolean validateBeforeFinish(ActionMapping mapping, HttpServletRequest request, String sessionMapID, Long sessionId) {
+		ForumToolSession session = forumService.getSessionBySessionId(sessionId);
+		Forum forum = session.getForum();
+		// get session from shared session.
+		HttpSession ss = SessionManager.getSession();
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		Long userID = new Long(user.getUserID().longValue());
+		if(!forum.getRunOffline() && !forum.isAllowNewTopic()){
+			int postNum = forumService.getTopicsNum(userID,sessionId);
+			if(postNum < forum.getMinimumReply()){
+				//create error
+				ActionMessages errors = new ActionMessages();
+				errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.less.mini.post",(forum.getMinimumReply() - postNum)));
+				saveErrors(request, errors);
+				
+				// get all root topic to display on init page
+				List rootTopics = forumService.getRootTopics(sessionId);
+				request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
+				request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID );
+				return false;
+			}
+		}
+		return true;
+	}
+	/**
 	 * This method will set flag in message DTO:
 	 * <li>If this topic is created by current login user, then set Author mark
 	 * true.</li>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r3713058c6b00a5ea73f4b3eff667aba0c9d41534 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3713058c6b00a5ea73f4b3eff667aba0c9d41534)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -37,7 +37,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -56,9 +58,11 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.dto.SessionDTO;
+import org.lamsfoundation.lams.tool.forum.dto.UserDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
@@ -72,7 +76,6 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -92,7 +95,7 @@
 				return -1;
 		}
 	}
-	
+
 	private class ForumUserComparator implements Comparator<ForumUser>{
 		public int compare(ForumUser o1, ForumUser o2) {
 			if(o1 != null && o2 != null){
@@ -103,6 +106,16 @@
 				return -1;
 		}
 	}
+	private class UserDTOComparator implements Comparator<UserDTO>{
+		public int compare(UserDTO o1, UserDTO o2) {
+			if(o1 != null && o2 != null){
+				return o1.getLoginName().compareTo(o2.getLoginName());
+			}else if(o1 != null)
+				return 1;
+			else
+				return -1;
+		}
+	}
 	/**
 	 * Action method entry.
 	 */
@@ -145,6 +158,11 @@
 		if (param.equals("viewTopicTree")) {
 			return viewTopicTree(mapping, form, request, response);
 		}
+		
+		if (param.equals("viewReflection")) {
+			return viewReflection(mapping, form, request, response);
+		}
+		
 		return mapping.findForward("error");
 	}
 	
@@ -163,7 +181,7 @@
 	}
 	
 	private ActionForward doTabs(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-   	 	this.listContentUsers(mapping, form, request, response);
+   	 	this.summary(mapping, form, request, response);
    	 	this.viewInstructions(mapping, form, request, response);
    	 	this.viewActivity(mapping, form, request, response);
    	 	this.statistic(mapping, form, request, response);
@@ -180,10 +198,43 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward listContentUsers(ActionMapping mapping,
+	private ActionForward summary(ActionMapping mapping,
 			ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		return userList(mapping, request);
+		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+		forumService = getForumService();
+		List sessionsList = forumService.getSessionsByContentId(toolContentID);
+
+		Map sessionUsersMap = new TreeMap(this.new SessionDTOComparator());
+		// build a map with all users in the submitFilesSessionList
+		Iterator it = sessionsList.iterator();
+		while (it.hasNext()) {
+			SessionDTO sessionDto = new SessionDTO();
+			ForumToolSession fts = (ForumToolSession) it.next();
+			boolean hasReflection = fts.getForum().isReflectOnActivity();
+			
+			sessionDto.setSessionID(fts.getSessionId());
+			sessionDto.setSessionName(fts.getSessionName());
+			List userList = forumService.getUsersBySessionId(fts.getSessionId());
+			
+			//sort and create DTO list
+			Set<UserDTO> dtoList = new TreeSet<UserDTO>(this.new UserDTOComparator());
+			Iterator iter = userList.iterator();
+			while(iter.hasNext()){
+				ForumUser user = (ForumUser) iter.next();
+				UserDTO userDTO = new UserDTO(user);
+				userDTO.setHasRefection(hasReflection);
+				dtoList.add(userDTO);
+				//userDTO.setNoOfPosts(noOfPosts)
+			}
+			sessionUsersMap.put(sessionDto, dtoList);
+		}
+
+		// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
+		request.setAttribute("sessionUserMap", sessionUsersMap);
+		return mapping.findForward("success");
+
 	}
 
 	/**
@@ -647,6 +698,32 @@
 		return mapping.findForward("success");
 	}
 
+	private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		
+		Long uid = WebUtil.readLongParam(request, ForumConstants.ATTR_USER_UID); 
+		Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); 
+		
+		ForumUser user = forumService.getUser(uid);
+		NotebookEntry notebookEntry = forumService.getEntry(sessionID, 
+				CoreNotebookConstants.NOTEBOOK_TOOL, 
+				ForumConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+		
+		ForumToolSession session = forumService.getSessionBySessionId(sessionID);
+		
+		UserDTO userDTO = new UserDTO(user);
+		if(notebookEntry == null){
+			userDTO.setFinishReflection(false);
+			userDTO.setReflect(null);
+		}else{
+			userDTO.setFinishReflection(true);
+			userDTO.setReflect(notebookEntry.getEntry());
+		}
+		userDTO.setReflectInstrctions(session.getForum().getReflectInstructions());
+		
+		request.setAttribute("userDTO", userDTO);
+		return mapping.findForward("success");
+	}
 	/**
 	 * View topic subject, content and attachement.
 	 * 
@@ -695,38 +772,7 @@
 	// ==========================================================================================
 	// Utility methods
 	// ==========================================================================================
-	/**
-	 * Show all users in a ToolContentID.
-	 * 
-	 * @param mapping
-	 * @param request
-	 * @return
-	 */
-	private ActionForward userList(ActionMapping mapping,
-			HttpServletRequest request) {
-		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 
-		forumService = getForumService();
-		List sessionsList = forumService.getSessionsByContentId(toolContentID);
-
-		Map sessionUsersMap = new TreeMap(this.new SessionDTOComparator());
-		// build a map with all users in the submitFilesSessionList
-		Iterator it = sessionsList.iterator();
-		while (it.hasNext()) {
-			SessionDTO sessionDto = new SessionDTO();
-			ForumToolSession fts = (ForumToolSession) it.next();
-			sessionDto.setSessionID(fts.getSessionId());
-			sessionDto.setSessionName(fts.getSessionName());
-			List userList = forumService
-					.getUsersBySessionId(fts.getSessionId());
-			sessionUsersMap.put(sessionDto, userList);
-		}
-
-		// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-		request.setAttribute("sessionUserMap", sessionUsersMap);
-		return mapping.findForward("success");
-	}
-
 	/**
 	 * Get Forum Service.
 	 * 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -117,6 +117,7 @@
     	forum.setLockWhenFinished(false);
     	forum.setAllowNewTopic(false);
     	forum.setAllowUpload(false);
+    	forum.setReflectOnActivity(false);
     }
     //-------------------------get/set methods----------------
     public Forum getForum() {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -46,7 +46,7 @@
  */
 public class MessageForm extends ValidatorForm {
 	private static final long serialVersionUID = -9054365604649146734L;
-	private static Logger logger = Logger.getLogger(ForumForm.class.getName());
+	private static Logger logger = Logger.getLogger(MessageForm.class.getName());
 	
     protected Message message;
     protected String sessionMapID;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -0,0 +1,92 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */	
+package org.lamsfoundation.lams.tool.forum.web.forms;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.validator.ValidatorForm;
+
+/**
+ *
+ * 	Reflection Form.
+ *	@struts.form name="reflectionForm"
+ *
+ */
+public class ReflectionForm extends ValidatorForm {
+	private static final long serialVersionUID = -9054365604649146735L;
+	private static Logger logger = Logger.getLogger(ReflectionForm.class.getName());
+	
+	private Integer userID;
+	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;
+	}
+
+	public void setEntryText(String entryText) {
+		this.entryText = entryText;
+	}
+
+	public Integer getUserID() {
+		return userID;
+	}
+
+	public void setUserID(Integer userUid) {
+		this.userID = userUid;
+	}
+
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
+
+}
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -25,6 +25,10 @@
       name="messageForm"
       type="org.lamsfoundation.lams.tool.forum.web.forms.MessageForm"
     />
+    <form-bean
+      name="reflectionForm"
+      type="org.lamsfoundation.lams.tool.forum.web.forms.ReflectionForm"
+    />
 
    <form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm" />
 
@@ -70,8 +74,7 @@
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
-			scope="request" 
-			parameter="updateContent" 
+			scope="request" 			parameter="updateContent" 
 			validate="false">
 			<forward name="author" path="tiles:/authoring/forum/main" />
 			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
@@ -241,10 +244,28 @@
 		</action>	
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			input="tiles:/learning/forum/viewForum" 
 			parameter="finish">
-			<forward name="defineLater" path="tiles:/learning/forum/defineLater" />
-			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
+		<!--  ========= Reflection =============== -->
+		<action path="/learning/newReflection"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="reflectionForm" 
+			validate="false" 
+			parameter="newReflection" 
+			input="tiles:/learning/forum/viewForum" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/reflection" />
+		</action>
+		<action path="/learning/submitReflection"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="reflectionForm" 
+			validate="true" 
+			input="tiles:/learning/reflection"
+			parameter="submitReflection" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/reflection" />
+		</action>
 		<!-- ========== END: Learning  Definitions ============================== -->
 		<!-- ========== START: Monitoring  Definitions ============================== -->
 		<action path="/monitoring" 
@@ -317,6 +338,11 @@
 			parameter="viewTopicTree">
 			<forward name="success" path="tiles:/monitoring/forum/viewTopicTree" />
 		</action>
+		<action path="/monitoring/viewReflection"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+			parameter="viewReflection">
+			<forward name="success" path="tiles:/monitoring/forum/viewReflection" />
+		</action>
 
 		<!-- ========== END: Monitoring  Definitions ============================== -->
 		<!-- System level actions -->
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -90,6 +90,10 @@
     	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/learning/edit.jsp"/>
 	</definition>
+    <definition name="tiles:/learning/reflection" extends="tiles:learner:layout">
+    	<put name="pageTitleKey" value="title.reflection"/>
+    	<put name="body" value="/jsps/learning/notebook.jsp"/>
+	</definition>
 	<!-- E: Learning -->
 	
 	<!-- B: Monitoring -->
@@ -125,6 +129,10 @@
     	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
     	<put name="body" value="/jsps/monitoring/message/viewtopictree.jsp"/>
 	</definition>
+	<definition name="tiles:/monitoring/forum/viewReflection" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.view.reflection"/>
+    	<put name="body" value="/jsps/monitoring/notebook.jsp"/>
+	</definition>
 	
 	<!-- E: Monitoring -->
 	
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -7,42 +7,54 @@
 	<!-- Advance options Row -->
 	<tr>
 		<td>
-			<html:checkbox property="forum.lockWhenFinished">
+			<html:checkbox property="forum.lockWhenFinished"  styleClass="noBorder">
 				<fmt:message key="label.authoring.advance.lock.on.finished" />
 			</html:checkbox>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<html:checkbox property="forum.allowEdit">
+			<html:checkbox property="forum.allowEdit"  styleClass="noBorder">
 				<fmt:message key="label.authoring.advance.allow.edit" />
 			</html:checkbox>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<html:checkbox property="forum.allowUpload">
+			<html:checkbox property="forum.allowUpload"  styleClass="noBorder">
 				<fmt:message key="label.authoring.advance.allow.upload" />
 			</html:checkbox>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<html:checkbox property="forum.allowRichEditor" styleId="richEditor">
+			<html:checkbox property="forum.allowRichEditor" styleId="richEditor"  styleClass="noBorder">
 				<fmt:message key="label.authoring.advance.use.richeditor" />
 			</html:checkbox>
 		</td>
 	</tr>	
 	<tr>
 		<td>
-			<html:checkbox property="forum.limitedInput" styleId="limitedInput">
+			<html:checkbox property="forum.limitedInput" styleId="limitedInput" styleClass="noBorder">
 				<fmt:message key="label.authoring.advance.limited.input" />
 			</html:checkbox>
 			<html:text property="forum.limitedChar" styleId="limitedChar" />
 		</td>
 	</tr>
 	<tr>
 		<td>
+			<html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"  styleId="reflectOn">
+				<fmt:message key="advanced.reflectOnActivity" />
+			</html:checkbox>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<lams:STRUTS-textarea property="forum.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
+		</td>
+	</tr>
+	<tr>
+		<td>
 			<h1><fmt:message key="message.posting.limiting"/></h1>
 		</td>
 	</tr>	
@@ -145,6 +157,15 @@
 			}
 			allowNewTopic();
 			
+			function checkReflection(){
+				var ropt = document.getElementById("reflectOn");
+				var rins = document.getElementById("reflectInstructions");
+				if(ropt.checked){
+					rins.disabled=false;
+				}else{
+					rins.disabled=true;
+				}
+			}
 </script>
 
 
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -0,0 +1,42 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+
+
+<html:form action="/learning/submitReflection" method="post">
+	<html:hidden property="userID" />
+	<html:hidden property="sessionMapID"/>
+	<h1 class="no-tabs-below">
+		${sessionMap.title}
+	</h1>
+	<div id="header-no-tabs-learner"></div>
+	<div id="content-learner">
+			<table>
+				<tr>
+					<td>
+						<%@ include file="/common/messages.jsp"%>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						${sessionMap.reflectInstructions}
+					</td>
+				</tr>
+	
+				<tr>
+					<td>
+						<lams:STRUTS-textarea cols="66" rows="8" property="entryText"/>
+					</td>
+				</tr>
+	
+				<tr>
+					<td class="right-buttons">
+						<html:submit styleClass="button">
+							<fmt:message key="label.finish"/>
+						</html:submit>
+					</td>
+				</tr>
+			</table>
+	</div>
+</html:form>
+<div id="footer-learner"></div>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -36,8 +36,11 @@
 				<c:set var="refresh">
 					<html:rewrite page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
 				</c:set>
+				<c:set var="continue">
+					<html:rewrite page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
+				</c:set>
 				<c:set var="finish">
-					<html:rewrite page="/learning/finish.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
+					<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
 				</c:set>
 
 				<div class="left-buttons">
@@ -54,9 +57,18 @@
 				<div class="right-buttons">
 
 					<c:if test='${sessionMap.mode != "teacher"}'>
-						<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${sessionMap.finishedLock}" styleClass="button">
-							<fmt:message key="label.finish" />
-						</html:button>
+						<c:choose>
+							<c:when test="${sessionMap.reflectOn}">
+								<html:button property="continue" onclick="javascript:location.href='${continue}';" styleClass="button">
+									<fmt:message key="label.continue" />
+								</html:button>
+							</c:when>
+							<c:otherwise>
+								<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${sessionMap.finishedLock}" styleClass="button">
+									<fmt:message key="label.finish" />
+								</html:button>
+							</c:otherwise>
+						</c:choose>
 					</c:if>
 				</div>
 			</td>
Index: lams_tool_forum/web/jsps/monitoring/notebook.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/monitoring/notebook.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/monitoring/notebook.jsp	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -0,0 +1,39 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<table>
+	<tr>
+		<td>
+			<h1>
+				${userDTO.fullName}
+			</h1>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<h1>
+				${userDTO.reflectInstrctions}
+			</h1>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<c:choose>
+				<c:when test="${userDTO.finishReflection}">
+					<c:out value="${userDTO.reflect}" escapeXml="false"/>
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.not.avaliable" />
+				</c:otherwise>
+			</c:choose>
+		</td>
+	</tr>
+</table>
+<table cellpadding="0">
+	<tr>
+		<td>
+			<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
+		</td>
+	</tr>
+</table>
+
+
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -r77e263b43c7aed360e8dcc46af273db55123bc83
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
@@ -53,26 +53,54 @@
 		<tr><td colspan="3">
 			<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />
 			<span id="messageArea"></span>
-		</td></tr>	
+		</td>
+		</tr>	
 		<tr>
-			<th colspan="3">
-				<fmt:message key="message.session.name" />
-				:
-				<c:out value="${toolSessionDto.sessionName}" />
-			</th>
+			<td colspan="3" >
+				<h2>
+					<fmt:message key="message.session.name" />:	<c:out value="${toolSessionDto.sessionName}" />
+				</h2>
+			</td>
 		</tr>
-		<c:forEach var="user" items="${userlist}">
+	</table>
+	<table cellpadding="0">
+		<c:forEach var="user" items="${userlist}" varStatus="status">
+			<c:if test="${status.first}">
+				<tr>
+					<th>
+						<fmt:message key="monitoring.user.fullname"/>
+					</th>
+					<th>
+						<fmt:message key="monitoring.user.loginname"/>
+					</th>
+					<c:if test="${user.hasRefection}">
+						<th>
+							<fmt:message key="monitoring.user.reflection"/>
+						</th>
+					</c:if>
+					<th>&nbsp;</th>
+				</tr>
+			</c:if>
 			<tr>
 				<td>
-					<c:out value="${user.firstName}" />
-					<c:out value="${user.lastName}" />
+					<c:out value="${user.fullName}" />
 				</td>
 				<td>
 					<c:out value="${user.loginName}" />
 				</td>
 				<td>
+					<c:if test="${user.hasRefection}">
+						<c:set var="viewReflection">
+							<c:url value="/monitoring/viewReflection.do?toolSessionID=${toolSessionDto.sessionID}&userUid=${user.userUid}"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewReflection}')">
+							<fmt:message key="label.view" />
+						</html:link>
+					</c:if>
+				</td>
+				<td>
 					<c:url value="/monitoring/viewUserMark.do" var="viewuserurl">
-						<c:param name="userID" value="${user.uid}" />
+						<c:param name="userID" value="${user.userUid}" />
 						<c:param name="toolSessionID" value="${toolSessionDto.sessionID}" />
 					</c:url>
 					<html:link href="javascript:launchPopup('${viewuserurl}')" styleClass="button">
@@ -81,15 +109,16 @@
 				</td>
 			</tr>
 		</c:forEach>
-
 		<c:if test="${empty userlist}">
 			<tr>
 				<td colspan="3">
 					<b><fmt:message key="message.monitoring.summary.no.users" /></b>
 				</td>
 			</tr>
 		</c:if>
+ 	 </table>
 
+	<table cellpadding="0">
 		<tr>
 			<td align="right">
 				<html:form action="/learning/viewForum.do" target="_blank">