Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v
diff -u -r1.24 -r1.25
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	4 Jun 2008 03:23:53 -0000	1.24
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	4 Jun 2008 06:04:03 -0000	1.25
@@ -454,46 +454,6 @@
 		return summaryList;
 	}
 	
-	/**
-	 * @param contentId
-	 * @param sessionId sessionId which defines Group 
-	 * @return
-	 */
-	public List<TaskListItem> getItemListForGroup(Long contentId, Long sessionId) {
-		
-		//create the list containing all taskListItems
-		TaskList taskList = taskListDao.getByContentId(contentId);
-		ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
-		itemList.addAll(taskList.getTaskListItems());
-		
-		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);  
-		for(TaskListSession session:sessionList) {
-			Set<TaskListItem> newItems = session.getTaskListItems();
-			for(TaskListItem item : newItems) {
-				if (!itemList.contains(item)) itemList.add(item);
-			}
-		}
-		
-		List<TaskListUser> userList = taskListUserDao.getBySessionID(sessionId);
-		
-		ArrayList<TaskListItem> groupItemList = new ArrayList<TaskListItem>();
-		for (TaskListItem item:itemList) {
-			
-			if (item.isCreateByAuthor()) {
-				groupItemList.add(item);
-			} else {
-				for (TaskListUser user:userList) {
-					if (user.getUserId().equals(item.getCreateBy().getUserId())) {
-						groupItemList.add(item);
-						break;
-					}
-				}
-			}
-		}
-		
-		return groupItemList;
-	}
-	
 	/** 
 	 * {@inheritDoc}
 	 */
@@ -1104,6 +1064,48 @@
 	    return contentId;
     }
     
+	/**
+	 * Returns list of tasks from authoring + the tasks added by members of that group. 
+	 * 
+	 * @param contentId
+	 * @param sessionId sessionId which defines Group 
+	 * @return
+	 */
+	private List<TaskListItem> getItemListForGroup(Long contentId, Long sessionId) {
+		
+		//create the list containing all taskListItems
+		TaskList taskList = taskListDao.getByContentId(contentId);
+		ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
+		itemList.addAll(taskList.getTaskListItems());
+		
+		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);  
+		for(TaskListSession session:sessionList) {
+			Set<TaskListItem> newItems = session.getTaskListItems();
+			for(TaskListItem item : newItems) {
+				if (!itemList.contains(item)) itemList.add(item);
+			}
+		}
+		
+		List<TaskListUser> userList = taskListUserDao.getBySessionID(sessionId);
+		
+		ArrayList<TaskListItem> groupItemList = new ArrayList<TaskListItem>();
+		for (TaskListItem item:itemList) {
+			
+			if (item.isCreateByAuthor()) {
+				groupItemList.add(item);
+			} else {
+				for (TaskListUser user:userList) {
+					if (user.getUserId().equals(item.getCreateBy().getUserId())) {
+						groupItemList.add(item);
+						break;
+					}
+				}
+			}
+		}
+		
+		return groupItemList;
+	}
+    
     /**
      * Process an uploaded file.
      * 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java,v
diff -u -r1.13 -r1.14
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	3 Jun 2008 01:44:35 -0000	1.13
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	4 Jun 2008 06:04:03 -0000	1.14
@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -65,6 +66,8 @@
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
 import org.lamsfoundation.lams.tool.taskList.service.TaskListException;
 import org.lamsfoundation.lams.tool.taskList.service.UploadTaskListFileException;
+import org.lamsfoundation.lams.tool.taskList.util.TaskListItemAttachmentComparator;
+import org.lamsfoundation.lams.tool.taskList.util.TaskListItemCommentComparator;
 import org.lamsfoundation.lams.tool.taskList.util.TaskListItemComparator;
 import org.lamsfoundation.lams.tool.taskList.web.form.ReflectionForm;
 import org.lamsfoundation.lams.tool.taskList.web.form.TaskListItemForm;
@@ -257,8 +260,8 @@
 			isPreviousTaskCompleted = item.isComplete();
 			
 			//filter out comments and attachments which belong to another group
-			Set filteredComments = new HashSet<TaskListItemComment>();
-			Set filteredAttachments = new HashSet<TaskListItemAttachment>();
+			Set filteredComments = new TreeSet<TaskListItemComment>(new TaskListItemCommentComparator());
+			Set filteredAttachments = new TreeSet<TaskListItemAttachment>(new TaskListItemAttachmentComparator());
 			if (mode.isLearner()) {
 				
 				List<TaskListUser> grouppedUsers = service.getUserListBySessionId(sessionId);
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/learning.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_task/web/pages/learning/learning.jsp	3 Jun 2008 02:25:54 -0000	1.16
+++ lams_tool_task/web/pages/learning/learning.jsp	4 Jun 2008 06:04:03 -0000	1.17
@@ -189,7 +189,7 @@
 			<div class="space-bottom-top align-right">
 
 				<c:choose>
-					<c:when	test="${taskList.monitorVerificationRequired && !sessionMap.userVerifiedByMonitor}">
+					<c:when	test="${taskList.monitorVerificationRequired && !sessionMap.userVerifiedByMonitor && (mode != 'author')}">
 						<fmt:message key="label.learning.wait.for.monitor.verification" />
 					</c:when>
 				
Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/parts/itemdetails.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	3 Jun 2008 02:25:54 -0000	1.4
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	4 Jun 2008 06:04:03 -0000	1.5
@@ -42,7 +42,8 @@
 				</div>
 				
 				<div >
-					<html:textarea property="comment" rows="2" style="width: 65%;"/>
+ 					<html:textarea property="comment" rows="2" style="width: 65%;" />  
+<!--					<lams:STRUTS-textarea property="comment" rows="2" style="width: 65%;"/>-->
 	
 					<html:button property="commentButton" onclick="javascript:addNewComment(this.form, ${item.uid});" styleClass="button" style="position:relative; left:40px; top:-35px;">
 						<fmt:message key="label.preview.post" />