Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml
===================================================================
diff -u -r759c8f83bff5a495f44ea5532762395ee626c7c2 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml	(.../Learner.hbm.xml)	(revision 759c8f83bff5a495f44ea5532762395ee626c7c2)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml	(.../Learner.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -27,7 +27,7 @@
 
         <property
             name="userID"
-            type="java.lang.Long"
+            type="java.lang.Integer"
             update="true"
             insert="true"
             column="user_id"
@@ -71,6 +71,30 @@
 
         </set>
 
+        <property
+            name="firstName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="first_name"
+        />
+
+        <property
+            name="loginName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="login_name"
+        />
+
+        <property
+            name="lastName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="last_name"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Learner.xml
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
diff -u -r759c8f83bff5a495f44ea5532762395ee626c7c2 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 759c8f83bff5a495f44ea5532762395ee626c7c2)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -92,7 +92,7 @@
         <many-to-one
             name="learner"
             class="org.lamsfoundation.lams.tool.sbmt.Learner"
-            cascade="save-update"
+            cascade="none"
             outer-join="auto"
             update="true"
             insert="true"
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -135,6 +135,22 @@
             length="1"
         />
 
+        <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-SubmitFilesContent.xml
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r72f6e3022da30ab5159b343337be8a71f075e2ff -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 72f6e3022da30ab5159b343337be8a71f075e2ff)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -54,25 +54,6 @@
 
         </set>
 
-        <set
-            name="learners"
-            lazy="true"
-            inverse="true"
-            cascade="all-delete-orphan"
-            sort="unsorted"
-        >
-
-            <key
-                column="session_id"
-            >
-            </key>
-
-            <one-to-many
-                  class="org.lamsfoundation.lams.tool.sbmt.Learner"
-            />
-
-        </set>
-
         <many-to-one
             name="content"
             class="org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent"
Index: lams_tool_sbmt/conf/language/ApplicationResources.properties
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -110,4 +110,17 @@
 
 
 #======= End labels: Exported 101 labels for en AU =====
-error.title.blank =Title can not be blank.
\ No newline at end of file
+error.title.blank =Title can not be blank.
+
+label.authoring.advanced.reflectOnActivity=Reflect on Submit Files
+error.reflection.emtpy=Please input reflection
+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
+
+label.limit.number.upload=Limit number of files to upload
+label.number.to.upload=Number of files to upload
+label.unlimited=Unlimited  
\ No newline at end of file
Index: lams_tool_sbmt/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rc261f143be0756641bb0423662c0175aeb91ed7b -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c261f143be0756641bb0423662c0175aeb91ed7b)
+++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -1,13 +1,35 @@
 <!-- ========== Action Mapping Definitions ============================== -->
-<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
-		name="SbmtAuthoringForm" 
-		scope="request" 
-		input="/authoring/definelater.jsp"
-		parameter="dispatch" 
-		validate="false">
-	<forward name="success" path="/authoring/definelater.jsp"/>
-	<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
-</action>
+		<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
+				name="SbmtAuthoringForm" 
+				scope="request" 
+				input="/authoring/definelater.jsp"
+				parameter="dispatch" 
+				validate="false">
+			<forward name="success" path="/authoring/definelater.jsp"/>
+			<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
+		</action>
+		
+		
+		<!--  ========= Reflection =============== -->
+		<action path="/learning/newReflection"
+			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
+			name="reflectionForm" 
+			validate="false" 
+			parameter="newReflection" 
+			input="/learner/sbmtlearner.jsp" 
+			scope="request">
+			<forward name="success" path="/learner/notebook.jsp" />
+		</action>
+		
+		<action path="/learning/submitReflection"
+			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
+			name="reflectionForm" 
+			validate="true" 
+			input="/learner/notebook.jsp"
+			parameter="submitReflection" 
+			scope="request">
+			<forward name="success" path="/learner.do?method=finish" />
+		</action>
 
 <!-- ========== BEGIN: Common ============================== -->
 <action path="/clearsession" type="org.lamsfoundation.lams.tool.sbmt.web.ClearSessionAction"></action>
Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -1,22 +1,4 @@
 
-<form-bean name="SbmtLearnerForm" type="org.apache.struts.validator.DynaValidatorForm">
-	<form-property name="filePath"
-				   type="org.apache.struts.upload.FormFile"/>
-	
-	<form-property name="fileDescription"
-				   type="java.lang.String"/>
-	
-	<form-property name="toolSessionID"
-				   type="java.lang.Long"/>
-				   
-	<form-property name="userID"
-				   type="java.lang.Long"/>		
-
-	<form-property name="filesUploaded"
-				   type="java.util.List"/>
-</form-bean>
-
-
 <form-bean name="SbmtMonitoringForm" type="org.apache.struts.action.DynaActionForm">
 
 	<form-property name="toolSessionID"
Fisheye: Tag 843aa271bd7b90368cc12ce6547069eaedffa066 refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/validation-forms.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -11,12 +11,14 @@
    content_id bigint not null,
    title varchar(64) not null,
    instruction text,
-   define_later bit not null,
-   run_offline bit not null,
+   define_later smallint not null,
+   run_offline smallint not null,
    offline_instruction text,
    online_instruction text,
-   content_in_use bit,
-   lock_on_finished bit,
+   content_in_use smallint,
+   lock_on_finished smallint,
+   reflect_instructions varchar(255), 
+   reflect_on_activity smallint, 
    primary key (content_id)
 );
 create table tl_lasbmt11_instruction_files (
@@ -45,8 +47,11 @@
 create table tl_lasbmt11_session_learners (
    learner_id bigint not null auto_increment,
    user_id bigint,
-   finished bit,
+   finished smallint,
    session_id bigint,
+   first_name varchar(255), 
+   login_name varchar(255), 
+   last_name varchar(255), 
    primary key (learner_id)
 );
 create table tl_lasbmt11_submission_details (
@@ -66,5 +71,5 @@
 alter table tl_lasbmt11_submission_details add index FK1411A53C93C861A (session_id), add constraint FK1411A53C93C861A foreign key (session_id) references tl_lasbmt11_session (session_id);
 alter table tl_lasbmt11_submission_details add index FK1411A53C10BBAB1B (learner_id), add constraint FK1411A53C10BBAB1B foreign key (learner_id) references tl_lasbmt11_session_learners (learner_id);
 
-INSERT INTO `tl_lasbmt11_content` (content_id,title,instruction,define_later,run_offline,content_in_use,lock_on_finished) values(${default_content_id},"Submit files","Upload your files below...",0,0,0,0);
+INSERT INTO `tl_lasbmt11_content` (content_id,title,instruction,define_later,run_offline,content_in_use,lock_on_finished,reflect_on_activity) values(${default_content_id},"Submit files","Upload your files below...",0,0,0,0,0);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_sbmt/db/sql/table-schema.sql
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -1,6 +1,5 @@
 alter table tl_lasbmt11_instruction_files drop foreign key FKA75538F9785A173A;
 alter table tl_lasbmt11_session drop foreign key FKEC8C77C9785A173A;
-alter table tl_lasbmt11_session_learners drop foreign key FKC56CD05893C861A;
 alter table tl_lasbmt11_submission_details drop foreign key FK1411A53C10BBAB1B;
 alter table tl_lasbmt11_submission_details drop foreign key FK1411A53C93C861A;
 drop table if exists tl_lasbmt11_content;
@@ -9,14 +8,13 @@
 drop table if exists tl_lasbmt11_session;
 drop table if exists tl_lasbmt11_session_learners;
 drop table if exists tl_lasbmt11_submission_details;
-create table tl_lasbmt11_content (content_id bigint not null, title varchar(64) not null, instruction text, define_later bit not null, run_offline bit not null, offline_instruction text, online_instruction text, content_in_use bit, lock_on_finished bit, primary key (content_id));
+create table tl_lasbmt11_content (content_id bigint not null, title varchar(64) not null, instruction text, define_later bit not null, run_offline bit not null, offline_instruction text, online_instruction text, content_in_use bit, lock_on_finished bit, reflect_instructions varchar(255), reflect_on_activity bit, primary key (content_id));
 create table tl_lasbmt11_instruction_files (uid bigint not null auto_increment, uuid bigint, version_id bigint, type varchar(20), name varchar(255), content_id bigint, primary key (uid));
 create table tl_lasbmt11_report (report_id bigint not null auto_increment, comments varchar(250), marks bigint, date_marks_released datetime, primary key (report_id));
 create table tl_lasbmt11_session (session_id bigint not null, status integer not null, content_id bigint, session_name varchar(250), primary key (session_id));
-create table tl_lasbmt11_session_learners (learner_id bigint not null auto_increment, user_id bigint, finished bit, session_id bigint, primary key (learner_id));
+create table tl_lasbmt11_session_learners (learner_id bigint not null auto_increment, user_id integer, finished bit, session_id bigint, first_name varchar(255), login_name varchar(255), last_name varchar(255), primary key (learner_id));
 create table tl_lasbmt11_submission_details (submission_id bigint not null auto_increment, filePath varchar(250), fileDescription varchar(250), date_of_submission datetime, uuid bigint, version_id bigint, session_id bigint, learner_id bigint, primary key (submission_id));
 alter table tl_lasbmt11_instruction_files add index FKA75538F9785A173A (content_id), add constraint FKA75538F9785A173A foreign key (content_id) references tl_lasbmt11_content (content_id);
 alter table tl_lasbmt11_session add index FKEC8C77C9785A173A (content_id), add constraint FKEC8C77C9785A173A foreign key (content_id) references tl_lasbmt11_content (content_id);
-alter table tl_lasbmt11_session_learners add index FKC56CD05893C861A (session_id), add constraint FKC56CD05893C861A foreign key (session_id) references tl_lasbmt11_session (session_id);
 alter table tl_lasbmt11_submission_details add index FK1411A53C10BBAB1B (learner_id), add constraint FK1411A53C10BBAB1B foreign key (learner_id) references tl_lasbmt11_session_learners (learner_id);
 alter table tl_lasbmt11_submission_details add index FK1411A53C93C861A (session_id), add constraint FK1411A53C93C861A foreign key (session_id) references tl_lasbmt11_session (session_id);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml
===================================================================
diff -u -r759c8f83bff5a495f44ea5532762395ee626c7c2 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml	(.../Learner.hbm.xml)	(revision 759c8f83bff5a495f44ea5532762395ee626c7c2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml	(.../Learner.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -27,7 +27,7 @@
 
         <property
             name="userID"
-            type="java.lang.Long"
+            type="java.lang.Integer"
             update="true"
             insert="true"
             column="user_id"
@@ -71,6 +71,30 @@
 
         </set>
 
+        <property
+            name="firstName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="first_name"
+        />
+
+        <property
+            name="loginName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="login_name"
+        />
+
+        <property
+            name="lastName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="last_name"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Learner.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.java	(.../Learner.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.java	(.../Learner.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -41,19 +41,35 @@
 	private static final long serialVersionUID = 4951104689120529660L;
 	private static Logger log = Logger.getLogger(Learner.class);
 	
-    /** identifier field */
+	//key
     private Long learnerID;
-
-	/** persistent field */
-	private Long userID;
-	
-	/** persistent field */
+    //lams User ID
+	private Integer userID;
+	private String firstName;
+	private String lastName;
+	private String loginName;
 	private Long sessionID;
-	
-	/** persistent field */
 	private boolean finished;
-	
 	private Set submissionDetails;
+	
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#clone()
+	 */
+	public Object clone() {
+		
+		Object obj = null;
+		try {
+			obj = super.clone();
+		} catch (CloneNotSupportedException e) {
+			log.error("When clone " + Learner.class + " failed");
+		}
+		return obj;
+	}
+	
+	//***********************************************************
+	// Get / Set methods
+	//***********************************************************
 	/**
 	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="learner_id"
 	 * @return Returns the learnerID.
@@ -72,14 +88,14 @@
 	 * @hibernate.property column="user_id" length="20"
 	 * @return Returns the userID.
 	 */
-	public Long getUserID() {
+	public Integer getUserID() {
 		return userID;
 	}
 	/**
 	 * @param userID
 	 *            The userID to set.
 	 */
-	public void setUserID(Long userID) {
+	public void setUserID(Integer userID) {
 		this.userID = userID;
 	}
 	/**
@@ -95,19 +111,7 @@
 	public void setFinished(boolean finished) {
 		this.finished = finished;
 	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() {
-		
-		Object obj = null;
-		try {
-			obj = super.clone();
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + Learner.class + " failed");
-		}
-		return obj;
-	}
+
 	/**
 	 * @hibernate.property column="session_id" length="20"
 	 * @return Returns the sessionID.
@@ -138,4 +142,36 @@
 	public void setSubmissionDetails(Set submissionDetails) {
 		this.submissionDetails = submissionDetails;
 	}
+	/**
+	 * @hibernate.property column="first_name" 
+	 */
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	/**
+	 * @hibernate.property column="login_name" 
+	 */
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	/**
+	 * @hibernate.property column="last_name" 
+	 */
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String secondName) {
+		this.lastName = secondName;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
diff -u -r759c8f83bff5a495f44ea5532762395ee626c7c2 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 759c8f83bff5a495f44ea5532762395ee626c7c2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	(.../SubmissionDetails.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -92,7 +92,7 @@
         <many-to-one
             name="learner"
             class="org.lamsfoundation.lams.tool.sbmt.Learner"
-            cascade="save-update"
+            cascade="none"
             outer-join="auto"
             update="true"
             insert="true"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	(.../SubmissionDetails.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -224,7 +224,7 @@
 	}
 	/**
 	/**
-	 * @hibernate.many-to-one column="learner_id" cascade="save-update"
+	 * @hibernate.many-to-one column="learner_id" cascade="none"
 	 * @return Returns the learner.
 	 */
 	public Learner getLearner() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -135,6 +135,22 @@
             length="1"
         />
 
+        <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-SubmitFilesContent.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -69,6 +69,9 @@
 	private boolean runOffline;
 	private boolean contentInUse;
 
+	private boolean reflectOnActivity;
+	private String reflectInstructions;
+	
 	//relationship fields
 	private Set toolSession;
 	//temporary fields
@@ -351,5 +354,24 @@
 	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
 		this.toolContentHandler = toolContentHandler;
 	}
-
+	/**
+	 * @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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
===================================================================
diff -u -r72f6e3022da30ab5159b343337be8a71f075e2ff -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 72f6e3022da30ab5159b343337be8a71f075e2ff)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml	(.../SubmitFilesSession.hbm.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -54,25 +54,6 @@
 
         </set>
 
-        <set
-            name="learners"
-            lazy="true"
-            inverse="true"
-            cascade="all-delete-orphan"
-            sort="unsorted"
-        >
-
-            <key
-                column="session_id"
-            >
-            </key>
-
-            <one-to-many
-                  class="org.lamsfoundation.lams.tool.sbmt.Learner"
-            />
-
-        </set>
-
         <many-to-one
             name="content"
             class="org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	(.../SubmitFilesSession.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -60,9 +60,6 @@
 	/** persistent field */
 	private Set submissionDetails;
 
-	/** persistent field */
-	private Set learners;
-
 	/** persistent field, but not cloned to avoid to clone block*/
 	private SubmitFilesContent content;
 	
@@ -162,24 +159,8 @@
 	public void setSubmissionDetails(Set submissionDetails) {
 		this.submissionDetails = submissionDetails;
 	}
+
 	/**
-	 * @hibernate.set lazy="true" inverse="true" cascade="all-delete-orphan"
-	 * @hibernate.collection-one-to-many 
-	 * class="org.lamsfoundation.lams.tool.sbmt.Learner"
-	 * @hibernate.collection-key column="session_id"
-	 * 
-	 * @return Returns the learners.
-	 */
-	public Set getLearners() {
-		return learners;
-	}
-	/**
-	 * @param submissionDetails The submissionDetails to set.
-	 */
-	public void setLearners(Set learners) {
-		this.learners = learners;
-	}
-	/**
 	 * @hibernate.many-to-one column="content_id" cascade="none"
 	 * 
 	 * @return Returns the content.
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ILearnerDAO.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ILearnerDAO.java	(.../ILearnerDAO.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ILearnerDAO.java	(.../ILearnerDAO.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -32,7 +32,7 @@
 
 public interface ILearnerDAO extends IBaseDAO  {
 
-	public Learner getLearner(Long sessionID, Long userID);
+	public Learner getLearner(Long sessionID, Integer userID);
 	
 	/**
 	 * This method returns a list of files that were uploaded by the
@@ -42,7 +42,7 @@
 	 * @param sessionID The <code>session_id</code> to be looked up
 	 * @return List The list of required objects.
 	 */
-	public List getSubmissionDetailsForUserBySession(Long userID,Long sessionID);
+	public List getSubmissionDetailsForUserBySession(Integer userID,Long sessionID);
 	
 	public void saveLearner(Learner learner);
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java	(.../LearnerDAO.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java	(.../LearnerDAO.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -35,15 +35,10 @@
 import org.lamsfoundation.lams.tool.sbmt.dao.ILearnerDAO;
 
 public class LearnerDAO extends BaseDAO implements ILearnerDAO {
-	private static final String TABLENAME = "tl_lasbmt11_session_learners";
-	private static final String FIND_BY_USER_ID_SESSION_ID = "from " + TABLENAME +
-	 " in class " + Learner.class.getName() +
-	 " where user_id=? and session_id=?";
-	private static final String FIND_FOR_USER_BY_SESSION = "from " + TABLENAME +
-								" in class " + Learner.class.getName() +
-								" where user_id=? AND session_id=?";
+	private static final String FIND_BY_USER_ID_SESSION_ID = "from " + Learner.class.getName() +
+	 		" where user_id=? and session_id=?";
 
-	public Learner getLearner(Long sessionID, Long userID) {
+	public Learner getLearner(Long sessionID, Integer userID) {
 		if ( sessionID != null && userID != null ) {
 			return (Learner) this.getSession().createQuery(FIND_BY_USER_ID_SESSION_ID)
 				.setLong(0, userID.longValue())
@@ -71,9 +66,9 @@
 		this.getHibernateTemplate().flush();
 	}
 
-	public List getSubmissionDetailsForUserBySession(Long userID, Long sessionID) {
+	public List getSubmissionDetailsForUserBySession(Integer userID, Long sessionID) {
 		if ( userID != null && sessionID != null ) {
-			Learner learner = (Learner) this.getSession().createQuery(FIND_FOR_USER_BY_SESSION)
+			Learner learner = (Learner) this.getSession().createQuery(FIND_BY_USER_ID_SESSION_ID)
 										.setLong(0, userID.longValue())
 										.setLong(1, sessionID.longValue())
 										.uniqueResult();
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	(.../SubmissionDetailsDAO.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	(.../SubmissionDetailsDAO.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -42,10 +42,8 @@
 public class SubmissionDetailsDAO extends BaseDAO implements
 		ISubmissionDetailsDAO {
 	
-	private static final String TABLENAME = "tl_lasbmt11_submission_details";
-	
-	private static final String FIND_BY_SESSION = "from " + TABLENAME +
-													" in class " + SubmissionDetails.class.getName() +
+	private static final String FIND_BY_SESSION = "from " + 
+													SubmissionDetails.class.getName() +
 													" where session_id=?";
 	
 	private static final String FIND_DISTINCT_USER = " select distinct learner.userID from SubmissionDetails details " +
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java	(.../SubmitFilesReportDAO.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java	(.../SubmitFilesReportDAO.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -38,9 +38,7 @@
 public class SubmitFilesReportDAO extends BaseDAO implements
 		ISubmitFilesReportDAO {
 	
-	private static final String TABLENAME ="tl_lasbmt11_report";
-	private static final String FIND_BY_SUBMISSION = "from " + TABLENAME +
-											   " in class " + SubmitFilesReport.class.getName() + 
+	private static final String FIND_BY_SUBMISSION = "from " + SubmitFilesReport.class.getName() + 
 											   " where submission_id=?" ;
 
 	/**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
diff -u -r83ebe1df0e0c764033c0cde819399fd44d8f821b -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	(.../FileDetailsDTO.java)	(revision 83ebe1df0e0c764033c0cde819399fd44d8f821b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	(.../FileDetailsDTO.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -41,7 +41,7 @@
 
 	private Logger log = Logger.getLogger(FileDetailsDTO.class);
 	private static final long serialVersionUID = 2964711101016972263L;
-	private Long userID;
+	private Integer userID;
 	private Long submissionID;
 	private Long reportID;
 	private String filePath;
@@ -217,14 +217,14 @@
 	/**
 	 * @return Returns the userID.
 	 */
-	public Long getUserID() {
+	public Integer getUserID() {
 		return userID;
 	}
 
 	/**
 	 * @param userID The userID to set.
 	 */
-	public void setUserID(Long userID) {
+	public void setUserID(Integer userID) {
 		this.userID = userID;
 	}
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/LearnerDetailsDTO.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/LearnerDetailsDTO.java	(.../LearnerDetailsDTO.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/LearnerDetailsDTO.java	(.../LearnerDetailsDTO.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -29,6 +29,7 @@
 import java.util.Date;
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.sbmt.Learner;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
 /**
@@ -50,15 +51,20 @@
 	private Long marks;	
 	private Date dateOfSubmission;
 	private Date dateMarksReleased;
-	//If lockOnFinished is true, and learner finished the submission, this flag will be true.
-	private boolean locked;
 	
-	private String contentTitle;
-	private String contentInstruction;
-	private boolean contentLockOnFinished;
-	
 	private List filesUploaded;
 
+	private boolean hasRefection;
+	private String reflectInstrctions;
+	private boolean finishReflection;
+	private String reflect;
+	
+	public LearnerDetailsDTO(){
+		
+	}
+	public LearnerDetailsDTO(UserDTO userDto){
+		this.setUserDto(userDto);
+	}
 	/**
 	 * @return Returns the comments.
 	 */
@@ -132,42 +138,6 @@
 		this.marks = marks;
 	}
 	/**
-	 * @return Returns the contentInstruction.
-	 */
-	public String getContentInstruction() {
-		return contentInstruction;
-	}
-	/**
-	 * @param contentInstruction The contentInstruction to set.
-	 */
-	public void setContentInstruction(String contentInstruction) {
-		this.contentInstruction = contentInstruction;
-	}
-	/**
-	 * @return Returns the contentLockOnFinished.
-	 */
-	public boolean isContentLockOnFinished() {
-		return contentLockOnFinished;
-	}
-	/**
-	 * @param contentLockOnFinished The contentLockOnFinished to set.
-	 */
-	public void setContentLockOnFinished(boolean contentLockOnFinished) {
-		this.contentLockOnFinished = contentLockOnFinished;
-	}
-	/**
-	 * @return Returns the contentTitle.
-	 */
-	public String getContentTitle() {
-		return contentTitle;
-	}
-	/**
-	 * @param contentTitle The contentTitle to set.
-	 */
-	public void setContentTitle(String contentTitle) {
-		this.contentTitle = contentTitle;
-	}
-	/**
 	 * @return Returns the toolSessionID.
 	 */
 	public Long getToolSessionID() {
@@ -192,23 +162,35 @@
 	public void setFilesUploaded(List filesUploaded) {
 		this.filesUploaded = filesUploaded;
 	}
-	/**
-	 * @return Returns the locked.
-	 */
-	public boolean isLocked() {
-		return locked;
-	}
-	/**
-	 * @param locked The locked to set.
-	 */
-	public void setLocked(boolean locked) {
-		this.locked = locked;
-	}
 
 	public UserDTO getUserDto() {
 		return userDto;
 	}
 	public void setUserDto(UserDTO userDto) {
 		this.userDto = userDto;
 	}
+	public boolean isFinishReflection() {
+		return finishReflection;
+	}
+	public void setFinishReflection(boolean finishReflection) {
+		this.finishReflection = finishReflection;
+	}
+	public boolean isHasRefection() {
+		return hasRefection;
+	}
+	public void setHasRefection(boolean hasRefection) {
+		this.hasRefection = hasRefection;
+	}
+	public String getReflect() {
+		return reflect;
+	}
+	public void setReflect(String reflect) {
+		this.reflect = reflect;
+	}
+	public String getReflectInstrctions() {
+		return reflectInstrctions;
+	}
+	public void setReflectInstrctions(String reflectInstrctions) {
+		this.reflectInstrctions = reflectInstrctions;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java
===================================================================
diff -u -rb3f41153ea9815528aed7730b3760cc11f48bf75 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision b3f41153ea9815528aed7730b3760cc11f48bf75)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -23,6 +23,7 @@
 public class AuthoringForm extends ValidatorForm {
 
 	private Long toolContentID;
+	
 	private String contentFolderID;
 	
 	//control fields
@@ -41,7 +42,8 @@
     private FormFile onlineFile;
     private List onlineFileList;
     private List offlineFileList;
-    
+    private boolean reflectOnActivity;
+    private String reflectInstructions;
 
     public void reset(ActionMapping mapping, HttpServletRequest request){
     	lockOnFinished = false;
@@ -58,6 +60,9 @@
 		this.onlineInstruction = content.getOnlineInstruction();
 		this.lockOnFinished = content.isLockOnFinished();
 		
+		this.reflectOnActivity = content.isReflectOnActivity();
+		this.reflectInstructions = content.getReflectInstructions();
+		
 		onlineFileList = new ArrayList();
 		offlineFileList = new ArrayList();
 		Set fileSet = content.getInstructionFiles();
@@ -171,6 +176,18 @@
 	public void setTitle(String title) {
 		this.title = title;
 	}
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
 	public String getContentFolderID() {
 		return contentFolderID;
 	}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -0,0 +1,37 @@
+package org.lamsfoundation.lams.tool.sbmt.form;
+
+import org.apache.struts.upload.FormFile;
+import org.apache.struts.validator.ValidatorForm;
+/**
+*
+* 	Learner Form.
+*	@struts.form name="learnerForm"
+*
+*/
+public class LearnerForm extends ValidatorForm {
+
+	private String description;
+	private FormFile file;
+	
+	private String sessionMapID;
+	
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public FormFile getFile() {
+		return file;
+	}
+	public void setFile(FormFile file) {
+		this.file = file;
+	}
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
+	
+}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -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.sbmt.form;
+
+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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -30,6 +30,7 @@
 
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.Learner;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
@@ -85,7 +86,7 @@
 	 * @throws SubmitFilesException
 	 */
 	public void uploadFileToSession(Long sessionID, FormFile uploadFile,
-			   String fileDescription, Long userID) throws SubmitFilesException;
+			   String fileDescription, Integer userID) throws SubmitFilesException;
 	/**
 	 * Upload file to repository and persist relative attributes into database.
 	 *   
@@ -108,7 +109,7 @@
 	 * @param sessionID The <code>session_id</code> to be looked up
 	 * @return List The list of required objects.
 	 */
-	public List getFilesUploadedByUser(Long userID, Long sessionID);
+	public List getFilesUploadedByUser(Integer userID, Long sessionID);
 	/**
 	 * This method returns a SortedMap of all files that were submitted users within a
 	 * given <code>sessionID</code>.
@@ -126,7 +127,7 @@
 	
 	public void updateMarks(Long reportID, Long marks, String comments);
 	
-	public UserDTO getUserDetails(Long userID);
+	public UserDTO getUserDetails(Integer userID);
 	
 	public FileDetailsDTO getFileDetails(Long detailID);
 	/**
@@ -152,15 +153,15 @@
 	 * @param sessionID
 	 * @param userID
 	 */
-	public void finishSubmission(Long sessionID, Long userID);
+	public void finishSubmission(Long sessionID, Integer userID);
 	/**
 	 * Get learner by given <code>toolSessionID</code> and <code>userID</code>.
 	 *  
 	 * @param sessionID
 	 * @param userID
 	 * @return
 	 */
-	public Learner getLearner(Long sessionID, Long userID);
+	public Learner getLearner(Long sessionID, Integer userID);
     /**
      * Create the default content for the given contentID. These default data will copy from default record in 
      * Tool Content database table.
@@ -191,4 +192,27 @@
      * 			The <code>SubmitFilesContent</code> to be updated
      */
 	public void saveOrUpdateContent(SubmitFilesContent persistContent);
+	
+	/**
+	 * 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);
+	/**
+	 * Get reflection entry from notebook tool.
+	 * @param sessionId
+	 * @param idType
+	 * @param signature
+	 * @param userID
+	 * @return
+	 */
+	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
+
+	public Learner createLearner(UserDTO userDto, Long sessionID);
+	
+	public Learner getLearnerByUid(Long uid);
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r24ca84b9e61b98c068eaa369cb194a35e5511162 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 24ca84b9e61b98c068eaa369cb194a35e5511162)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -61,6 +61,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;
@@ -110,6 +112,19 @@
 	private ILearnerService learnerService;
 	private IRepositoryService repositoryService;
 	private IExportToolContentService exportContentService;
+	private ICoreNotebookService coreNotebookService;
+	
+	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);
+		}
+	}	
 	/**
 	 * (non-Javadoc)
 	 * 
@@ -506,7 +521,7 @@
 	 * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long ) 
 	 */
 	public void uploadFileToSession(Long sessionID, FormFile uploadFile,
-						   String fileDescription, Long userID) throws SubmitFilesException{
+						   String fileDescription, Integer userID) throws SubmitFilesException{
 			
 			if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
 				throw new SubmitFilesException("Could not find upload file: " + uploadFile);
@@ -527,12 +542,6 @@
 			details.setDateOfSubmission(now);
 			
 			Learner learner = learnerDAO.getLearner(sessionID,userID);
-			if(learner == null)
-				learner = new Learner();
-			learner.setUserID(userID);
-			learner.setFinished(false);
-			learner.setSessionID(sessionID);
-			
 			details.setLearner(learner);
 			details.setUuid(nodeKey.getUuid());
 			details.setVersionID(nodeKey.getVersion());
@@ -579,7 +588,7 @@
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getFilesUploadedByUserForContent(java.lang.Long, java.lang.Long)
 	 */
-	public List getFilesUploadedByUser(Long userID, Long sessionID){
+	public List getFilesUploadedByUser(Integer userID, Long sessionID){
 		List list =  learnerDAO.getSubmissionDetailsForUserBySession(userID,sessionID);
 		ArrayList details = new ArrayList();
 		if(list ==null)
@@ -649,8 +658,8 @@
 		
 		Iterator iterator = users.iterator();
 		while(iterator.hasNext()){
-			Long userID = (Long)iterator.next();			
-			User user = (User)baseDAO.find(User.class,userID.intValue());
+			Integer userID = (Integer) iterator.next();			
+			User user = (User)baseDAO.find(User.class,userID);
 			table.add(user.getUserDTO());
 		}
 		return table;
@@ -664,7 +673,7 @@
 			submitFilesReportDAO.update(report);
 		}
 	}
-	public UserDTO getUserDetails(Long userID){
+	public UserDTO getUserDetails(Integer userID){
 		User user = (User)baseDAO.find(User.class,userID.intValue());
 		if(user == null)
 			return null;
@@ -703,18 +712,10 @@
 		//current there is no false return
 		return true;
 	}
-	public void finishSubmission(Long sessionID, Long userID){
+	public void finishSubmission(Long sessionID, Integer userID){
 		Learner learner = learnerDAO.getLearner(sessionID,userID);
-		if(learner == null){
-			learner = new Learner();
-			learner.setFinished(true);
-			learner.setUserID(userID);
-			learner.setSessionID(sessionID);
-			learnerDAO.saveLearner(learner);
-		}else{
-			learner.setFinished(true);
-			learnerDAO.updateLearer(learner);
-		}
+		learner.setFinished(true);
+		learnerDAO.updateLearer(learner);
 	}
 
     /* (non-Javadoc)
@@ -817,6 +818,27 @@
     	// toolContentObj.setReflectInstructions(description);
     }
 
+    public Learner getLearnerByUid(Long learnerID){
+    	return (Learner) learnerDAO.find(Learner.class,learnerID);
+    	
+    }
+    public Learner createLearner(UserDTO userDto, Long sessionID){
+    	Learner learner = learnerDAO.getLearner(sessionID, userDto.getUserID());
+    	if(learner != null)
+    		return learner;
+    	learner = new Learner();
+    	learner.setUserID(userDto.getUserID());
+    	learner.setFirstName(userDto.getFirstName());
+    	learner.setLastName(userDto.getLastName());
+    	learner.setLoginName(userDto.getLogin());
+    	learner.setSessionID(sessionID);
+    	learner.setFinished(false);
+    	
+    	
+    	learnerDAO.saveLearner(learner);
+    	
+    	return learner;
+    }
 	/***************************************************************************
 	 * Property Injection Methods
 	 **************************************************************************/
@@ -892,7 +914,7 @@
 		this.learnerDAO = learnerDAO;
 	}
 
-	public Learner getLearner(Long sessionID, Long userID) {
+	public Learner getLearner(Long sessionID, Integer userID) {
 		return learnerDAO.getLearner(sessionID,userID);
 	}
 
@@ -917,6 +939,12 @@
 	public void setExportContentService(IExportToolContentService exportContentService) {
 		this.exportContentService = exportContentService;
 	}
+	public ICoreNotebookService getCoreNotebookService() {
+		return coreNotebookService;
+	}
+	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
+		this.coreNotebookService = coreNotebookService;
+	}
 	
 
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r24ca84b9e61b98c068eaa369cb194a35e5511162 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 24ca84b9e61b98c068eaa369cb194a35e5511162)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -61,6 +61,7 @@
 		<property name="learnerService"><ref bean="learnerService"/></property>
 		<property name="toolService"><ref bean="lamsToolService"/></property>
 		<property name="exportContentService"><ref bean="exportToolContentService"/></property>
+		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>		
 	</bean>
 	
 	<bean id="submitFilesService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -36,14 +36,21 @@
 //	public static final String TOOL_CONTENT_ID = "toolContentID";
 	public static final String USER_ID = "userID";
 	
-	//TODO: hard code, need to read from config file/db
-	public static final String TOOL_URL_BASE = "/lams/tool/lasbmt11/";
 	public static final String ATTACHMENT_LIST = "attachmentList";
 	public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
 	public static final String PAGE_EDITABLE = "isPageEditable";
 	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
+	public static final String ATTR_USER_UID = "userUid";
+	public static final String SUCCESS = "success";
+	public static final String ATTR_FINISH_LOCK = "finishLock";
+	public static final String ATTR_REFLECTION_ON = "reflectOn";
+	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+	public static final String ATTR_TITLE = "title";
+	public static final String ATTR_INSTRUCTION = "instruction";
+	public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish";
+	public static final String PARAM_MIN_UPLOAD = "minUpload";
 
 }
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java
===================================================================
diff -u -r0d2f196fb56f3fe9da7f0fb73717ef655554a1fd -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java	(.../SbmtWebUtils.java)	(revision 0d2f196fb56f3fe9da7f0fb73717ef655554a1fd)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java	(.../SbmtWebUtils.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -24,13 +24,8 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.tool.sbmt.util;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -55,22 +50,5 @@
             return false;
 	}
 
-	/**
-	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
-	 * @param request
-	 * @return
-	 */
-	public static ToolAccessMode getAccessMode(HttpServletRequest request) {
-		ToolAccessMode mode = null;
-		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
-			mode = ToolAccessMode.TEACHER;
-		else if (StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.AUTHOR.toString()))
-			mode = ToolAccessMode.AUTHOR;
-		else if (StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.LEARNER.toString()))
-			mode = ToolAccessMode.LEARNER;
-		
-		return mode;
-	}
-	
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -rb3f41153ea9815528aed7730b3760cc11f48bf75 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision b3f41153ea9815528aed7730b3760cc11f48bf75)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -91,8 +91,11 @@
 	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		ToolAccessMode mode = SbmtWebUtils.getAccessMode(request);
-		
+		ToolAccessMode mode = null;
+		try{
+			mode =  WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,true);
+		}catch(Exception e){
+		}
 		//when first time open flash icon on authoring page: mode will be null 
 		if(mode == null)
 			mode = ToolAccessMode.AUTHOR;
@@ -160,7 +163,16 @@
 		AuthoringForm authForm = (AuthoringForm) form;
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
 		
-		ToolAccessMode mode = SbmtWebUtils.getAccessMode(request);
+
+		ToolAccessMode mode = null;
+		try{
+			mode =  WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,true);
+		}catch(Exception e){
+		}
+		//when first time open flash icon on authoring page: mode will be null 
+		if(mode == null)
+			mode = ToolAccessMode.AUTHOR;
+		
 		ActionMessages errors = validate(authForm, mapping, request);
 		if(!errors.isEmpty()){
 			saveErrors(request, errors);
@@ -388,6 +400,8 @@
 		content.setOnlineInstruction(online_instruction);
 		content.setTitle(title);
 		content.setLockOnFinished(lock_on_finished);
+		content.setReflectInstructions(authForm.getReflectInstructions());
+		content.setReflectOnActivity(authForm.isReflectOnActivity());
 		// content.setInstrctionFiles()
 		// content.setToolSession();
 		return content;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java
===================================================================
diff -u -re76c3706b6db1d6af4fc1c15a0afabbf2ad04d4d -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	(.../ExportServlet.java)	(revision e76c3706b6db1d6af4fc1c15a0afabbf2ad04d4d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	(.../ExportServlet.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -230,7 +230,7 @@
 			throw new SubmitFilesException(error);
 		}
 
-		Learner learner = sbmtService.getLearner(toolSessionID, userID);
+		Learner learner = sbmtService.getLearner(toolSessionID, new Integer(userID.intValue()));
 
 		if (learner == null) {
 			String error = "The user with user id "
@@ -253,7 +253,7 @@
 			throw new SubmitFilesException(error);
 		}
 
-		List fileList = sbmtService.getFilesUploadedByUser(userID,toolSessionID);
+		List fileList = sbmtService.getFilesUploadedByUser(new Integer(userID.intValue()),toolSessionID);
 		//if mark not release, then set these message as null.
 		Iterator iter = fileList.iterator();
 		while(iter.hasNext()){
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -33,13 +33,14 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -52,27 +53,28 @@
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.LearnerDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
+import org.lamsfoundation.lams.tool.sbmt.form.LearnerForm;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
-import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
  * @author Manpreet Minhas
  * @author Steve.Ni
  * @struts.action 
  * 			path="/learner"
  * 			parameter="method"
- * 			name="SbmtLearnerForm"
- * 			input="/learner/sbmtLearner.jsp"
+ * 			name="learnerForm"
+ * 			input="/learner/sbmtlearner.jsp"
  * 			scope="request"
  * 			validate="false"
  * 
- * @struts.action-forward name="upload" path="/learner/sbmtLearner.jsp"
+ * @struts.action-forward name="success" path="/learner/sbmtlearner.jsp"
  * @struts.action-forward name="defineLater" path="/learner/definelater.jsp"
  * @struts.action-forward name="runOffline" path="/learner/runoffline.jsp"
 
@@ -82,33 +84,8 @@
     
     private static final boolean MODE_OPTIONAL = false;
     
-	public ISubmitFilesService submitFilesService;
 	public static Logger logger = Logger.getLogger(LearnerAction.class);
     
-    
-    public ActionForward unspecified(
-            ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response)
-    {
-        
-        //set the mode into http session 
-        ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,MODE_OPTIONAL);
-        if(mode.equals(ToolAccessMode.LEARNER) || mode.equals(ToolAccessMode.AUTHOR) ){
-        	request.setAttribute(AttributeNames.ATTR_MODE,mode);
-            return listFiles(mapping, form, request, response);
-        }
-        else if(mode.equals(ToolAccessMode.TEACHER)){
-        	request.setAttribute(AttributeNames.ATTR_MODE,mode);
-        	return listFiles(mapping, form, request, response);
-        }
-        
-        logger.error("Requested mode + '" + mode.toString() + "' not supported");
-        
-        return returnErrors(mapping,request,"submit.modenotsupported","upload");
-    }
-    
 	/**
 	 * The initial page of learner in Submission tool. This page will list all uploaded files and learn 
 	 * @param mapping
@@ -117,48 +94,76 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward listFiles(ActionMapping mapping,
-									ActionForm form,
-									HttpServletRequest request,
-									HttpServletResponse response){
+    public ActionForward unspecified(
+            ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response)
+    {
+		//to avoid user without patience click "upload" button too fast
+		saveToken(request);
+
+    	//initial session Map
+    	SessionMap sessionMap = new SessionMap();
+		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+		((LearnerForm)form).setSessionMapID(sessionMap.getSessionID());
 		
-		DynaActionForm authForm= (DynaActionForm)form;
-		Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+        //get parameters from Request
+		ToolAccessMode mode = null;
+		try{
+			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,MODE_OPTIONAL);
+		}catch(Exception e){}
+		if(mode == null) mode = ToolAccessMode.LEARNER;
+        
+		Long sessionID =  new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
+		
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		Long userID = new Long(user.getUserID().longValue());
+		Integer userID = user.getUserID();
 		
-		//get submission information from content table.E.g., title, instruction
-		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+		ISubmitFilesService submitFilesService = getService();
 		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 		SubmitFilesContent content = session.getContent();
 
-		
 		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
-		Learner learner = submitFilesService.getLearner(sessionID,userID);
-		setLearnerDTO(request, sessionID,user,learner, content, filesUploaded);
-		//to avoid user without patience click "upload" button too fast
-		saveToken(request);
+		Learner learner = getCurrentLearner(sessionID, submitFilesService);
+		setLearnerDTO(request, user,learner,  filesUploaded);
 		
+//		check whehter finish lock is on/off
+		boolean lock = content.isLockOnFinished() && learner.isFinished();
+		
+		sessionMap.put(AttributeNames.PARAM_MODE, mode);
+		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+		sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, lock);
+		sessionMap.put(SbmtConstants.ATTR_LOCK_ON_FINISH, content.isLockOnFinished());
+		sessionMap.put(SbmtConstants.ATTR_REFLECTION_ON,content.isReflectOnActivity());
+		sessionMap.put(SbmtConstants.ATTR_REFLECTION_INSTRUCTION,content.getReflectInstructions());
+		sessionMap.put(SbmtConstants.ATTR_TITLE,content.getTitle());
+		sessionMap.put(SbmtConstants.ATTR_INSTRUCTION,content.getInstruction());
+		
+		
 		//if content in use, return special page.
 		if(content.isDefineLater()){
 			return mapping.findForward("defineLater");
 		}
-		//add run offline support
-		if(content.isRunOffline()){
-			return mapping.findForward("runOffline");		
-		}
 		
 		//set contentInUse flag to true!
 		content.setContentInUse(true);
 		content.setDefineLater(false);
 		submitFilesService.saveOrUpdateContent(content);
 		
-		return mapping.getInputForward();
+		//add run offline support
+		if(content.isRunOffline()){
+			return mapping.findForward("runOffline");		
+		}
 		
-	}
+		return mapping.findForward(SbmtConstants.SUCCESS);
+    }
+
+
 	/**
 	 * Implements learner upload submission function. This function also display the page again for learner uploading
 	 * more submission use. 
@@ -173,57 +178,66 @@
 									HttpServletRequest request,
 									HttpServletResponse response){
 		
+		LearnerForm learnerForm= (LearnerForm)form;
+		String sessionMapID = learnerForm.getSessionMapID();
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+		
+		if(validateUploadForm(learnerForm,request)){
+			return mapping.getInputForward();
+		}
+		
+		
 		 //set the mode into http session 
-        ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,MODE_OPTIONAL);
-       	request.setAttribute(AttributeNames.ATTR_MODE,mode);
+        Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
        	
-		DynaActionForm authForm= (DynaActionForm)form;
 		if(!isTokenValid(request,true)){
-			Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+			resetToken(request);
 			//get session from shared session.
 			HttpSession ss = SessionManager.getSession();
 			//get back login user DTO
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			Long userID = new Long(user.getUserID().longValue());
+			Integer userID = user.getUserID();
 			
-			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+			ISubmitFilesService submitFilesService = getService();
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 
-			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
-			SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
-			SubmitFilesContent content = session.getContent();
-			Learner learner = submitFilesService.getLearner(sessionID,userID);
-			setLearnerDTO(request, sessionID,user,learner, content, filesUploaded);
-			return returnErrors(mapping,request,"submit.upload.twice","upload");
+			Learner learner = getCurrentLearner(sessionID, submitFilesService);
+			setLearnerDTO(request, user,learner, filesUploaded);
+			return returnErrors(mapping,request,"submit.upload.twice","success");
 		}
+		//to avoid user without patience click "upload" button too fast 
+		saveToken(request);
 		
-		Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		Long userID = new Long(user.getUserID().longValue());
+		Integer userID = user.getUserID();
 		
-		FormFile uploadedFile= (FormFile) authForm.get("filePath");
-		String fileDescription = (String) authForm.get("fileDescription");
-		authForm.set("fileDescription","");
 		
-		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
-		//to avoid user without patience click "upload" button too fast 
-		saveToken(request);
+		FormFile uploadedFile=  learnerForm.getFile();
+		String fileDescription =  learnerForm.getDescription();
+		//reset fields and display a new form for next new file upload
+		learnerForm.setDescription("");
+		
+		ISubmitFilesService submitFilesService = getService();
+
 		try{
 			submitFilesService.uploadFileToSession(sessionID,uploadedFile,fileDescription,userID);
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
-			SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
-			SubmitFilesContent content = session.getContent();
-			Learner learner = submitFilesService.getLearner(sessionID,userID);
-			setLearnerDTO(request,sessionID,user, learner, content, filesUploaded);
+			Learner learner = getCurrentLearner(sessionID, submitFilesService);
+			
+			setLearnerDTO(request,user, learner, filesUploaded);
 			return mapping.getInputForward();			
 		}catch(SubmitFilesException se){
 			logger.error("uploadFile: Submit Files Exception has occured" + se.getMessage());
-			return returnErrors(mapping,request,se.getMessage(),"upload");
+			return returnErrors(mapping,request,se.getMessage(),"success");
 		}
 	}
+
+
+
 	/**
 	 * Learner choose finish upload button, will invoke this function. This function will mark the <code>finished</code> 
 	 * field by special toolSessionID and userID.
@@ -239,24 +253,27 @@
 			HttpServletRequest request,
 			HttpServletResponse response){
 		
-		DynaActionForm authForm = (DynaActionForm) form;
-		ToolAccessMode mode = SbmtWebUtils.getAccessMode(request);
+		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 		
+		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+		Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		
 		if (mode == ToolAccessMode.LEARNER || mode.equals(ToolAccessMode.AUTHOR) ) {
 			ToolSessionManager sessionMgrService = SubmitFilesServiceProxy.getToolSessionManager(getServlet().getServletContext());
-			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+			ISubmitFilesService submitFilesService = getService();
 
-			Long sessionID = (Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 			//get back login user DTO
 			//get session from shared session.
 			HttpSession ss = SessionManager.getSession();
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			Long userID = new Long(user.getUserID().longValue());
+			Integer userID = user.getUserID();
 			submitFilesService.finishSubmission(sessionID, userID);
 
 			String nextActivityUrl;
 			try {
-				nextActivityUrl = sessionMgrService.leaveToolSession(sessionID, userID);
+				nextActivityUrl = sessionMgrService.leaveToolSession(sessionID, new Long(userID.intValue()));
 				response.sendRedirect(nextActivityUrl);
 			} catch (DataMissingException e) {
 				throw new SubmitFilesException(e);
@@ -265,15 +282,41 @@
 			} catch (IOException e) {
 				throw new SubmitFilesException(e);
 			}
-			return null;
 		}
+		return null;
 		
-		return returnErrors(mapping,request,"error.read.only.mode","upload");
-		
 	}
+	
 	//**********************************************************************************************
 	//		Private mehtods
 	//**********************************************************************************************
+	private ISubmitFilesService getService() {
+		ISubmitFilesService submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+		return submitFilesService;
+	}
+	
+	//validate uploaded form
+	private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) {
+		ActionErrors errors = new ActionErrors();
+		boolean error = false;
+		if(learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getFileName())){
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.required",
+					this.getResources(request).getMessage("learner.form.filepath.displayname")));
+			
+			error = true;
+		}
+		if(StringUtils.isBlank(learnerForm.getDescription())){
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.required",
+					this.getResources(request).getMessage("label.learner.fileDescription")));
+			
+			error = true;
+		}
+		
+		if(error)
+			this.addErrors(request,errors);
+		
+		return error;
+	}
 	/**
 	 * This is a utily function for forwarding the errors to the respective JSP
 	 * page indicated by <code>forward</code>
@@ -307,23 +350,13 @@
 	 * @param content
 	 * @param filesUploaded 
 	 */
-	private void setLearnerDTO(HttpServletRequest request, Long sessionID,
-			UserDTO userDto, Learner learner, SubmitFilesContent content,
+	private void setLearnerDTO(HttpServletRequest request, UserDTO userDto, Learner learner, 
 			List filesUploaded) {
 		
 		LearnerDetailsDTO dto = new LearnerDetailsDTO();
-		//don't use learner data, becuase these 2 values come from web page. Learner maybe empty.
-		dto.setToolSessionID(sessionID);
 		dto.setUserDto(userDto);
 		
 		if(learner != null){
-			//only content is lock-on-finished, then check whehter learner choose "finish"
-			if(content.isLockOnFinished())
-				//if learner already finished and lcokonfinished is true, the lock the page, learner
-				//can not "finish" again.
-				dto.setLocked(learner.isFinished());
-			else
-				dto.setLocked(false);
 			//if Monitoring does not release marks, then skip this mark and comment content.
 			if(filesUploaded != null){
 				Iterator iter = filesUploaded.iterator();
@@ -337,11 +370,22 @@
 			}
 			dto.setFilesUploaded(filesUploaded);
 		}
-		if(content != null){
-			dto.setContentInstruction(content.getInstruction());
-			dto.setContentLockOnFinished(content.isLockOnFinished());
-			dto.setContentTitle(content.getTitle());
-		}
 		request.setAttribute("learner",dto);
 	}
+
+	private Learner getCurrentLearner(Long sessionID, ISubmitFilesService submitFilesService) {
+		//get session from shared session.
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		Integer userID = user.getUserID();
+
+		Learner learner = submitFilesService.getLearner(sessionID,userID);
+		if(learner == null){
+			learner = submitFilesService.createLearner(user, sessionID);
+		}
+			
+		return learner;
+	}
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r83ebe1df0e0c764033c0cde819399fd44d8f821b -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 83ebe1df0e0c764033c0cde819399fd44d8f821b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -30,14 +30,14 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -50,19 +50,25 @@
 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.sbmt.Learner;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
+import org.lamsfoundation.lams.tool.sbmt.dto.LearnerDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -85,6 +91,7 @@
  * 
  * @struts.action-forward name="statistic" path="/monitoring/parts/statisticpart.jsp"
  * 
+ * @struts.action-forward name="viewReflect" path="/monitoring/notebook.jsp"
  */
 public class MonitoringAction extends LamsDispatchAction {
 	
@@ -304,7 +311,7 @@
 							   HttpServletRequest request,
 							   HttpServletResponse response){
 		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
-		Long userID = new Long(WebUtil.readLongParam(request,"userID"));
+		Integer userID = WebUtil.readIntParam(request,"userID");
 
 		submitFilesService = getSubmitFilesService();
 		//return FileDetailsDTO list according to the given userID and sessionID
@@ -359,7 +366,7 @@
 							   HttpServletRequest request,
 							   HttpServletResponse response){
 		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
-		Long userID = new Long(WebUtil.readLongParam(request,"userID"));
+		Integer userID = WebUtil.readIntParam(request,"userID");
 		Long detailID = new Long(WebUtil.readLongParam(request,"detailID"));
 		String updateMode = request.getParameter("updateMode");
 		Long reportID= new Long(WebUtil.readLongParam(request,"reportID"));
@@ -524,12 +531,50 @@
             Long sessionID = sfs.getSessionID();
             sessionDto.setSessionID(sessionID);
             sessionDto.setSessionName(sfs.getSessionName());
-            List userList = submitFilesService.getUsers(sessionID);
-            sessionUserMap.put(sessionDto, userList);
+            
+            boolean hasReflect = sfs.getContent().isReflectOnActivity();
+            //construct LearnerDTO list
+            List<UserDTO> userList = submitFilesService.getUsers(sessionID);
+            List<LearnerDetailsDTO> learnerList = new ArrayList<LearnerDetailsDTO>();
+            for(UserDTO user : userList){
+            	LearnerDetailsDTO learnerDto = new LearnerDetailsDTO();
+            	learnerDto.setUserDto(user);
+            	learnerDto.setHasRefection(hasReflect);
+            	learnerList.add(learnerDto);
+            }
+            sessionUserMap.put(sessionDto, learnerList);
         }
         
 		//request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
 		request.setAttribute("sessionUserMap",sessionUserMap);
 	}
+	
+	public ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Integer userID = WebUtil.readIntParam(request,SbmtConstants.ATTR_USER_UID);
+		Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+		
+		submitFilesService = getSubmitFilesService();
+		UserDTO userDto = submitFilesService.getUserDetails(userID);
 
+		submitFilesService = getSubmitFilesService();
+		NotebookEntry notebookEntry = submitFilesService.getEntry(sessionID, 
+				CoreNotebookConstants.NOTEBOOK_TOOL, 
+				SbmtConstants.TOOL_SIGNATURE, userDto.getUserID());
+		
+		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
+		
+		LearnerDetailsDTO userDTO = new LearnerDetailsDTO(userDto);
+		if(notebookEntry == null){
+			userDTO.setFinishReflection(false);
+			userDTO.setReflect(null);
+		}else{
+			userDTO.setFinishReflection(true);
+			userDTO.setReflect(notebookEntry.getEntry());
+		}
+		userDTO.setReflectInstrctions(session.getContent().getReflectInstructions());
+		
+		request.setAttribute("userDTO", userDTO);
+		return mapping.findForward("viewReflect");
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -0,0 +1,133 @@
+package org.lamsfoundation.lams.tool.sbmt.web;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+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.sbmt.form.ReflectionForm;
+import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
+import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
+import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+/**
+ * 
+ * @author steven
+ *
+ */
+public class ReflectAction extends Action{
+	
+	public ActionForward execute(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) throws Exception{
+		
+		String param = mapping.getParameter();
+		//================ Reflection =======================
+		if (param.equals("newReflection")) {
+			return newReflection(mapping, form, request, response);
+		}
+		if (param.equals("submitReflection")) {
+			return submitReflection(mapping, form, request, response);
+		}
+		
+		return  mapping.findForward(SbmtConstants.SUCCESS);
+	}
+	/**
+	 * Display empty reflection form.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		
+//		ISubmitFilesService submitFilesService = getService();
+//		ActionErrors errors = validateBeforeFinish(request,submitFilesService);
+//		if(!errors.isEmpty()){
+//			this.addErrors(request,errors);
+//			return mapping.getInputForward();
+//		}
+		
+		//get session value
+		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+		
+		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(SbmtConstants.SUCCESS);
+	}
+	/**
+	 * Submit reflection form input database.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		ReflectionForm refForm = (ReflectionForm) form;
+		Integer userId = refForm.getUserID();
+		
+		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+		
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		
+		ISubmitFilesService submitFilesService = getService();
+		submitFilesService.createNotebookEntry(sessionId, 
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				SbmtConstants.TOOL_SIGNATURE, 
+				userId,
+				refForm.getEntryText());
+
+		return mapping.findForward(SbmtConstants.SUCCESS);
+	}
+
+	
+	//**********************************************************************************************
+	//		Private mehtods
+	//**********************************************************************************************
+	private ISubmitFilesService getService() {
+		ISubmitFilesService submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+		return submitFilesService;
+	}
+	public static ActionErrors validateBeforeFinish(HttpServletRequest request,ISubmitFilesService submitFilesService) {
+		ActionErrors errors = new ActionErrors();
+		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		
+		HttpSession ss = SessionManager.getSession();
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		Integer userID = user.getUserID();
+		
+		List list = submitFilesService.getFilesUploadedByUser(userID, sessionId);
+		int minUpload= (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD);
+		if(minUpload > 0){
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.learning.minimum.upload.number.less"));
+		}
+		
+		return errors;
+	}
+}
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc261f143be0756641bb0423662c0175aeb91ed7b -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c261f143be0756641bb0423662c0175aeb91ed7b)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -17,21 +17,15 @@
       name="SbmtAuthoringForm"
       type="org.lamsfoundation.lams.tool.sbmt.form.AuthoringForm"
     />
+    <form-bean
+      name="learnerForm"
+      type="org.lamsfoundation.lams.tool.sbmt.form.LearnerForm"
+    />
+    <form-bean
+      name="reflectionForm"
+      type="org.lamsfoundation.lams.tool.sbmt.form.ReflectionForm"
+    />
 
-<form-bean name="SbmtLearnerForm" type="org.apache.struts.validator.DynaValidatorForm">
-	<form-property name="filePath"
-				   type="org.apache.struts.upload.FormFile"/>
-	<form-property name="fileDescription"
-				   type="java.lang.String"/>
-	<form-property name="toolSessionID"
-				   type="java.lang.Long"/>
-	<form-property name="userID"
-				   type="java.lang.Long"/>		
-
-	<form-property name="filesUploaded"
-				   type="java.util.List"/>
-</form-bean>
-
 <form-bean name="SbmtMonitoringForm" type="org.apache.struts.action.DynaActionForm">
 
 	<form-property name="toolSessionID"
@@ -69,16 +63,16 @@
     <action
       path="/learner"
       type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
-      name="SbmtLearnerForm"
+      name="learnerForm"
       scope="request"
-      input="/learner/sbmtLearner.jsp"
+      input="/learner/sbmtlearner.jsp"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="upload"
-        path="/learner/sbmtLearner.jsp"
+        name="success"
+        path="/learner/sbmtlearner.jsp"
         redirect="false"
       />
       <forward
@@ -126,6 +120,11 @@
         path="/monitoring/parts/statisticpart.jsp"
         redirect="false"
       />
+      <forward
+        name="viewReflect"
+        path="/monitoring/notebook.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/authoring"
@@ -150,15 +149,34 @@
     </action>
 
    <!-- ========== Action Mapping Definitions ============================== -->
-<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
-		name="SbmtAuthoringForm" 
-		scope="request" 
-		input="/authoring/definelater.jsp"
-		parameter="dispatch" 
-		validate="false">
-	<forward name="success" path="/authoring/definelater.jsp"/>
-	<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
-</action>
+		<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
+				name="SbmtAuthoringForm" 
+				scope="request" 
+				input="/authoring/definelater.jsp"
+				parameter="dispatch" 
+				validate="false">
+			<forward name="success" path="/authoring/definelater.jsp"/>
+			<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
+		</action>
+		<!--  ========= Reflection =============== -->
+		<action path="/learning/newReflection"
+			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
+			name="reflectionForm" 
+			validate="false" 
+			parameter="newReflection" 
+			input="/learner/sbmtlearner.jsp" 
+			scope="request">
+			<forward name="success" path="/learner/notebook.jsp" />
+		</action>
+		<action path="/learning/submitReflection"
+			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
+			name="reflectionForm" 
+			validate="true" 
+			input="/learner/notebook.jsp"
+			parameter="submitReflection" 
+			scope="request">
+			<forward name="success" path="/learner.do?method=finish" />
+		</action>
 
 <!-- ========== BEGIN: Common ============================== -->
 <action path="/clearsession" type="org.lamsfoundation.lams.tool.sbmt.web.ClearSessionAction"></action>
Index: lams_tool_sbmt/web/WEB-INF/struts/validation.xml
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/web/WEB-INF/struts/validation.xml	(.../validation.xml)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/web/WEB-INF/struts/validation.xml	(.../validation.xml)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -5,12 +5,9 @@
     Define global validation config in validation-global.xml
   -->
   <formset>
-  <form name="SbmtLearnerForm">
-	<field property="filePath" depends="required">
-		<arg key="learner.form.filepath.displayname" />
-	</field>
-	<field property="filePath.fileSize" depends="maxFileSize" />
-</form>
+  <!--
+    Define form validation config in validation-forms.xml
+  -->
 
   </formset>
 </form-validation>
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -5,9 +5,21 @@
 	<!-- Instructions Row -->
 	<tr>
 		<td>
-			<html:checkbox property="lockOnFinished">
+			<html:checkbox property="lockOnFinished" styleClass="noBorder">
 				<fmt:message key="label.authoring.advance.lock.on.finished" />
 			</html:checkbox>
 		</td>
 	</tr>
+	<tr>
+		<td >
+			<html:checkbox property="reflectOnActivity" styleClass="noBorder"  styleId="reflectOn">
+				<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+			</html:checkbox>
+		</td>
+	</tr>
+	<tr>
+		<td >
+			<lams:STRUTS-textarea property="reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
+		</td>
+	</tr>		
 </table>
Fisheye: Tag be1442311e316654025f5d2e2615d90d3e7fd77a refers to a dead (removed) revision in file `lams_tool_sbmt/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/learner/notebook.jsp	(revision 0)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -0,0 +1,54 @@
+<%@ include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<html:html locale="true">
+<head>
+	<title><fmt:message key="label.learning.title" /></title>
+	<%@ include file="/common/header.jsp"%>
+</head>
+
+<body>
+	<div id="page-learner">
+		<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="button.finish"/>
+								</html:submit>
+							</td>
+						</tr>
+					</table>
+			</div>
+		</html:form>
+	<div id="footer-learner"></div>
+	</div><!--closes page-->
+</body>
+</html:html>	
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
diff -u -r101275d99b5a739bb87df1928291e5db597a1fca -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 101275d99b5a739bb87df1928291e5db597a1fca)
+++ lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -2,16 +2,20 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
 <html:html>
 <head>
 	<lams:headItems />
 	<script type="text/javascript">
-		var locked =  <c:out value="${learner.locked}"/>;
 		function finish(){
-			var finishUrl= "<html:rewrite page='/learner.do?method=finish&toolSessionID=${learner.toolSessionID}'/>";
+			var finishUrl= "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
 			location.href= finishUrl;
 		}
+		function notebook(){
+			var finishUrl= "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
+			location.href= finishUrl;
+		}
 	</script>
 </head>
 
@@ -35,11 +39,20 @@
 				</tr>
 			</table>
 			
-									<div class="right-buttons">
-							<html:button property="finished" onclick="finish()" disabled="${learner.locked}" styleClass="button">
-								<fmt:message key="button.finish" />
-							</html:button>
-						</div>
+			<div class="right-buttons">
+				<c:choose>
+					<c:when test="${sessionMap.reflectOn}">
+						<html:button property="continueButton" onclick="javascript:notebook();" disabled="${sessionMap.finishLock}"  styleClass="button">
+							<fmt:message key="label.continue" />
+						</html:button>
+					</c:when>
+					<c:otherwise>
+						<html:button property="finishButton" onclick="javascript:finish();" disabled="${sessionMap.finishLock}" styleClass="button">
+							<fmt:message key="button.finish" />
+						</html:button>
+					</c:otherwise>
+				</c:choose>				
+			</div>
 		</div>
 		<div id="footer-learner"></div>
 	</div>
Fisheye: Tag 843aa271bd7b90368cc12ce6547069eaedffa066 refers to a dead (removed) revision in file `lams_tool_sbmt/web/learner/sbmtLearner.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(revision 0)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -0,0 +1,203 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+
+<html:html>
+<head>
+	<title><fmt:message key="tool.display.name" /></title>
+	<html:base />
+	<lams:headItems />
+
+	<script type="text/javascript">
+		function submitCount(tUrl){
+			var lockOnFinished = <c:out value="${sessionMap.lockOnFinish}"/>;
+			var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
+			if(lockOnFinished && uploadFileNum==0){
+				if(confirm("<fmt:message key='learner.finish.without.upload'/>"))
+					location.href= tUrl;
+				else
+					return false;
+			}else
+				location.href= tUrl;
+		
+		}
+		function finish(){
+			var finishUrl= "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
+			return submitCount(finishUrl);
+		}
+		function notebook(){
+			var continueUrl= "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
+			return submitCount(continueUrl);
+		}
+	</script>
+
+</head>
+
+<body>
+	<div id="page-learner">
+		<h1 class="no-tabs-below">
+			<c:out value="${sessionMap.title}" escapeXml="false" />
+		</h1>
+
+		<div id="header-no-tabs-learner">
+
+		</div>
+
+		<div id="content-learner">
+			<table cellpadding="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td colspan="2">
+						<h2>
+							<c:out value="${sessionMap.instruction}" escapeXml="false" />
+						</h2>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<%@include file="/common/messages.jsp"%>
+					</td>
+				</tr>
+
+				<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+				<c:choose>
+
+					<c:when test="${empty learner.filesUploaded}">
+						<tr>
+							<td>
+							<fmt:message key="label.learner.noUpload" />
+							<p>
+								<fmt:message key="label.learner.uploadMessage" />
+							</p>
+							</center>
+							</td>
+						</tr>
+					</c:when>
+
+					<c:otherwise>
+
+						<c:forEach var="file" items="${learner.filesUploaded}">
+							<tr>
+								<!--First Row displaying the name of the File -->
+								<td class="field-name">
+									<fmt:message key="label.learner.fileName" />
+								</td>
+								<td>
+									<c:out value="${file.filePath}" />
+								</td>
+							</tr>
+							<tr>
+								<!--Second Row displaying the description of the File -->
+								<td class="field-name">
+									<fmt:message key="label.learner.fileDescription" />
+								</td>
+								<td>
+									<c:out value="${file.fileDescription}" escapeXml="false" />
+								</td>
+							</tr>
+							<tr>
+								<!--Third row displaying the date of submission of the File -->
+								<td class="field-name">
+									<fmt:message key="label.learner.time" />
+								</td>
+								<td>
+									<c:out value="${file.dateOfSubmission}" />
+								</td>
+							</tr>
+							<tr>
+								<!--Fourth row displaying the comments -->
+								<td class="field-name">
+									<fmt:message key="label.learner.comments" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty file.comments}">
+											<fmt:message key="label.learner.notAvailable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${file.comments}" escapeXml="false" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+							<tr>
+								<!--Fifth row displaying the marks-->
+								<td class="field-name">
+									<fmt:message key="label.learner.marks" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty file.comments}">
+											<fmt:message key="label.learner.notAvailable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${file.marks}" escapeXml="false" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="2">
+									<hr size="1" style="width:500px;"/>
+								</td>
+							</tr>
+						</c:forEach>
+
+					</c:otherwise>
+				</c:choose>
+
+			</table>
+
+			<c:if test="${sessionMap.mode != 'teacher'}">
+				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data">
+					<html:hidden property="sessionMapID"/>
+					<table>
+						<!-- Hidden fields -->
+						<html:hidden property="toolSessionID" value="${sessionMap.toolSessionID}" />
+
+						<!--File path row -->
+						<tr>
+							<td class="field-name">
+								<fmt:message key="label.learner.filePath" />
+							</td>
+							<td>
+								<html:file property="file" disabled="${sessionMap.finishLock}" size="40" tabindex="1" />
+							</td>
+						</tr>
+						<!--File Description row -->
+						<tr>
+							<td class="field-name">
+								<fmt:message key="label.learner.fileDescription" />
+							</td>
+							<td>
+								<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="description" disabled="${sessionMap.finishLock}" />
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2" align="center">
+								<html:submit disabled="${sessionMap.finishLock}" styleClass="button">
+									<fmt:message key="label.learner.upload" />
+								</html:submit>
+								<c:choose>
+									<c:when test="${sessionMap.reflectOn}">
+										<html:button property="notebookButton" onclick="javascript:notebook();" disabled="${sessionMap.finishLock}"  styleClass="button">
+											<fmt:message key="label.continue" />
+										</html:button>
+									</c:when>
+									<c:otherwise>
+										<html:button property="finishButton" onclick="javascript:finish();" disabled="${sessionMap.finishLock}" styleClass="button">
+											<fmt:message key="button.finish" />
+										</html:button>
+									</c:otherwise>
+								</c:choose>								
+							</td>
+						</tr>
+					</table>
+				</html:form>
+			</c:if>
+		</div>
+		<div id="footer-learner"></div>
+	</div>
+</body>
+</html:html>
Index: lams_tool_sbmt/web/monitoring/notebook.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/monitoring/notebook.jsp	(revision 0)
+++ lams_tool_sbmt/web/monitoring/notebook.jsp	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -0,0 +1,61 @@
+<%@ include file="/common/taglibs.jsp"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<html:html locale="true">
+<head>
+	<title><fmt:message key="label.learning.title" /></title>
+	<%@ include file="/common/header.jsp"%>
+</head>
+<body>
+	<div id="page-learner">
+			<h1 class="no-tabs-below">
+				<fmt:message key="page.title.monitoring.view.reflection"/>
+			</h1>
+			<div id="header-no-tabs-learner"></div>
+			<div id="content-learner">
+			<table>
+				<tr>
+					<td>
+						<h1>
+							${userDTO.userDto.firstName}
+							${userDTO.userDto.lastName}
+						</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="label.monitoring.done.button"/></a>
+					</td>
+				</tr>
+			</table>
+
+
+			</div>
+		<div id="footer-learner">
+		</div>
+		<!--closes footer-->
+	</div><!--closes page-->
+</body>
+</html:html>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -r84a9dd84fe84bb855c96c96acd137b5a38c2c2cd -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 84a9dd84fe84bb855c96c96acd137b5a38c2c2cd)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -38,7 +38,7 @@
 			<c:otherwise>
 				<td colspan="2">
 					<p>
-						<fmt:message key="message.monitoring.edit.activity.not.editable" />
+						<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
 					</p>
 				</td>
 			</c:otherwise>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r84a9dd84fe84bb855c96c96acd137b5a38c2c2cd -r843aa271bd7b90368cc12ce6547069eaedffa066
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 84a9dd84fe84bb855c96c96acd137b5a38c2c2cd)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 843aa271bd7b90368cc12ce6547069eaedffa066)
@@ -84,17 +84,47 @@
 	<c:set var="userlist" value="${element.value}" />
 	<table cellpadding="0">
 		<tr>
-			<th colspan="3"><fmt:message key="label.session.name" /> : 
-				<c:out value="${sessionDto.sessionName}" /></th>
+			<th colspan="3">
+				<h2>
+				<fmt:message key="label.session.name" /> : 
+				<c:out value="${sessionDto.sessionName}" />
+				</h2>
+			</th>
 		</tr>
-		<c:forEach var="user" items="${userlist}">
+		<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}" />
+				<td><c:out value="${user.userDto.firstName}" /> 
+					<c:out value="${user.userDto.lastName}" />
 				</td>
-				<td><c:out value="${user.login}" /></td>
+				<td><c:out value="${user.userDto.login}" /></td>
+				<td>
+					<c:if test="${user.hasRefection}">
+						<c:set var="viewReflection">
+							<c:url value="/monitoring.do?method=viewReflection&toolSessionID=${sessionDto.sessionID}&userUid=${user.userDto.userID}"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewReflection}')">
+							<fmt:message key="label.view" />
+						</html:link>
+					</c:if>				
+				</td>
 				<td><html:link
-					href="javascript:viewMark(${user.userID},${sessionDto.sessionID});"
+					href="javascript:viewMark(${user.userDto.userID},${sessionDto.sessionID});"
 					property="Mark" styleClass="button">
 					<fmt:message key="label.monitoring.Mark.button" />
 				</html:link></td>