Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r114eaf5eb3133a3914d1debacf3e80b8da99b7ce -r596674554dfa059875f580b481de92dfce9e1828
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(.../RatingComment.hbm.xml)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(.../RatingComment.hbm.xml)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -63,6 +63,15 @@
             insert="true"
             column="comment"
         />
+        
+		<property 
+			name="postedDate" 
+			type="java.sql.Timestamp" 
+			column="posted_date" 
+			not-null="true" 
+			length="19">    
+		</property>
+        
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040048.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040048.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040048.sql	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+-- LDEV-3606 Add comment's posted date
+ALTER TABLE lams_rating_comment ADD COLUMN posted_date datetime;
+UPDATE lams_rating_comment SET posted_date=NOW();
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
===================================================================
diff -u -r4865d4cfe5d0132047d5b840cb5311b9fbf848fb -r596674554dfa059875f580b481de92dfce9e1828
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java	(.../RatingCommentDAO.java)	(revision 4865d4cfe5d0132047d5b840cb5311b9fbf848fb)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java	(.../RatingCommentDAO.java)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -42,7 +43,7 @@
 	    + "FROM " + RatingComment.class.getName()
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.itemId=?";
     
-    private static final String FIND_COMMENTS_BY_CRITERIA_AND_ITEMS = "SELECT r.itemId, r.learner.userId, r.comment "
+    private static final String FIND_COMMENTS_BY_CRITERIA_AND_ITEMS = "SELECT r.itemId, r.learner.userId, r.comment, CONCAT(r.learner.firstName, ' ', r.learner.lastName), r.postedDate "
 	    + "FROM " + RatingComment.class.getName()
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=:ratingCriteriaId AND r.itemId IN (:itemIds)";
     
@@ -109,7 +110,15 @@
 	    Long userId = ((Integer) result[1]).longValue();
 	    String comment = (String) result[2];
 	    
-	    RatingCommentDTO commentDto = new RatingCommentDTO(itemId, userId, comment);
+	    //in case username and postedDate is also fetched from DB
+	    String userName = "";
+	    Date postedDate = null;
+	    if (result.length > 3) {
+		userName = (String) result[3];
+		postedDate = (Date) result[4];
+	    }
+	    
+	    RatingCommentDTO commentDto = new RatingCommentDTO(itemId, userId, userName, comment, postedDate);
 	    commentDtos.add(commentDto);
 	}
 	
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingCommentDTO.java
===================================================================
diff -u -r4df2bc2af266158f87dd885950a21145cb8c752d -r596674554dfa059875f580b481de92dfce9e1828
--- lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingCommentDTO.java	(.../RatingCommentDTO.java)	(revision 4df2bc2af266158f87dd885950a21145cb8c752d)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingCommentDTO.java	(.../RatingCommentDTO.java)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -23,7 +23,9 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.rating.dto;
 
+import java.util.Date;
 
+
 /**
  * Holds minimum information required for displaying in Rating.tag Created in order to lighten the data passed from DB.
  * 
@@ -35,15 +37,21 @@
 
     private Long userId;
     
+    private String userFullName;
+    
     private String comment;
+    
+    private Date postedDate;
 
     public RatingCommentDTO() {
     }
 
-    public RatingCommentDTO(Long itemId, Long userId, String comment) {
+    public RatingCommentDTO(Long itemId, Long userId, String userName, String comment, Date postedDate) {
 	this.itemId = itemId;
 	this.userId = userId;
+	this.userFullName = userName;
 	this.comment = comment;
+	this.postedDate = postedDate;
     }
 
     /**
@@ -66,11 +74,27 @@
 	this.userId = userId;
     }
     
+    public void setUserFullName(String userFullName) {
+	this.userFullName = userFullName;
+    }
+
+    public String getUserFullName() {
+	return this.userFullName;
+    }
+    
     public void setComment(String comment) {
 	this.comment = comment;
     }
 
     public String getComment() {
 	return this.comment;
     }
+    
+    public Date getPostedDate() {
+	return postedDate;
+    }
+
+    public void setPostedDate(Date postedDate) {
+	this.postedDate = postedDate;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java
===================================================================
diff -u -rf026a3ceb687c0f4072980a88f37480a503c1199 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java	(.../RatingComment.java)	(revision f026a3ceb687c0f4072980a88f37480a503c1199)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java	(.../RatingComment.java)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -23,6 +23,8 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.rating.model;
 
+import java.util.Date;
+
 import org.lamsfoundation.lams.usermanagement.User;
 
 /**
@@ -40,15 +42,19 @@
     private User learner;
     
     private String comment;
+    
+    private Date postedDate;
 
     public RatingComment() {
+	this.postedDate = new Date();
     }
 
     public RatingComment(Long itemId, RatingCriteria ratingCriteria, User learner, String comment) {
 	this.itemId = itemId;
 	this.ratingCriteria = ratingCriteria;
 	this.learner = learner;
 	this.comment = comment;
+	this.postedDate = new Date();
     }
 
     /**
@@ -98,5 +104,13 @@
     public String getComment() {
 	return this.comment;
     }
+    
+    public Date getPostedDate() {
+	return postedDate;
+    }
+
+    public void setPostedDate(Date postedDate) {
+	this.postedDate = postedDate;
+    }
 }
 
Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6d412d8329421a7647741f96d2cdc8afb4dfc207 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6d412d8329421a7647741f96d2cdc8afb4dfc207)
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -184,5 +184,6 @@
 label.minimum.number.words  =Minimum number of words in a comment {0}
 warning.minimum.number.words  =There is a minimum required number of words in a comment: {0}. So far you've entered {1} word(s).
 label.comment.textarea.tip  =Please, provide some comment here...
+label.posted.by  ={0} on {1}
 
 #======= End labels: Exported 161 labels for en AU =====
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7530a8f92ba05991702ccc1bd0d388ea6827cba3 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7530a8f92ba05991702ccc1bd0d388ea6827cba3)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -38,6 +38,10 @@
 				margin-bottom:10px;
 				padding:0;
 			}
+			.rating-comment-posted-by {
+				color: #47BC23;
+			}
+			
 		</style>
 		
 		<script type="text/javascript">
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7530a8f92ba05991702ccc1bd0d388ea6827cba3 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7530a8f92ba05991702ccc1bd0d388ea6827cba3)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -117,11 +117,16 @@
 										maxRates="0" 
 										countRatedItems="0" />
 							</td>
+							
 							<c:if test="${sessionMap.isCommentsEnabled}">
 								<td style="vertical-align:middle; padding-left:0px; text-align:center;">
 									<c:forEach var="commentDto" items="${summary.itemRatingDto.commentDtos}">
 										<div class="rating-comment">
 											${commentDto.comment}
+											
+											<div class="rating-comment-posted-by">
+												<fmt:message key="label.posted.by"><fmt:param>${commentDto.userFullName}</fmt:param><fmt:param><lams:Date value="${commentDto.postedDate}"/></fmt:param></fmt:message>
+											</div>
 										</div>
 									</c:forEach>								
 								</td>
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r078376d3d0f5b617015f1e29fc52119dc94665fb -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 078376d3d0f5b617015f1e29fc52119dc94665fb)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -284,6 +284,7 @@
 warning.comment.blank  =Comment can not be blank.
 label.no.reedit.allowed  =No re-edit allowed
 label.search  =Search...
+label.posted.by  ={0} on {1}
 
 
 #======= End labels: Exported 278 labels for en AU =====
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -1083,7 +1083,8 @@
 	    int countRatedQuestions = qaService.getCountItemsRatedByUser(qaContentId, userId.intValue());
 	    responcedata.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedQuestions);
 	}
-	
+
+	DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a");
 	for (QaUsrResp response : responses) {
 	    QaQueUsr user = response.getQaQueUser();
 	    //JSONArray cell=new JSONArray();
@@ -1098,7 +1099,6 @@
 	    // format attemptTime
 	    Date attemptTime = response.getAttemptTime();
 	    attemptTime = DateUtil.convertToTimeZoneFromDefault(userTimeZone, attemptTime);
-	    DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a");
 	    responseRow.put("attemptTime", dateFormatter.format(attemptTime));
 	    
 	    if (isAllowRateAnswers) {
@@ -1133,9 +1133,22 @@
 		String commentPostedByUser = itemRatingDto.getCommentPostedByUser() == null ? "" : itemRatingDto.getCommentPostedByUser().getComment();
 		responseRow.put("commentPostedByUser", commentPostedByUser);
 		if (itemRatingDto.getCommentDtos() != null) {
+		    
 		    JSONArray comments = new JSONArray();
 		    for (RatingCommentDTO commentDto : itemRatingDto.getCommentDtos()) {
-			comments.put(StringEscapeUtils.escapeCsv(commentDto.getComment()));
+			JSONObject comment = new JSONObject();
+			comment.put("comment", StringEscapeUtils.escapeCsv(commentDto.getComment()));
+			
+			if (isMonitoring) {
+			    // format attemptTime
+			    Date postedDate = commentDto.getPostedDate();
+			    postedDate = DateUtil.convertToTimeZoneFromDefault(userTimeZone, postedDate);
+			    comment.put("postedDate", dateFormatter.format(postedDate));
+			    
+			    comment.put("userFullName", StringEscapeUtils.escapeCsv(commentDto.getUserFullName()));
+			}
+			
+			comments.put(comment);
 		    }
 		    responseRow.put("comments", comments);
 		}
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -182,7 +182,7 @@
 											for (j = 0; i < userData.comments.length; j++){
 												var comment = userData.comments[j];
 												rows += '<div class="rating-comment">';
-												rows += 	comment;
+												rows += 	comment.comment;
 												rows += '</div>';
 											}
 											
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r576423e7a806c12d2bc6031edf1fa3b9836c91a9 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 576423e7a806c12d2bc6031edf1fa3b9836c91a9)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -186,7 +186,7 @@
 											for (j = 0; i < userData.comments.length; j++){
 												var comment = userData.comments[j];
 												rows += '<div class="rating-comment">';
-												rows += 	comment;
+												rows += 	comment.comment;
 												rows += '</div>';
 											}
 											
Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
===================================================================
diff -u -r74d15c2cd4ebe0141f1b4101a3ad5f9810ed2292 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 74d15c2cd4ebe0141f1b4101a3ad5f9810ed2292)
+++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -189,7 +189,7 @@
 											for (j = 0; i < userData.comments.length; j++){
 												var comment = userData.comments[j];
 												rows += '<div class="rating-comment">';
-												rows += 	comment;
+												rows += 	comment.comment;
 												rows += '</div>';
 											}
 											
Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
===================================================================
diff -u -r74d15c2cd4ebe0141f1b4101a3ad5f9810ed2292 -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 74d15c2cd4ebe0141f1b4101a3ad5f9810ed2292)
+++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -189,7 +189,7 @@
 											for (j = 0; i < userData.comments.length; j++){
 												var comment = userData.comments[j];
 												rows += '<div class="rating-comment">';
-												rows += 	comment;
+												rows += 	comment.comment;
 												rows += '</div>';
 											}
 											
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r95202c29d0cab6765b9c03fff3a721826ab7ec9d -r596674554dfa059875f580b481de92dfce9e1828
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 95202c29d0cab6765b9c03fff3a721826ab7ec9d)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 596674554dfa059875f580b481de92dfce9e1828)
@@ -144,6 +144,8 @@
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
 	<script language="JavaScript" type="text/JavaScript">
 	
+		var POSTED_BY_LABEL = '<fmt:message key="label.posted.by"><fmt:param>{0}</fmt:param><fmt:param>{1}</fmt:param></fmt:message>';
+	
 	  	$(document).ready(function(){
 		    
 			$(".tablesorter").tablesorter({
@@ -241,8 +243,14 @@
 										if (userData.comments) {
 											for (j = 0; j < userData.comments.length; j++){
 												var comment = userData.comments[j];
+												
+												var postedBy = POSTED_BY_LABEL.replace("{0}", comment.userFullName).replace("{1}", comment.postedDate);
+												
 												rows += '<div class="rating-comment">';
-												rows += 	comment;
+												rows += 	comment.comment;
+												rows += 	'<div class="rating-comment-posted-by">';
+												rows += 		postedBy;
+												rows += 	'</div>';
 												rows += '</div>';
 											}
 										}