Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	18 Apr 2015 01:24:29 -0000	1.2
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	5 Oct 2015 16:08:09 -0000	1.3
@@ -129,14 +129,6 @@
         />
 
         <property
-            name="allowCommentImages"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="allow_comment_images"
-        />
-
-        <property
             name="allowShareImages"
             type="boolean"
             update="true"
Index: lams_tool_images/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/xdoclet/struts-actions.xml,v
diff -u -r1.13 -r1.14
--- lams_tool_images/conf/xdoclet/struts-actions.xml	26 Mar 2015 21:21:21 -0000	1.13
+++ lams_tool_images/conf/xdoclet/struts-actions.xml	5 Oct 2015 16:08:08 -0000	1.14
@@ -164,14 +164,6 @@
 			parameter="loadImageData">
 			<forward name="success" path="/pages/learning/parts/commentsarea.jsp" />
 		</action>
-		<action path="/learning/addNewComment"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
-			parameter="addNewComment"
-			name="imageCommentForm" 
-			scope="request" 
-			validate="false">			
-			<forward name="success" path="/pages/learning/parts/commentsarea.jsp" />
-		</action>
 		<action path="/learning/vote"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
 			parameter="vote"
@@ -256,29 +248,7 @@
 			scope="request" 
 			validate="false">
 			<forward name="success" path="/pages/monitoring/start.jsp" />
-		</action>
-		<action path="/monitoring/editComment"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
-			parameter="editComment"
-			name="imageCommentForm" 
-			scope="request" 
-			validate="false">
-			<forward name="success" path="/pages/monitoring/parts/editcomment.jsp" />
-		</action>
-		<action path="/monitoring/saveComment"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
-			parameter="saveComment"
-			name="imageCommentForm" 
-			scope="request" 
-			validate="false">
-			<forward name="comment" path="/pages/monitoring/parts/editcomment.jsp" />
-			<forward name="success" path="/pages/monitoring/startimagesummary.jsp" />
-		</action>
-		<action path="/monitoring/removeComment"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
-			parameter="removeComment">
-			<forward name="success" path="/pages/monitoring/startimagesummary.jsp" />
-		</action>				
+		</action>			
 		<action path="/monitoring/listuser"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.MonitoringAction"
 			parameter="listuser" >
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java,v
diff -u -r1.21 -r1.22
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	22 May 2015 23:00:12 -0000	1.21
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	5 Oct 2015 16:08:09 -0000	1.22
@@ -42,7 +42,6 @@
     public static final String PARAM_IMAGE_INDEX = "imageIndex";
     public static final String PARAM_IMAGE_UID = "imageUid";
     public static final String PARAM_TITLE = "title";
-    public static final String PARAM_COMMENTS = "comments";
     public static final String PARAM_CURRENT_IMAGE = "currentImage";
     public static final String PARAM_IS_VOTED = "isVoted";
     public static final String PARAM_IS_AUTHOR = "isAuthor";
@@ -69,20 +68,17 @@
     public static final String ATTR_TITLE = "title";
     public static final String ATTR_INSTRUCTIONS = "instructions";
     public static final String ATTR_USER_FINISHED = "userFinished";
-    public static final String ATTR_COMMENT_UID = "commentUid";
-    public static final String ATTR_COMMENT = "comment";
     public static final String ATTR_CURRENT_IMAGE_UID = "currentImageUid";
     public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID";
     public static final String ATTR_MEDIUM_IMAGE_DIMENSIONS = "mediumImageDimensions";
     public static final String ATTR_THUMBNAIL_IMAGE_DIMENSIONS = "thumbnailImageDimensions";
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
     public static final String ATTR_RATING_DTOS = "ratingDtos";
-    
+
     // error message keys
     public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format";
     public static final String ERROR_MSG_NOT_ALLOWED_FORMAT_FOR = "error.resource.image.not.alowed.format.for";
     public static final String ERROR_MSG_FILE_BLANK = "error.resource.item.file.blank";
-    public static final String ERROR_MSG_COMMENT_BLANK = "error.resource.image.comment.blank";
     public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
     public static final String ERROR_MSG_REQUIRED_FIELDS_MISSING = "error.required.fields.missing";
     public static final String ERROR_MSG_ENTERED_VALUES_NOT_INTEGERS = "error.entered.values.not.integers";
@@ -93,7 +89,8 @@
     public static final String ATTR_REFLECTION_ENTRY = "reflectEntry";
     public static final String ATTR_REFLECT_LIST = "reflectList";
     public static final String ATTR_USER_UID = "userUid";
-    
+    public static final String ATTR_IS_COMMENTS_ENABLED = "isCommentsEnabled";
+
     public static final String DEFUALT_PROTOCOL_REFIX = "http://";
     public static final String ALLOW_PROTOCOL_REFIX = new String("[http://|https://|ftp://|nntp://]");
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml,v
diff -u -r1.16 -r1.17
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	10 Aug 2015 15:07:57 -0000	1.16
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	5 Oct 2015 16:08:09 -0000	1.17
@@ -27,16 +27,6 @@
             <ref bean="coreSessionFactory"/>
         </property>
     </bean>
-    <bean id="laimagImageCommentDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageCommentDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>   
-    <bean id="laimagImageRatingDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageRatingDAOHibernate">
-        <property name="sessionFactory">
-            <ref bean="coreSessionFactory"/>
-        </property>
-    </bean>
     <bean id="laimagImageVoteDao" class="org.lamsfoundation.lams.tool.imageGallery.dao.hibernate.ImageVoteDAOHibernate">
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
@@ -64,9 +54,8 @@
         <property name="sessionFactory">
             <ref bean="coreSessionFactory"/>
         </property>
-    </bean>    
-
-
+    </bean>
+    
     <!-- Managers -->
 	<bean id="laimagImageGalleryToolContentHandler" class="org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler">
 	 		<property name="repositoryService"><ref bean="repositoryService"/></property>
@@ -78,13 +67,7 @@
         </property>
         <property name="imageGalleryItemDao">
             <ref local="laimagImageGalleryItemDao"/>
-        </property>
-        <property name="imageCommentDao">
-            <ref local="laimagImageCommentDao"/>
-        </property>
-        <property name="imageRatingDao">
-            <ref local="laimagImageRatingDao"/>
-        </property>       
+        </property>     
         <property name="imageVoteDao">
             <ref local="laimagImageVoteDao"/>
         </property>          
@@ -125,7 +108,6 @@
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		<property name="ratingService"><ref bean="ratingService"/></property>
 		<property name="imageGalleryOutputFactory"><ref bean="imageGalleryOutputFactory"/></property> 
-				
     </bean>
 
     <bean id="laimagImageGalleryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageCommentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageRatingDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/InstructionNavDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java,v
diff -u -r1.7 -r1.8
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	5 Jun 2014 08:41:30 -0000	1.7
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	5 Oct 2015 16:08:08 -0000	1.8
@@ -24,6 +24,7 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.imageGallery.dto;
 
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 
 /**
@@ -54,8 +55,7 @@
     private String itemTitle;
     private String username;
     private int numberOfVotes;
-    private float averageRating;
-    private int numberRatings;    
+    private ItemRatingDTO itemRatingDto;
 
     // following is used for export portfolio programs:
     private Long fileUuid;
@@ -200,43 +200,19 @@
     }  
     
     /**
-     * Returns image average rating.
-     * 
-     * @return image average rating
+     * @return itemRatingDto
      */
-    public float getAverageRating() {
-	return averageRating;
+    public ItemRatingDTO getItemRatingDto() {
+	return itemRatingDto;
     }
 
     /**
-     * Sets image average rating.
-     * 
-     * @param averageRating
-     *                image average rating
+     * @param itemRatingDto
      */
-    public void setAverageRating(float averageRating) {
-	this.averageRating = averageRating;
+    public void setItemRatingDto(ItemRatingDTO itemRatingDto) {
+	this.itemRatingDto = itemRatingDto;
     }
-    
-    /**
-     * Returns image sequence number.
-     * 
-     * @return image sequence number
-     */
-    public int getNumberRatings() {
-	return numberRatings;
-    }
 
-    /**
-     * Sets image number of rates.
-     * 
-     * @param numberRates
-     *                image number of rates
-     */
-    public void setNumberRatings(int numberRatings) {
-	this.numberRatings = numberRatings;
-    }
-
     public Long getFileUuid() {
 	return fileUuid;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java,v
diff -u -r1.5 -r1.6
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java	12 Dec 2008 15:31:28 -0000	1.5
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java	5 Oct 2015 16:08:08 -0000	1.6
@@ -25,7 +25,6 @@
 
 import java.util.Set;
 
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
  
@@ -44,16 +43,11 @@
 public class UserImageContributionDTO {
 
     private String sessionName;
-    private float averageRating;
-    private int numberRatings;  
     private int numberOfVotesForImage;
     
     private ImageGalleryUser user;
-    private int rating;
     private boolean isVotedForThisImage;
     
-    private Set<ImageComment> comments;
-    
     //only for export needs
     private ImageGalleryItem image;
 
@@ -81,44 +75,6 @@
     }
     
     /**
-     * Returns image average rating.
-     * 
-     * @return image average rating
-     */
-    public float getAverageRating() {
-	return averageRating;
-    }
-
-    /**
-     * Sets image average rating.
-     * 
-     * @param averageRating
-     *                image average rating
-     */
-    public void setAverageRating(float averageRating) {
-	this.averageRating = averageRating;
-    }
-    
-    /**
-     * Returns image sequence number.
-     * 
-     * @return image sequence number
-     */
-    public int getNumberRatings() {
-	return numberRatings;
-    }
-
-    /**
-     * Sets image number of rates.
-     * 
-     * @param numberRates
-     *                image number of rates
-     */
-    public void setNumberRatings(int numberRatings) {
-	this.numberRatings = numberRatings;
-    }
-    
-    /**
      * Returns image number of votes.
      * 
      * @return image sequence number
@@ -144,14 +100,6 @@
     public void setUser(ImageGalleryUser user) {
 	this.user = user;
     }
-
-    public int getRating() {
-	return rating;
-    }
-
-    public void setRating(int rating) {
-	this.rating = rating;
-    }
     
     public boolean isVotedForThisImage() {
 	return isVotedForThisImage;
@@ -160,14 +108,6 @@
     public void setVotedForThisImage(boolean isVotedForThisImage) {
 	this.isVotedForThisImage = isVotedForThisImage;
     }    
-
-    public Set<ImageComment> getComments() {
-	return comments;
-    }
-
-    public void setComments(Set<ImageComment> comments) {
-	this.comments = comments;
-    }
     
     public ImageGalleryItem getImage() {
 	return image;
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java,v
diff -u -r1.11 -r1.12
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	18 Apr 2015 01:24:29 -0000	1.11
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	5 Oct 2015 16:08:08 -0000	1.12
@@ -55,9 +55,7 @@
     // advance
 
     private boolean allowVote;
-
-    private boolean allowCommentImages;
-
+    
     private boolean allowShareImages;
 
     private boolean lockWhenFinished;
@@ -370,17 +368,6 @@
     /**
      * @return
      */
-    public boolean isAllowCommentImages() {
-	return allowCommentImages;
-    }
-
-    public void setAllowCommentImages(boolean allowCommentImages) {
-	this.allowCommentImages = allowCommentImages;
-    }
-
-    /**
-     * @return
-     */
     public boolean isAllowShareImages() {
 	return allowShareImages;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java,v
diff -u -r1.16 -r1.17
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	26 Mar 2015 21:21:21 -0000	1.16
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	5 Oct 2015 16:08:09 -0000	1.17
@@ -76,9 +76,6 @@
     private String fileName;
 
     private String fileType;
-    
-    //Set of user comments
-    private Set comments;
 
     // *************** NON Persist Fields  ********************
     private String attachmentLocalUrl;
@@ -92,14 +89,6 @@
     private String titleEscaped;
 
     private String descriptionEscaped;
-    
-    /**
-     * Default contruction method.
-     * 
-     */
-    public ImageGalleryItem() {
-	comments = new HashSet();
-    }  
 
     @Override
     public Object clone() {
@@ -113,19 +102,6 @@
 		image.setCreateBy((ImageGalleryUser) this.createBy.clone());
 	    }
 
-	    // clone set of ImageComment
-	    if (comments != null) {
-		Iterator iter = comments.iterator();
-		Set set = new HashSet();
-		while (iter.hasNext()) {
-		    ImageComment comment = (ImageComment) iter.next();
-		    ImageComment newComment = (ImageComment) comment.clone();
-		    // just clone old file without duplicate it in repository
-		    set.add(newComment);
-		}
-		image.comments = set;
-	    }	
-
 	} catch (CloneNotSupportedException e) {
 	    ImageGalleryItem.log.error("When clone " + ImageGalleryItem.class + " failed");
 	}
@@ -370,21 +346,6 @@
     public void setFileName(String name) {
 	this.fileName = name;
     }
-
-    /**
-     * @hibernate.set lazy="true" cascade="all" inverse="false" order-by="create_date asc"
-     * @hibernate.collection-key column="imageGallery_item_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.imageGallery.model.ImageComment"
-     * 
-     * @return a set of Comments to this Image.
-     */
-    public Set getComments() {
-	return comments;
-    }
-
-    public void setComments(Set comments) {
-	this.comments = comments;
-    }
     
     // *************** NON Persist Fields ********************
     
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java,v
diff -u -r1.26 -r1.27
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	22 May 2015 23:00:12 -0000	1.26
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	5 Oct 2015 16:08:08 -0000	1.27
@@ -30,13 +30,10 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.rating.ToolRatingManager;
-import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
-import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.Summary;
 import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
@@ -124,15 +121,6 @@
      * @return
      */
     Set<ImageGalleryItem> getImagesForGroup(ImageGallery imageGallery, Long sessionId);
-
-    /**
-     * Calculates average rating and number of rating for the current group.
-     * 
-     * @param imageUid
-     * @param sessionId
-     * @return Object[] {numberRatings, averageRating}
-     */
-    Object[] getRatingForGroup(Long imageUid, Long sessionId);
     
     ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId);
 
@@ -171,28 +159,6 @@
     ImageGallery getImageGalleryBySessionId(Long sessionId);
 
     /**
-     * Get imageComment by the given uid.
-     * 
-     * @param commentUid
-     * @return
-     */
-    ImageComment getImageCommentByUid(Long commentUid);
-
-    /**
-     * Updates imageComment by the given uid.
-     * 
-     * @param comment
-     */
-    void saveImageComment(ImageComment comment);
-
-    /**
-     * Delete imageComment by the given uid.
-     * 
-     * @param commentUid
-     */
-    void deleteImageComment(Long uid);
-
-    /**
      * Get imageGallery toolSession by toolSessionId
      * 
      * @param sessionId
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java,v
diff -u -r1.7 -r1.8
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	14 Aug 2009 18:44:47 -0000	1.7
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	5 Oct 2015 16:08:08 -0000	1.8
@@ -25,17 +25,18 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.OutputFactory;
 import org.lamsfoundation.lams.tool.SimpleURL;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
@@ -94,7 +95,6 @@
 	// tool output cache
 	TreeMap<String, ToolOutput> baseOutputs = new TreeMap<String, ToolOutput>();
 	if (names == null) {
-	    ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, toolSessionId);
 	    outputs.put(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, getToolOutput(
 		    ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, imageGalleryService,
 		    toolSessionId, learnerId));
@@ -137,7 +137,7 @@
 		if (nameParts[0].equals(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED)) {
 		    return getNumUploadedImages(user, session);
 		} else if (nameParts[0].equals(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_COMMENTS)) {
-		    return getNumComments(user, session);
+		    return getNumComments(imageGalleryService, user, session);
 		} else if (nameParts[0].equals(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_VOTES)) {
 		    return getNumVotes(user, session, imageGalleryService);
 		} else if (nameParts[0].equals(ImageGalleryOutputFactory.OUTPUT_NAME_UPLOADED_IMAGES_URLS)) {
@@ -193,29 +193,38 @@
     /**
      * Get the number of images for a specific user. Will always return a ToolOutput object.
      */
-    private ToolOutput getNumComments(ImageGalleryUser user, ImageGallerySession session) {
+    private ToolOutput getNumComments(IImageGalleryService imageGalleryService, ImageGalleryUser user,
+	    ImageGallerySession session) {
 	ImageGallery imageGallery = session.getImageGallery();
+	Long contentId = imageGallery.getContentId();
+	
+	Set<ImageGalleryItem> allImages = imageGallery.getImageGalleryItems();
+	List<Long> itemIds = new LinkedList<Long>();
+	for (ImageGalleryItem image : allImages) {
+	    itemIds.add(image.getUid());
+	}
 
 	int countComments = 0;
 	if (user != null) {
-	    Set<ImageGalleryItem> allImages = imageGallery.getImageGalleryItems();
+	    boolean isCommentsByOtherUsersRequired = false;
+	    List<ItemRatingDTO> RatingCriteriaDtos = imageGalleryService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, user.getUserId());
+	    
 	    Iterator<ImageGalleryItem> it = allImages.iterator();
 	    while (it.hasNext()) {
 		ImageGalleryItem image = it.next();
-		Set<ImageComment> imageComments = image.getComments();
-		for (ImageComment comment : imageComments) {
-		    if (user.getUserId().equals(comment.getCreateBy().getUserId())) {
-			countComments++;
-		    }
-		}
+//		Set<ImageComment> imageComments = image.getComments();
+//		for (ImageComment comment : imageComments) {
+//		    if (user.getUserId().equals(comment.getCreateBy().getUserId())) {
+//			countComments++;
+//		    }
+//		}
 	    }
 	} else {
-	    Set<ImageGalleryItem> allImages = imageGallery.getImageGalleryItems();
 	    for (ImageGalleryItem image : allImages) {
-		Set<ImageComment> imageComments = image.getComments();
-		for (ImageComment comment : imageComments) {
-		    countComments++;
-		}
+//		Set<ImageComment> imageComments = image.getComments();
+//		for (ImageComment comment : imageComments) {
+//		    countComments++;
+//		}
 	    }
 	}
 
@@ -228,7 +237,6 @@
      */
     private ToolOutput getNumVotes(ImageGalleryUser user, ImageGallerySession session,
 	    IImageGalleryService imageGalleryService) {
-	ImageGallery imageGallery = session.getImageGallery();
 
 	int countVotes = 0;
 	if (user != null) {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v
diff -u -r1.41 -r1.42
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	17 Jul 2015 11:23:48 -0000	1.41
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	5 Oct 2015 16:08:08 -0000	1.42
@@ -58,8 +58,6 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
-import org.lamsfoundation.lams.rating.ToolRatingManager;
-import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.rating.service.IRatingService;
@@ -73,29 +71,24 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
-import org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryConfigItemDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryItemDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryItemVisitDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGallerySessionDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryUserDAO;
-import org.lamsfoundation.lams.tool.imageGallery.dao.ImageRatingDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dao.ImageVoteDAO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.Summary;
 import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryAttachment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote;
-import org.lamsfoundation.lams.tool.imageGallery.util.ImageCommentComparator;
 import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryItemComparator;
 import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler;
 import org.lamsfoundation.lams.tool.imageGallery.util.ReflectDTOComparator;
@@ -123,10 +116,6 @@
 
     private ImageGalleryItemDAO imageGalleryItemDao;
 
-    private ImageCommentDAO imageCommentDao;
-
-    private ImageRatingDAO imageRatingDao;
-
     private ImageVoteDAO imageVoteDao;
 
     private ImageGalleryUserDAO imageGalleryUserDao;
@@ -249,21 +238,6 @@
     }
 
     @Override
-    public ImageComment getImageCommentByUid(Long commentUid) {
-	return imageCommentDao.getCommentByUid(commentUid);
-    }
-
-    @Override
-    public void saveImageComment(ImageComment comment) {
-	imageCommentDao.saveObject(comment);
-    }
-
-    @Override
-    public void deleteImageComment(Long uid) {
-	imageCommentDao.removeObject(ImageComment.class, uid);
-    }
-
-    @Override
     public void deleteImageGalleryItem(Long uid) {
 	imageGalleryItemDao.removeObject(ImageGalleryItem.class, uid);
     }
@@ -427,18 +401,42 @@
 	    // one new group for one session.
 	    group = new ArrayList<Summary>();
 	    Set<ImageGalleryItem> groupImages = getImagesForGroup(imageGallery, session.getSessionId());
+		
+	    List<ItemRatingDTO> itemRatingDtos = null;
+	    if (imageGallery.isAllowRank()) {
+		// create itemIds list
+		List<Long> itemIds = new LinkedList<Long>();
+		for (ImageGalleryItem image : groupImages) {
+		    itemIds.add(image.getUid());
+		}
+		final Long USER_ID = -1L;
+		final boolean IS_COMMENTS_BY_OTHER_USERS_REQUIRED = true;
+		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TODO calculate average ratings based on one session data
+		itemRatingDtos = getRatingCriteriaDtos(contentId, itemIds,
+			IS_COMMENTS_BY_OTHER_USERS_REQUIRED, USER_ID);
+	    }
 
 	    for (ImageGalleryItem image : groupImages) {
-		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), image);
+		Summary summary = new Summary(session.getSessionId(), session.getSessionName(), image);
 
-		int numberOfVotes = imageVoteDao.getNumImageVotesByImageUid(image.getUid(), session.getSessionId());
-		sum.setNumberOfVotes(numberOfVotes);
+		if (imageGallery.isAllowVote()) {
+		    int numberOfVotes = imageVoteDao.getNumImageVotesByImageUid(image.getUid(), session.getSessionId());
+		    summary.setNumberOfVotes(numberOfVotes);
+		}
 
-		Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
-		sum.setNumberRatings(((Long) ratingForGroup[0]).intValue());
-		sum.setAverageRating(((Float) ratingForGroup[1]).floatValue());
+		if (imageGallery.isAllowRank()) {
+		    // find corresponding itemRatingDto
+		    ItemRatingDTO itemRatingDto = null;
+		    for (ItemRatingDTO itemRatingDtoIter : itemRatingDtos) {
+			if (itemRatingDtoIter.getItemId().equals(image.getUid())) {
+			    itemRatingDto = itemRatingDtoIter;
+			    break;
+			}
+		    }
+		    summary.setItemRatingDto(itemRatingDto);
+		}
 
-		group.add(sum);
+		group.add(summary);
 	    }
 	    // if there is no any item available, then just put session name into Summary
 	    if (group.size() == 0) {
@@ -455,6 +453,7 @@
 	List<List<UserImageContributionDTO>> imageSummary = new ArrayList<List<UserImageContributionDTO>>();
 	List<UserImageContributionDTO> group = new ArrayList<UserImageContributionDTO>();
 	ImageGalleryItem image = imageGalleryItemDao.getByUid(imageUid);
+	ImageGallery imageGallery = getImageGalleryByContentId(contentId);
 
 	List<ImageGallerySession> sessionList;
 	if (image.isCreateByAuthor()) {
@@ -467,11 +466,37 @@
 	for (ImageGallerySession session : sessionList) {
 	    // one new group for one session.
 	    group = new ArrayList<UserImageContributionDTO>();
-	    Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
+//	    Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
 
 	    List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(session.getSessionId());
 	    for (ImageGalleryUser user : users) {
-		UserImageContributionDTO userContribution = createUserContribution(image, user, session, ratingForGroup);
+		
+		//create UserContribution
+		UserImageContributionDTO userContribution = new UserImageContributionDTO(session.getSessionName(), user);
+		
+		if (imageGallery.isAllowVote()) {
+		    int numberOfVotesForImage = imageVoteDao.getNumImageVotesByImageUid(image.getUid(),
+			    session.getSessionId());
+		    userContribution.setNumberOfVotesForImage(numberOfVotesForImage);
+
+		    boolean isVotedForThisImage = false;
+		    ImageVote imageVote = imageVoteDao.getImageVoteByImageAndUser(image.getUid(), user.getUserId());
+		    if (imageVote != null && imageVote.isVoted()) {
+			isVotedForThisImage = true;
+		    }
+		    userContribution.setVotedForThisImage(isVotedForThisImage);
+		}
+
+		if (imageGallery.isAllowRank()) {
+		    // userContribution.setNumberRatings(((Long) ratingForGroup[0]).intValue());
+		    // userContribution.setAverageRating(((Float) ratingForGroup[1]).floatValue());
+
+//		    ImageRating rating = imageRatingDao.getImageRatingByImageAndUser(image.getUid(), user.getUserId());
+//		    if (rating != null) {
+//			userContribution.setRating(rating.getRating());
+//		    }
+		}
+		
 		group.add(userContribution);
 	    }
 
@@ -537,10 +562,10 @@
 
 	    List<UserImageContributionDTO> userContributionList = new ArrayList<UserImageContributionDTO>();
 
-	    Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
-	    UserImageContributionDTO userContribution = createUserContribution(image, user, session, ratingForGroup);
-	    userContribution.setImage(image);
-	    userContributionList.add(userContribution);
+//	    Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId());
+//	    UserImageContributionDTO userContribution = createUserContribution(image, user, session, ratingForGroup);
+//	    userContribution.setImage(image);
+//	    userContributionList.add(userContribution);
 	    imageList.add(userContributionList);
 	}
 
@@ -560,16 +585,16 @@
 	    dbImages.addAll(imageGallery.getImageGalleryItems());
 	    for (ImageGalleryItem image : dbImages) {
 		List<UserImageContributionDTO> userContributionList = new ArrayList<UserImageContributionDTO>();
-		Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId());
+//		Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId());
 
-		List<ImageGalleryUser> userList = imageGalleryUserDao.getBySessionID(imageSession.getSessionId());
-		for (ImageGalleryUser user : userList) {
-		    UserImageContributionDTO userContribution = createUserContribution(image, user, imageSession,
-			    ratingForGroup);
-		    userContribution.setImage(image);
-		    userContributionList.add(userContribution);
-		}
-		imageList.add(userContributionList);
+//		List<ImageGalleryUser> userList = imageGalleryUserDao.getBySessionID(imageSession.getSessionId());
+//		for (ImageGalleryUser user : userList) {
+//		    UserImageContributionDTO userContribution = createUserContribution(image, user, imageSession,
+//			    ratingForGroup);
+//		    userContribution.setImage(image);
+//		    userContributionList.add(userContribution);
+//		}
+//		imageList.add(userContributionList);
 
 	    }
 
@@ -704,14 +729,6 @@
 	this.imageGalleryItemDao = imageGalleryItemDao;
     }
 
-    public void setImageCommentDao(ImageCommentDAO imageCommentDao) {
-	this.imageCommentDao = imageCommentDao;
-    }
-
-    public void setImageRatingDao(ImageRatingDAO imageRatingDao) {
-	this.imageRatingDao = imageRatingDao;
-    }
-
     public void setImageVoteDao(ImageVoteDAO imageVoteDao) {
 	this.imageVoteDao = imageVoteDao;
     }
@@ -770,7 +787,6 @@
 	toolContentObj = ImageGallery.newInstance(toolContentObj, toolContentId);
 	Set<ImageGalleryItem> images = toolContentObj.getImageGalleryItems();
 	for (ImageGalleryItem image : images) {
-	    image.setComments(null);
 	    
 	    //convert file extension to lower case
 	    String fileName = image.getFileName();
@@ -897,7 +913,6 @@
 	    while (iter.hasNext()) {
 		ImageGalleryItem item = (ImageGalleryItem) iter.next();
 		if (item.isCreateByAuthor()) {
-		    item.getComments().clear();
 		    imageGalleryUserDao.saveObject(item.getCreateBy());
 		    imageGalleryItemDao.saveObject(item);
 		} else {
@@ -959,25 +974,11 @@
 	while (itemIterator.hasNext()) {
 	    ImageGalleryItem item = itemIterator.next();
 
-	    Iterator<ImageComment> commentIterator = item.getComments().iterator();
-	    while (commentIterator.hasNext()) {
-		ImageComment comment = commentIterator.next();
-		if (comment.getCreateBy().getUserId().equals(userId.longValue())) {
-		    imageCommentDao.removeObject(ImageComment.class, comment.getUid());
-		    commentIterator.remove();
-		}
-	    }
-
 	    ImageVote vote = imageVoteDao.getImageVoteByImageAndUser(item.getUid(), userId.longValue());
 	    if (vote != null) {
 		imageVoteDao.removeObject(ImageVote.class, vote.getUid());
 	    }
 
-	    ImageRating rating = imageRatingDao.getImageRatingByImageAndUser(item.getUid(), userId.longValue());
-	    if (rating != null) {
-		imageRatingDao.removeObject(ImageRating.class, rating.getUid());
-	    }
-
 	    if (!item.isCreateByAuthor() && item.getCreateBy().getUserId().equals(userId.longValue())) {
 		try {
 		    if (item.getOriginalFileUuid() != null) {
@@ -1169,28 +1170,6 @@
 	return images;
     }
 
-    @Deprecated
-    public Object[] getRatingForGroup(Long imageUid, Long sessionId) {
-	List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(sessionId);
-	Long numberRatings = new Long(0);
-	Float averageRating = new Float(0);
-	List<ImageRating> ratings = imageRatingDao.getImageRatingsByImageUid(imageUid);
-	for (ImageRating rating : ratings) {
-	    for (ImageGalleryUser user : users) {
-		if (rating.getCreateBy().getUserId().equals(user.getUserId())) {
-		    numberRatings++;
-		    averageRating += rating.getRating();
-		}
-	    }
-	}
-
-	if (!numberRatings.equals(new Long(0))) {
-	    averageRating = averageRating / numberRatings;
-	}
-
-	return new Object[] { numberRatings, averageRating };
-    }
-
     // *****************************************************************************
     // private methods
     // *****************************************************************************
@@ -1217,39 +1196,6 @@
 	return contentId;
     }
 
-    private UserImageContributionDTO createUserContribution(ImageGalleryItem image, ImageGalleryUser user,
-	    ImageGallerySession session, Object[] ratingForGroup) {
-	UserImageContributionDTO userContribution = new UserImageContributionDTO(session.getSessionName(), user);
-
-	int numberOfVotesForImage = imageVoteDao.getNumImageVotesByImageUid(image.getUid(), session.getSessionId());
-	userContribution.setNumberOfVotesForImage(numberOfVotesForImage);
-	userContribution.setNumberRatings(((Long) ratingForGroup[0]).intValue());
-	userContribution.setAverageRating(((Float) ratingForGroup[1]).floatValue());
-
-	ImageRating rating = imageRatingDao.getImageRatingByImageAndUser(image.getUid(), user.getUserId());
-	if (rating != null) {
-	    userContribution.setRating(rating.getRating());
-	}
-
-	boolean isVotedForThisImage = false;
-	ImageVote imageVote = imageVoteDao.getImageVoteByImageAndUser(image.getUid(), user.getUserId());
-	if (imageVote != null && imageVote.isVoted()) {
-	    isVotedForThisImage = true;
-	}
-	userContribution.setVotedForThisImage(isVotedForThisImage);
-
-	Set<ImageComment> dbComments = image.getComments();
-	TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
-	for (ImageComment comment : dbComments) {
-	    if (comment.getCreateBy().getUserId().equals(user.getUserId())) {
-		comments.add(comment);
-	    }
-	}
-	userContribution.setComments(comments);
-
-	return userContribution;
-    }
-
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getImageGalleryOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageCommentComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java,v
diff -u -r1.36 -r1.37
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	22 May 2015 23:00:12 -0000	1.36
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	5 Oct 2015 16:08:08 -0000	1.37
@@ -27,7 +27,6 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -53,11 +52,9 @@
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
-import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
@@ -67,7 +64,6 @@
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException;
 import org.lamsfoundation.lams.tool.imageGallery.service.UploadImageGalleryFileException;
-import org.lamsfoundation.lams.tool.imageGallery.util.ImageCommentComparator;
 import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryItemComparator;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageRatingForm;
@@ -122,9 +118,6 @@
 	if (param.equals("loadImageData")) {
 	    return loadImageData(mapping, form, request, response);
 	}
-	if (param.equals("addNewComment")) {
-	    return addNewComment(mapping, form, request, response);
-	}
 	if (param.equals("vote")) {
 	    return vote(mapping, form, request, response);
 	}
@@ -463,7 +456,6 @@
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
-	Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID);
 	IImageGalleryService service = getImageGalleryService();
 	ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY);
 	Long userId = ((Integer) sessionMap.get(AttributeNames.PARAM_USER_ID)).longValue();
@@ -480,29 +472,27 @@
 	if (createdBy != null) {
 	    image.getCreateBy().getLoginName();
 	}
-
-	if (imageGallery.isAllowCommentImages()) {
-	    TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
-	    Set<ImageComment> dbComments = image.getComments();
-	    //List<ImageGalleryUser> sessionUsers = service.getUserListBySessionId(sessionId);
-	    for (ImageComment comment : dbComments) {
-		//for (ImageGalleryUser sessionUser : sessionUsers) {
-		    if (comment.getCreateBy().getSession().getSessionId().equals(sessionId)) {
-			comments.add(comment);
-		    }
-		//}
-	    }
-	    sessionMap.put(ImageGalleryConstants.PARAM_COMMENTS, comments);
-	}
-
+	
+	//handle rating criterias
+	int commentsMinWordsLimit = 0;
+	boolean isCommentsEnabled = false;
+	int countRatedImages = 0;
 	if (imageGallery.isAllowRank()) {
+	    
 	    ItemRatingDTO itemRatingDto = service.getRatingCriteriaDtos(imageGallery.getContentId(), imageUid, userId);
 	    sessionMap.put(AttributeNames.ATTR_ITEM_RATING_DTO, itemRatingDto);
-	    
+
+	    if (itemRatingDto != null) {
+		commentsMinWordsLimit = itemRatingDto.getCommentsMinWordsLimit();
+		isCommentsEnabled = itemRatingDto.isCommentsEnabled();
+	    }
+
 	    // store how many items are rated
-	    int countRatedImages = service.getCountItemsRatedByUser(imageGallery.getContentId(), userId.intValue());
-	    sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedImages);
+	    countRatedImages = service.getCountItemsRatedByUser(imageGallery.getContentId(), userId.intValue());
 	}
+	sessionMap.put("commentsMinWordsLimit", commentsMinWordsLimit);
+	sessionMap.put("isCommentsEnabled", isCommentsEnabled);
+	sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedImages);
 
 	if (imageGallery.isAllowVote()) {
 	    boolean isVotedForThisImage = false;
@@ -529,64 +519,6 @@
      * @param response
      * @return
      */
-    private ActionForward addNewComment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID);
-	String commentMessage = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_COMMENT, true);
-
-	if (StringUtils.isBlank(commentMessage)) {
-	    ActionErrors errors = new ActionErrors();
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_COMMENT_BLANK));
-	    this.addErrors(request, errors);
-	    return mapping.findForward(ImageGalleryConstants.SUCCESS);
-	}
-
-	ImageComment comment = new ImageComment();
-	comment.setComment(commentMessage);
-	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-	IImageGalleryService service = getImageGalleryService();
-	ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),
-		sessionId);
-	comment.setCreateBy(imageGalleryUser);
-	comment.setCreateDate(new Timestamp(new Date().getTime()));
-
-	// persist ImageGallery changes in DB
-	Long currentImageUid = new Long(request.getParameter(ImageGalleryConstants.ATTR_CURRENT_IMAGE_UID));
-	ImageGalleryItem dbItem = service.getImageGalleryItemByUid(currentImageUid);
-	Set<ImageComment> dbComments = dbItem.getComments();
-	dbComments.add(comment);
-	service.saveOrUpdateImageGalleryItem(dbItem);
-
-	// to make available new changes be visible in jsp page
-	TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
-	dbComments = dbItem.getComments();
-	List<ImageGalleryUser> sessionUsers = service.getUserListBySessionId(sessionId);
-	for (ImageComment dbComment : dbComments) {
-	    for (ImageGalleryUser sessionUser : sessionUsers) {
-		if (dbComment.getCreateBy().getUserId().equals(sessionUser.getUserId())) {
-		    comments.add(dbComment);
-		}
-	    }
-	}
-	sessionMap.put(ImageGalleryConstants.PARAM_COMMENTS, comments);
-
-	form.reset(mapping, request);
-
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(ImageGalleryConstants.SUCCESS);
-    }
-
-    /**
-     * Move down current item.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
     private ActionForward vote(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java,v
diff -u -r1.10 -r1.11
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	26 Sep 2014 21:47:28 -0000	1.10
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java	5 Oct 2015 16:08:08 -0000	1.11
@@ -50,19 +50,18 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.Summary;
 import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException;
 import org.lamsfoundation.lams.tool.imageGallery.service.UploadImageGalleryFileException;
-import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageCommentForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.MultipleImagesForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -111,15 +110,6 @@
 	if (param.equals("hideitem")) {
 	    return hideitem(mapping, form, request, response);
 	}
-	if (param.equals("editComment")) {
-	    return editComment(mapping, form, request, response);
-	}
-	if (param.equals("saveComment")) {
-	    return saveComment(mapping, form, request, response);
-	}
-	if (param.equals("removeComment")) {
-	    return removeComment(mapping, form, request, response);
-	}	
 	if (param.equals("viewReflection")) {
 	    return viewReflection(mapping, form, request, response);
 	}
@@ -153,6 +143,9 @@
 	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, imageGallery);
 	sessionMap.put(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(ImageGalleryConstants.ATTR_REFLECT_LIST, reflectList);
+	//rating stuff
+	boolean isCommentsEnabled = service.isCommentsEnabled(contentId);
+	sessionMap.put(ImageGalleryConstants.ATTR_IS_COMMENTS_ENABLED, isCommentsEnabled);
 
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
@@ -282,19 +275,23 @@
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	Long contentId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID);
 	ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY);
 	Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID));
 	ImageGalleryItem image =getImageGalleryService().getImageGalleryItemByUid(imageUid);
 	
-	if (imageGallery.isAllowCommentImages() || imageGallery.isAllowRank() || imageGallery.isAllowVote()) {
+	if (imageGallery.isAllowVote()) {
 	    List<List<UserImageContributionDTO>> imageSummary = getImageGalleryService().getImageSummary(contentId, imageUid);
 	    request.setAttribute(ImageGalleryConstants.ATTR_IMAGE_SUMMARY, imageSummary);
+	    
+	} else if (imageGallery.isAllowRank()) {
+	    ItemRatingDTO itemRatingDto = getImageGalleryService().getRatingCriteriaDtos(contentId, imageUid, -1L);
+	    request.setAttribute("itemRatingDto", itemRatingDto);
 	}
-	request.setAttribute(ImageGalleryConstants.ATTR_IMAGE, image);
-	sessionMap.put(ImageGalleryConstants.ATTR_ITEM_UID, imageUid);
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());	
 	
+	request.setAttribute(ImageGalleryConstants.ATTR_IMAGE, image);	
+	
 	ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form;
 	imageForm.setImageUid(image.getUid().toString());
 	imageForm.setTitle(image.getTitle());
@@ -386,100 +383,7 @@
 
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
-    
-    /**
-     * Edit existing comment.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward editComment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
 
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
-	IImageGalleryService service = getImageGalleryService();
-	
-	Long commentUid = new Long(request.getParameter(ImageGalleryConstants.ATTR_COMMENT_UID));
-	ImageComment comment = service.getImageCommentByUid(commentUid);
-	ImageCommentForm commentForm = (ImageCommentForm) form;
-	commentForm.setSessionMapID(sessionMapID);
-	commentForm.setCommentUid(commentUid.toString());
-	commentForm.setComment(comment.getComment());
-	commentForm.setCreateBy(comment.getCreateBy().getLoginName());
-	commentForm.setCreateDate(comment.getCreateDate().toString());
-	
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward("success");
-    }
-    
-    /**
-     * Save edited comment.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward saveComment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	IImageGalleryService service = getImageGalleryService();
-	ImageCommentForm commentForm = (ImageCommentForm) form;
-	String sessionMapID = commentForm.getSessionMapID();
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	
-	String commentMessage = commentForm.getComment();
-	if (StringUtils.isBlank(commentMessage)) {
-	    ActionErrors errors = new ActionErrors();
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_COMMENT_BLANK));
-	    this.addErrors(request, errors);
-	    return mapping.findForward("comment");
-	}
-
-	Long commentUid = NumberUtils.createLong(commentForm.getCommentUid());
-	ImageComment comment = service.getImageCommentByUid(commentUid);
-	comment.setComment(commentMessage);
-	service.saveImageComment(comment);
-			
-	return mapping.findForward(ImageGalleryConstants.SUCCESS);
-    }
-    
-    /**
-     * Delete user comment.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    private ActionForward removeComment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	
-	// get back sessionMAP
-	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	IImageGalleryService service = getImageGalleryService();
-	
-	Long commentUid = new Long(request.getParameter(ImageGalleryConstants.ATTR_COMMENT_UID));
-	ImageComment comment = service.getImageCommentByUid(commentUid);
-	
-	Long imageUid = (Long) sessionMap.get(ImageGalleryConstants.ATTR_ITEM_UID);
-	ImageGalleryItem image = service.getImageGalleryItemByUid(imageUid);
-	Set<ImageComment> dbComments = image.getComments();
-	dbComments.remove(comment);
-	service.saveOrUpdateImageGalleryItem(image);
-	service.deleteImageComment(commentUid);
-	
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(ImageGalleryConstants.SUCCESS);
-    }
-
     private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java,v
diff -u -r1.4 -r1.5
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	17 Jan 2014 21:44:58 -0000	1.4
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	5 Oct 2015 16:08:08 -0000	1.5
@@ -74,7 +74,6 @@
 	// if it is start page, all data read out from database or current session
 	// so need not reset checkbox to refresh value!
 	if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
-	    imageGallery.setAllowCommentImages(false);
 	    imageGallery.setAllowShareImages(false);
 	    imageGallery.setLockWhenFinished(false);
 	    imageGallery.setDefineLater(false);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	14 Nov 2008 18:40:13 -0000	1.2
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java	5 Oct 2015 16:08:08 -0000	1.3
@@ -35,8 +35,7 @@
 
     private static final long serialVersionUID = -8962161058929959289L;
 
-    private String sessionMapID;    
-    private String rating;
+    private String sessionMapID;
     private boolean vote;
     
     public String getSessionMapID() {
@@ -45,15 +44,7 @@
 
     public void setSessionMapID(String sessionMapID) {
 	this.sessionMapID = sessionMapID;
-    }     
-    
-    public String getRating() {
-	return rating;
     }
-
-    public void setRating(String rating) {
-	this.rating = rating;
-    }
     
     public boolean getVote() {
 	return vote;
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Rating.tag,v
diff -u -r1.8 -r1.9
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	22 May 2015 23:00:12 -0000	1.8
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	5 Oct 2015 16:08:09 -0000	1.9
@@ -23,6 +23,7 @@
 <%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="showComments" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -46,7 +47,10 @@
 <c:if test="${empty minNumberWordsLabel}">
 	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
 </c:if>
-<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled}"/>
+<c:if test="${empty showComments}">
+	<c:set var="showComments" value="true" scope="request"/>
+</c:if>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
 
 <%--Rating stars area---------------------------------------%>
 
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/advance.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_images/web/pages/authoring/advance.jsp	21 May 2015 23:49:00 -0000	1.8
+++ lams_tool_images/web/pages/authoring/advance.jsp	5 Oct 2015 16:08:08 -0000	1.9
@@ -64,17 +64,7 @@
 	</label>
 </p>
 
-<!-- 
 <p>
-	<html:checkbox property="imageGallery.allowCommentImages" styleClass="noBorder" styleId="allowCommentImages">
-	</html:checkbox>
-	<label for="allowCommentImages">
-		<fmt:message key="label.authoring.advance.allow.learner.comment.images" />
-	</label>
-</p>
- -->
-
-<p>
 	<html:checkbox property="allowRatingsOrVote" styleClass="noBorder" styleId="allowRatingsOrVote"
 		onclick="allowRatingsOrVoteClicked();"
 	>
@@ -118,11 +108,9 @@
 </p>
 
 <p>
-	<html:textarea property="imageGallery.reflectInstructions"
-		styleId="reflectInstructions" cols="30" rows="3" />
+	<html:textarea property="imageGallery.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
 </p>
 <script type="text/javascript">
-<!--
 //automatically turn on refect option if there are text input in refect instruction area
 	var ra = document.getElementById("reflectInstructions");
 	var rao = document.getElementById("reflectOn");
@@ -137,5 +125,4 @@
 	}
 
 	ra.onkeyup=turnOnRefect;
-//-->
 </script>
Index: lams_tool_images/web/pages/export/exportimageteacher.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/export/exportimageteacher.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_images/web/pages/export/exportimageteacher.jsp	5 Jun 2014 08:41:30 -0000	1.2
+++ lams_tool_images/web/pages/export/exportimageteacher.jsp	5 Oct 2015 16:08:09 -0000	1.3
@@ -111,27 +111,7 @@
 							</c:choose>
 						</td>
 					</c:if>
-									
-					<c:if test="${imageGallery.allowRank}">								
-						<td style="padding-left:0px; text-align:center;">
-							${userContribution.rating}
-						</td>
-					</c:if>
-												
-					<c:if test="${imageGallery.allowCommentImages}">
-						<td>
 										
-							<ul>
-								<c:forEach var="comment" items="${userContribution.comments}">
-									<li>
-										<c:out value="${comment.comment}" escapeXml="false" />
-									</li>
-								</c:forEach>
-							</ul>
-											
-						</td>
-					</c:if>
-										
 				</tr>
 										
 								
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/parts/commentsarea.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	22 May 2015 23:00:12 -0000	1.21
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	5 Oct 2015 16:08:09 -0000	1.22
@@ -19,14 +19,16 @@
 		var pathToImageFolder = "${lams}images/css/";
 		
 		//vars for rating.js
-		var MAX_RATES = ${imageGallery.maximumRates},
+		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
+		MAX_RATES = ${imageGallery.maximumRates},
 		MIN_RATES = ${imageGallery.minimumRates},
-		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.itemRatingDto.commentsMinWordsLimit},
 		LAMS_URL = '${lams}',
 		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.itemRatingDto.commentsMinWordsLimit}"/></fmt:message>';
+		WARN_MIN_NUMBER_WORDS_LABEL = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>';
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 </c:if>
@@ -55,6 +57,14 @@
 
 <c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">
 
+	<c:if test="${sessionMap.isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
+		<div class="info rating-info">
+			<fmt:message key="label.minimum.number.words">
+				<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
+			</fmt:message>
+		</div>
+	</c:if>
+
 	<%--Ranking area---------------------------------------%>
 	
 	<c:if test="${imageGallery.allowRank && isImageSelected}">
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/imagesummary.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	26 Sep 2014 21:47:28 -0000	1.10
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	5 Oct 2015 16:08:08 -0000	1.11
@@ -12,16 +12,28 @@
 		<c:set var="imageGallery" value="${sessionMap.imageGallery}" />		
 		
 		<%@ include file="/common/header.jsp"%>
+		<link href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 		
 		<script type="text/javascript">
-			function deleteComment(commentUid) {
-				var	deletionConfirmed = confirm("<fmt:message key="warning.msg.monitoring.do.you.want.to.delete"></fmt:message>");
-
-				if (deletionConfirmed) {
-					window.location.href = "<c:url value='/monitoring/removeComment.do'/>?sessionMapID=${sessionMapID}&commentUid=" + commentUid;
-				}
-			}
+			//var for jquery.jRating.js
+			var pathToImageFolder = "${lams}images/css/";
+		
+			//vars for rating.js
+			var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+			YOUR_RATING_LABEL = '',
+			IS_DISABLED =  true,
+			COMMENTS_MIN_WORDS_LIMIT = 0,
+			MAX_RATES = 0,
+			MIN_RATES = 0,
+			LAMS_URL = '${lams}',
+			COUNT_RATED_ITEMS = 0,
+			COMMENT_TEXTAREA_TIP_LABEL = '',
+			WARN_COMMENTS_IS_BLANK_LABEL = '',
+			WARN_MIN_NUMBER_WORDS_LABEL = '';
 		</script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 	</lams:head>
 	
 	<body class="stripes">
@@ -57,63 +69,43 @@
 			</html:form>			
 			<br>
 			
-			<c:forEach var="groupSummary" items="${imageSummary}">
-				<h1><fmt:message key="monitoring.label.group" /> ${groupSummary[0].sessionName}	</h1>
+			<c:if test="${imageGallery.allowRank}">
+				<lams:Rating itemRatingDto="${itemRatingDto}" disabled="true"
+						isItemAuthoredByUser="true"
+						maxRates="0" 
+						countRatedItems="0" />
+			</c:if>
+			
+			<c:if test="${imageGallery.allowVote}">
+			
+				<c:forEach var="groupSummary" items="${imageSummary}">
+					<h1><fmt:message key="monitoring.label.group" /> ${groupSummary[0].sessionName}	</h1>
 				
-				<c:choose>
-					<c:when test="${imageGallery.allowRank == true}">
-						<ul>							
-							<li>
-								<fmt:message key="label.monitoring.number.rated" />: ${groupSummary[0].numberRatings}
-							</li>				
-							<li>
-								<fmt:message key="label.monitoring.average.rating" />: ${groupSummary[0].averageRating}
-							</li>
-						</ul>
-						<br>
-					</c:when>
-					<c:when test="${imageGallery.allowVote == true}">
-						<ul>
-							<li>
-								<fmt:message key="label.monitoring.number.votes" />: ${groupSummary[0].numberOfVotesForImage}
-							</li>
-						</ul>
-						<br>						
-					</c:when>
-				</c:choose>			
+					<ul>
+						<li>
+							<fmt:message key="label.monitoring.number.votes" />: ${groupSummary[0].numberOfVotesForImage}
+						</li>
+					</ul>
+					<br>
 				
-				<table cellpadding="0" class="alternative-color" >
-			
-					<tr>
-						<th width="150px">
-							<fmt:message key="label.monitoring.imagesummary.user" />
-						</th>
-						<c:if test="${imageGallery.allowVote}">				
+					<table cellpadding="0" class="alternative-color" >
+				
+						<tr>
+							<th width="150px">
+								<fmt:message key="label.monitoring.imagesummary.user" />
+							</th>			
 							<th style="padding-left:0px; text-align:center; width: 100px;">
 								<fmt:message key="label.monitoring.imagesummary.voted.for.this.image" />
 							</th>
-						</c:if>
-						<c:if test="${imageGallery.allowRank}">					
-							<th style="padding-left:0px; text-align:center; width: 100px;">
-								<fmt:message key="label.monitoring.imagesummary.rating" />
-							</th>
-						</c:if>						
-						<c:if test="${imageGallery.allowCommentImages}">
-							<th >
-								<fmt:message key="label.monitoring.imagesummary.comments" />
-							</th>
-						</c:if>			
-					</tr>
+						</tr>
 				
-				
-					<c:forEach var="userImageContribution" items="${groupSummary}">
-					
-						<tr>
-							<td>
-								<c:out value="${userImageContribution.user.firstName} ${userImageContribution.user.lastName}" escapeXml="true"/>
-							</td>
-							
-							<c:if test="${imageGallery.allowVote}">								
+						<c:forEach var="userImageContribution" items="${groupSummary}">
+						
+							<tr>
+								<td>
+									<c:out value="${userImageContribution.user.firstName} ${userImageContribution.user.lastName}" escapeXml="true"/>
+								</td>
+													
 								<td style="padding-left:0px; text-align:center;">
 									<c:choose>
 										<c:when test="${userImageContribution.votedForThisImage}">
@@ -125,46 +117,13 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
-							</c:if>
-							
-							<c:if test="${imageGallery.allowRank}">								
-								<td style="padding-left:0px; text-align:center;">
-									${userImageContribution.rating}
-								</td>
-							</c:if>
-										
-							<c:if test="${imageGallery.allowCommentImages}">
-								<td>
 								
-									<ul>
-										<c:forEach var="comment" items="${userImageContribution.comments}">
-											<li>
-												<c:out value="${comment.comment}" escapeXml="false" />
-												
-												<c:set var="editCommentUrl" >
-													<c:url value='/monitoring/editComment.do'/>?sessionMapID=${sessionMapID}&commentUid=${comment.uid}&TB_iframe=true&height=300&width=300
-												</c:set>		
-												<a href="${editCommentUrl}" class="thickbox" style="margin-left: 20px;"> 
-													<img src="<html:rewrite page='/includes/images/edit.gif'/>" 
-															title="<fmt:message key="label.authoring.basic.resource.edit" />" style="border-style: none;"/>
-												</a>
-		
-												<a href="#" style="margin-left: 15px;" id="removeCommentLink" onclick="deleteComment(${comment.uid});" >
-													<img src="<html:rewrite page='/includes/images/cross.gif'/>" 												 
-															title="<fmt:message key="label.authoring.basic.resource.delete" />" style="border-style: none;"/>												
-												</a>
-											</li>
-										</c:forEach>
-									</ul>
-									
-								</td>
-							</c:if>
-								
-						</tr>
-					</c:forEach>
-				</table>
-			
-			</c:forEach>
+							</tr>
+						</c:forEach>
+					</table>
+				
+				</c:forEach>
+			</c:if>
 			<br>
 			
 			<lams:ImgButtonWrapper>
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	26 Sep 2014 21:47:28 -0000	1.10
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	5 Oct 2015 16:08:08 -0000	1.11
@@ -12,19 +12,57 @@
 		<%@ include file="/common/tabbedheader.jsp" %>
 		
 		<link href="${lams}css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+		<link href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 		<link href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet" >
+		<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 		<style media="screen,projection" type="text/css">
 			.tablesorter {
 				margin: 15px 10px 5px;
 				width: 97%;
 			}
+			
+			.tablesorter tbody > tr:nth-child(odd) > td, .tablesorter tbody > tr:nth-child(odd) > th {
+			    background-color: #EBF2FA;
+			}
+			.tablesorter tbody > tr:nth-child(odd):hover > td, .tablesorter tbody > tr:nth-child(odd):hover > th {
+			    background-color: #bfbfbf;
+			}
+			.tablesorter tr:nth-child(odd):hover .jStar {background-image: url(${lams}images/css/jquery.jRating-stars-grey.png)!important;}
+			.tablesorter tr:nth-child(even):hover .jStar {background-image: url(${lams}images/css/jquery.jRating-stars-light-grey.png)!important;}
+			.tablesorter tr:nth-child(odd) .jStar {background-image: url(${lams}images/css/jquery.jRating-stars-light-blue.png)!important;}
+			
+			h4 {
+				color:#0087e5; 
+				font-size:11px;
+				margin-top:10px;
+				margin-bottom:10px;
+				padding:0;
+			}
 		</style>
 		
+		<script type="text/javascript">
+			//var for jquery.jRating.js
+			var pathToImageFolder = "${lams}images/css/";
+		
+			//vars for rating.js
+			var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+			YOUR_RATING_LABEL = '',
+			IS_DISABLED =  true,
+			COMMENTS_MIN_WORDS_LIMIT = 0,
+			MAX_RATES = 0,
+			MIN_RATES = 0,
+			LAMS_URL = '${lams}',
+			COUNT_RATED_ITEMS = 0,
+			COMMENT_TEXTAREA_TIP_LABEL = '',
+			WARN_COMMENTS_IS_BLANK_LABEL = '',
+			WARN_MIN_NUMBER_WORDS_LABEL = '';
+		</script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>	
- 			
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 		<script>
 			var initialTabId = "${initialTabId}";
 	
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_images/web/pages/monitoring/startimagesummary.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/web/pages/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/statistic.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_images/web/pages/monitoring/statistic.jsp	3 Apr 2014 14:28:26 -0000	1.6
+++ lams_tool_images/web/pages/monitoring/statistic.jsp	5 Oct 2015 16:08:08 -0000	1.7
@@ -2,7 +2,6 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-
 	<c:if test="${empty summaryList}">
 		<div align="center">
 			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
@@ -14,9 +13,10 @@
 		<c:forEach var="summary" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
-					<h2>
-						<fmt:message key="monitoring.label.group" /> ${summary.sessionName}
-					</h2> 
+				<h2>
+					<fmt:message key="monitoring.label.group" /> ${summary.sessionName}
+				</h2> 
+				
 				<table cellspacing="3" class="alternative-color space-top">
 				<tr>
 					<th width="35%">
@@ -26,22 +26,21 @@
 						<fmt:message key="monitoring.label.suggest" />
 					</th>
 					<c:choose>
-						<c:when test="${sessionMap.imageGallery.allowRank == true}">
+						<c:when test="${sessionMap.imageGallery.allowRank}">
 							<th width="85px" style="padding-left:0px; text-align:center;">
-								<fmt:message key="label.monitoring.number.rated" />
-							</th>				
-							<th width="70px" style="padding-left:0px; text-align:center;">
 								<fmt:message key="label.monitoring.average.rating" />
 							</th>
 						</c:when>
-						<c:when test="${sessionMap.imageGallery.allowVote == true}">
+						
+						<c:when test="${sessionMap.imageGallery.allowVote}">
 							<th width="70px" style="padding-left:0px; text-align:center;">
 								<fmt:message key="label.monitoring.number.votes" />
 							</th>
 						</c:when>
 					</c:choose>						
 				</tr>
 			</c:if>
+			
 			<c:if test="${summary.itemUid == -1}">
 				<tr>
 					<td colspan="4">
@@ -61,16 +60,18 @@
 							<c:out value="${summary.username}" escapeXml="true"/>
 						</c:if>
 					</td>
+					
 					<c:choose>
-						<c:when test="${sessionMap.imageGallery.allowRank == true}">
+						<c:when test="${sessionMap.imageGallery.allowRank}">	
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
-								${summary.numberRatings}
-							</td>				
-							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
-								${summary.averageRating}
+								<lams:Rating itemRatingDto="${summary.itemRatingDto}" disabled="true" 
+										isItemAuthoredByUser="true"
+										maxRates="0" 
+										countRatedItems="0" />
 							</td>
 						</c:when>
-						<c:when test="${sessionMap.imageGallery.allowVote == true}">
+						
+						<c:when test="${sessionMap.imageGallery.allowVote}">
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
 								${summary.numberOfVotes}
 							</td>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/summary.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_images/web/pages/monitoring/summary.jsp	5 Jun 2014 08:41:30 -0000	1.16
+++ lams_tool_images/web/pages/monitoring/summary.jsp	5 Oct 2015 16:08:08 -0000	1.17
@@ -46,6 +46,11 @@
 						<th width="70px" style="padding-left:0px; text-align:center;">
 							<fmt:message key="label.monitoring.average.rating" />
 						</th>
+						<c:if test="${sessionMap.isCommentsEnabled}">
+							<th width="200px" style="padding-left:0px; text-align:center;">
+								<fmt:message key="label.monitoring.imagesummary.comments" />
+							</th>								
+						</c:if>
 					</c:when>
 					<c:when test="${sessionMap.imageGallery.allowVote}">
 						<th width="70px" style="padding-left:0px; text-align:center;">
@@ -107,9 +112,23 @@
 					<c:choose>
 						<c:when test="${sessionMap.imageGallery.allowRank}">
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
-								${summary.averageRating}
+								<lams:Rating itemRatingDto="${summary.itemRatingDto}" disabled="true" showComments="false"
+										isItemAuthoredByUser="true"
+										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>
+									</c:forEach>								
+								</td>
+								
+							</c:if>
 						</c:when>
+						
 						<c:when test="${sessionMap.imageGallery.allowVote}">
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
 								${summary.numberOfVotes}
@@ -122,6 +141,7 @@
 							<c:when test="${summary.itemHide}">
 								<a href="<c:url value='/monitoring/showitem.do'/>?sessionMapID=${sessionMapID}&imageUid=${summary.itemUid}" class="button"> <fmt:message key="monitoring.label.show" /> </a>
 							</c:when>
+							
 							<c:otherwise>
 								<a href="<c:url value='/monitoring/hideitem.do'/>?sessionMapID=${sessionMapID}&imageUid=${summary.itemUid}" class="button"> <fmt:message key="monitoring.label.hide" /> </a>
 							</c:otherwise>
@@ -134,7 +154,7 @@
 		<tbody>
 	</table>
 	
-			<br>	
+	<br>	
 
 	<%-- Reflection list  --%>
 	<c:if test="${sessionMap.imageGallery.reflectOnActivity && not (empty sessionId)}">	
Index: lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp	18 Apr 2015 01:24:29 -0000	1.2
+++ lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp	5 Oct 2015 16:08:08 -0000	1.3
@@ -21,7 +21,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.lockWhenFinished == true}">
+					<c:when test="${sessionMap.imageGallery.lockWhenFinished}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -38,7 +38,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowShareImages == true}">
+					<c:when test="${sessionMap.imageGallery.allowShareImages}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -55,7 +55,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.notifyTeachersOnImageSumbit == true}">
+					<c:when test="${sessionMap.imageGallery.notifyTeachersOnImageSumbit}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -72,7 +72,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowCommentImages == true}">
+					<c:when test="${sessionMap.isCommentsEnabled}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -89,7 +89,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowVote == true}">
+					<c:when test="${sessionMap.imageGallery.allowVote}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -106,7 +106,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowRank == true}">
+					<c:when test="${sessionMap.imageGallery.allowRank}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -152,12 +152,29 @@
 		
 		<tr>
 			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.comment.images" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.isCommentsEnabled}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
 				<fmt:message key="monitor.summary.td.addNotebook" />
 			</td>
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
+					<c:when test="${sessionMap.imageGallery.reflectOnActivity}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -168,7 +185,7 @@
 		</tr>
 		
 		<c:choose>
-			<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
+			<c:when test="${sessionMap.imageGallery.reflectOnActivity}">
 				<tr>
 					<td>
 						<fmt:message key="monitor.summary.td.notebookInstructions" />
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_images/web/pages/monitoring/parts/editcomment.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?