Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java	17 Feb 2013 16:12:00 -0000	1.3
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java	10 Apr 2014 21:10:52 -0000	1.4
@@ -23,31 +23,23 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.assessment.dto;
 
+import java.util.Date;
+
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
 
 public class ReflectDTO {
     private Long userUid;
     private String fullName;
     private String loginName;
-    private boolean hasRefection;
-    private String reflectInstrctions;
-    private boolean finishReflection;
     private String reflect;
+    private Date date;
 
     public ReflectDTO(AssessmentUser user) {
 	this.setLoginName(user.getLoginName());
 	this.setFullName(user.getFirstName() + " " + user.getLastName());
 	this.setUserUid(user.getUid());
     }
 
-    public boolean isFinishReflection() {
-	return finishReflection;
-    }
-
-    public void setFinishReflection(boolean finishReflection) {
-	this.finishReflection = finishReflection;
-    }
-
     public String getFullName() {
 	return fullName;
     }
@@ -56,14 +48,6 @@
 	this.fullName = fullName;
     }
 
-    public boolean isHasRefection() {
-	return hasRefection;
-    }
-
-    public void setHasRefection(boolean hasRefection) {
-	this.hasRefection = hasRefection;
-    }
-
     public String getLoginName() {
 	return loginName;
     }
@@ -80,19 +64,19 @@
 	this.reflect = reflect;
     }
 
-    public String getReflectInstrctions() {
-	return reflectInstrctions;
-    }
-
-    public void setReflectInstrctions(String reflectInstrctions) {
-	this.reflectInstrctions = reflectInstrctions;
-    }
-
     public Long getUserUid() {
 	return userUid;
     }
 
     public void setUserUid(Long userUid) {
 	this.userUid = userUid;
     }
+    
+    public Date getDate() {
+	return date;
+    }
+
+    public void setDate(Date date) {
+	this.date = date;
+    }
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.40 -r1.41
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	10 Mar 2014 22:39:33 -0000	1.40
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	10 Apr 2014 21:10:52 -0000	1.41
@@ -604,31 +604,30 @@
     }
     
     @Override
-    public Map<Long, Set<ReflectDTO>> getReflectList(Long contentId) {
-	Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();
+    public List<ReflectDTO> getReflectList(Long contentId) {
+	List<ReflectDTO> reflectList = new LinkedList<ReflectDTO>();
 
 	List<AssessmentSession> sessionList = assessmentSessionDao.getByContentId(contentId);
 	for (AssessmentSession session : sessionList) {
 	    Long sessionId = session.getSessionId();
-	    boolean hasRefection = session.getAssessment().isReflectOnActivity();
-	    Set<ReflectDTO> list = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
 	    // get all users in this session
 	    List<AssessmentUser> users = assessmentUserDao.getBySessionID(sessionId);
 	    for (AssessmentUser user : users) {
-		ReflectDTO ref = new ReflectDTO(user);
 
 		NotebookEntry entry = getEntry(sessionId, user.getUserId().intValue());
 		if (entry != null) {
+		    ReflectDTO ref = new ReflectDTO(user);
 		    ref.setReflect(entry.getEntry());
+		    Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified() : entry
+			    .getCreateDate();
+		    ref.setDate(postedDate);
+		    reflectList.add(ref);
 		}
-
-		ref.setHasRefection(hasRefection);
-		list.add(ref);
+		
 	    }
-	    map.put(sessionId, list);
 	}
 
-	return map;
+	return reflectList;
     }
 
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java,v
diff -u -r1.22 -r1.23
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	10 Mar 2014 22:39:33 -0000	1.22
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	10 Apr 2014 21:10:52 -0000	1.23
@@ -235,7 +235,7 @@
     
     void updateEntry(NotebookEntry notebookEntry);
     
-    Map<Long, Set<ReflectDTO>> getReflectList(Long contentId);
+    List<ReflectDTO> getReflectList(Long contentId);
 
     /**
      * If success return next activity's url, otherwise return null.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v
diff -u -r1.21 -r1.22
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	17 Jan 2014 21:35:00 -0000	1.21
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	10 Apr 2014 21:10:52 -0000	1.22
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.assessment.web.action;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -46,9 +45,9 @@
 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.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary;
+import org.lamsfoundation.lams.tool.assessment.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.Summary;
 import org.lamsfoundation.lams.tool.assessment.dto.UserSummary;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
@@ -133,6 +132,13 @@
 	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
 	    request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
 	}
+	
+	// Create reflectList if reflection is enabled.
+	if (assessment.isReflectOnActivity()) {
+	    List<ReflectDTO> reflectList = service.getReflectList(assessment.getContentId());
+	    // Add reflectList to sessionMap
+	    sessionMap.put(AssessmentConstants.ATTR_REFLECT_LIST, reflectList);
+	}
 
 	// cache into sessionMap
 	boolean isGroupedActivity = service.isGroupedActivity(contentId);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java,v
diff -u -r1.9 -r1.10
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java	17 Jan 2014 21:35:01 -0000	1.9
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java	10 Apr 2014 21:10:52 -0000	1.10
@@ -197,7 +197,7 @@
 
 	// Create reflectList if reflection is enabled.
 	if (content.isReflectOnActivity()) {
-	    Map<Long, Set<ReflectDTO>> reflectList = service.getReflectList(content.getContentId());
+	    List<ReflectDTO> reflectList = service.getReflectList(content.getContentId());
 	    // Add reflectList to sessionMap
 	    sessionMap.put(AssessmentConstants.ATTR_REFLECT_LIST, reflectList);
 	}
Index: lams_tool_assessment/web/pages/export/parts/exportteacher.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/parts/exportteacher.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	27 Mar 2014 01:49:53 -0000	1.9
+++ lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	10 Apr 2014 21:10:52 -0000	1.10
@@ -227,20 +227,16 @@
 				<fmt:message key="label.export.reflection" />
 			</h3>
 			
-			<c:forEach var="summary" items="${summaryList}">
-				<div style="padding-bottom: 5px; font-size: small;">
-					<B><fmt:message key="monitoring.label.group" /></B> ${summary.sessionName}
-				</div>			
+			<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
 			
-				<c:set var="reflectDTOSet" value="${sessionMap.reflectList[summary.sessionId]}" />
-				<c:forEach var="reflectDTO" items="${reflectDTOSet}">
-					<h4>
-						<c:out value="${reflectDTO.fullName}" escapeXml="true" />
-					</h4>
-					<p>
-						<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
-					</p>
-				</c:forEach>
+				<h4>
+					<c:out value="${reflectDTO.fullName}" escapeXml="true" />
+				</h4>
+				
+				<p>
+					<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+				</p>
+				
 			</c:forEach>
 		</c:if>
 	
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	1 Apr 2014 16:51:09 -0000	1.22
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	10 Apr 2014 21:10:52 -0000	1.23
@@ -268,6 +268,10 @@
 
 <br/>
 
+<c:if test="${assessment.reflectOnActivity && not empty sessionMap.reflectList}">
+	<%@ include file="parts/reflections.jsp"%>
+</c:if>
+
 <%@ include file="parts/advanceoptions.jsp"%>
 
 <%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp	10 Apr 2014 21:10:52 -0000	1.1
@@ -0,0 +1,23 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<br>
+<table class="alternative-color" id="reflections">
+						
+	<tr>
+		<th>
+			<fmt:message key="label.export.reflection"/>
+		</th>
+	</tr>
+
+	<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
+		<tr>
+			<td valign=top class="align-left">
+				<c:out value="${reflectDTO.fullName}" escapeXml="true"/> <lams:Date value="${reflectDTO.date}"/>
+				<br>
+				<lams:out value="${reflectDTO.reflect}" escapeHtml="true"/>
+
+			</td>
+		</tr>
+	</c:forEach>
+
+</table>