Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml (.../ImageGallery.hbm.xml) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml (.../ImageGallery.hbm.xml) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -129,14 +129,6 @@ /> - - - - - - - - - - - - - - - - + Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -rf3be94729c90c7390a6aea11d1886a4b72d96670 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision f3be94729c90c7390a6aea11d1886a4b72d96670) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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://]"); } Fisheye: Tag 434a2aec5c62876edcb6dc8908896939080f1cf2 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 434a2aec5c62876edcb6dc8908896939080f1cf2 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 434a2aec5c62876edcb6dc8908896939080f1cf2 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 434a2aec5c62876edcb6dc8908896939080f1cf2 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? Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150930.sql =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150930.sql (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150930.sql (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER IGNORE TABLE tl_laimag10_session ADD UNIQUE (session_id); + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Fisheye: Tag 434a2aec5c62876edcb6dc8908896939080f1cf2 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 =================================================================== diff -u -rd5e74a600d6f98a220972baea94c6fd877de1071 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision d5e74a600d6f98a220972baea94c6fd877de1071) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 =================================================================== diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java (.../UserImageContributionDTO.java) (revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/UserImageContributionDTO.java (.../UserImageContributionDTO.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 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 getComments() { - return comments; - } - - public void setComments(Set comments) { - this.comments = comments; - } public ImageGalleryItem getImage() { return image; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -28,16 +28,6 @@ - - - - - - - - - - @@ -65,9 +55,8 @@ - - - + + @@ -79,13 +68,7 @@ - - - - - - - + @@ -126,7 +109,6 @@ - Fisheye: Tag 434a2aec5c62876edcb6dc8908896939080f1cf2 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 =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 =================================================================== diff -u -rf3be94729c90c7390a6aea11d1886a4b72d96670 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision f3be94729c90c7390a6aea11d1886a4b72d96670) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 434a2aec5c62876edcb6dc8908896939080f1cf2 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 =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -36,7 +36,6 @@ 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 +123,6 @@ * @return */ Set 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 +161,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 =================================================================== diff -u -rcba500cc787cfc127fa1dbfdea56b368bbe5c388 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java (.../ImageGalleryOutputFactory.java) (revision cba500cc787cfc127fa1dbfdea56b368bbe5c388) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java (.../ImageGalleryOutputFactory.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 baseOutputs = new TreeMap(); 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 allImages = imageGallery.getImageGalleryItems(); + List itemIds = new LinkedList(); + for (ImageGalleryItem image : allImages) { + itemIds.add(image.getUid()); + } int countComments = 0; if (user != null) { - Set allImages = imageGallery.getImageGalleryItems(); + boolean isCommentsByOtherUsersRequired = false; + List RatingCriteriaDtos = imageGalleryService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, user.getUserId()); + Iterator it = allImages.iterator(); while (it.hasNext()) { ImageGalleryItem image = it.next(); - Set imageComments = image.getComments(); - for (ImageComment comment : imageComments) { - if (user.getUserId().equals(comment.getCreateBy().getUserId())) { - countComments++; - } - } +// Set imageComments = image.getComments(); +// for (ImageComment comment : imageComments) { +// if (user.getUserId().equals(comment.getCreateBy().getUserId())) { +// countComments++; +// } +// } } } else { - Set allImages = imageGallery.getImageGalleryItems(); for (ImageGalleryItem image : allImages) { - Set imageComments = image.getComments(); - for (ImageComment comment : imageComments) { - countComments++; - } +// Set 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 =================================================================== diff -u -r0aae4208886026f429f05b458b79c14f8d7030d4 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 0aae4208886026f429f05b458b79c14f8d7030d4) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -71,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; @@ -108,8 +103,8 @@ /** * @author Andrey Balan */ -public class ImageGalleryServiceImpl - implements IImageGalleryService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager { +public class ImageGalleryServiceImpl implements IImageGalleryService, ToolContentManager, ToolSessionManager, + ToolContentImport102Manager { private final static String MEDIUM_FILENAME_PREFIX = "medium_"; @@ -121,10 +116,6 @@ private ImageGalleryItemDAO imageGalleryItemDao; - private ImageCommentDAO imageCommentDao; - - private ImageRatingDAO imageRatingDao; - private ImageVoteDAO imageVoteDao; private ImageGalleryUserDAO imageGalleryUserDao; @@ -155,7 +146,7 @@ private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; - + private IRatingService ratingService; private IEventNotificationService eventNotificationService; @@ -220,19 +211,18 @@ public void saveOrUpdateImageGalleryItem(ImageGalleryItem image) { imageGalleryItemDao.saveObject(image); } - + @Override public void deleteImage(Long toolSessionId, Long imageUid) { ImageGallery imageGallery = getImageGalleryBySessionId(toolSessionId); ImageGalleryItem image = getImageGalleryItemByUid(imageUid); - + Set imageList = imageGallery.getImageGalleryItems(); imageList.remove(image); imageGallery.setImageGalleryItems(imageList); saveOrUpdateImageGallery(imageGallery); } - @Override public ImageVote getImageVoteByImageAndUser(Long imageUid, Long userId) { return imageVoteDao.getImageVoteByImageAndUser(imageUid, userId); } @@ -248,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); } @@ -359,7 +334,7 @@ @Override public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { + if (list == null || list.isEmpty()) { return null; } else { return list.get(0); @@ -370,7 +345,7 @@ public void updateEntry(NotebookEntry notebookEntry) { coreNotebookService.updateEntry(notebookEntry); } - + @Override public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long imageUid, Long userId) { @@ -380,30 +355,29 @@ return ratingCriteria; } - + @Override public List getRatingCriteriaDtos(Long contentId, Collection itemIds, boolean isCommentsByOtherUsersRequired, Long userId) { return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId); } - + @Override public int getCountItemsRatedByUser(Long toolContentId, Integer userId) { return ratingService.getCountItemsRatedByUser(toolContentId, userId); } - + @Override public List getRatingCriterias(Long toolContentId) { List ratingCriterias = ratingService.getCriteriasByToolContentId(toolContentId); return ratingCriterias; } - + @Override - public void saveRatingCriterias(HttpServletRequest request, Collection oldCriterias, - Long toolContentId) { + public void saveRatingCriterias(HttpServletRequest request, Collection oldCriterias, Long toolContentId) { ratingService.saveRatingCriterias(request, oldCriterias, toolContentId); } - + @Override public boolean isCommentsEnabled(Long toolContentId) { return ratingService.isCommentsEnabled(toolContentId); @@ -427,18 +401,42 @@ // one new group for one session. group = new ArrayList

(); Set groupImages = getImagesForGroup(imageGallery, session.getSessionId()); + + List itemRatingDtos = null; + if (imageGallery.isAllowRank()) { + // create itemIds list + List itemIds = new LinkedList(); + 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> imageSummary = new ArrayList>(); List group = new ArrayList(); ImageGalleryItem image = imageGalleryItemDao.getByUid(imageUid); + ImageGallery imageGallery = getImageGalleryByContentId(contentId); List sessionList; if (image.isCreateByAuthor()) { @@ -467,12 +466,37 @@ for (ImageGallerySession session : sessionList) { // one new group for one session. group = new ArrayList(); - Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId()); +// Object[] ratingForGroup = getRatingForGroup(image.getUid(), session.getSessionId()); List 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); } @@ -538,10 +562,10 @@ List userContributionList = new ArrayList(); - 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); } @@ -561,16 +585,16 @@ dbImages.addAll(imageGallery.getImageGalleryItems()); for (ImageGalleryItem image : dbImages) { List userContributionList = new ArrayList(); - Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId()); +// Object[] ratingForGroup = getRatingForGroup(image.getUid(), imageSession.getSessionId()); - List 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 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); } @@ -593,8 +617,7 @@ String fileName = file.getFileName(); - ImageGalleryConfigItem mediumImageDimensionsKey = getConfigItem( - ImageGalleryConfigItem.KEY_MEDIUM_IMAGE_DIMENSIONS); + ImageGalleryConfigItem mediumImageDimensionsKey = getConfigItem(ImageGalleryConfigItem.KEY_MEDIUM_IMAGE_DIMENSIONS); int mediumImageDimensions = Integer.parseInt(mediumImageDimensionsKey.getConfigValue()); // Read the original image from the repository @@ -609,8 +632,7 @@ file.getContentType()); image.setMediumFileUuid(mediumNodeKey.getUuid()); - ImageGalleryConfigItem thumbnailImageDimensionsKey = getConfigItem( - ImageGalleryConfigItem.KEY_THUMBNAIL_IMAGE_DIMENSIONS); + ImageGalleryConfigItem thumbnailImageDimensionsKey = getConfigItem(ImageGalleryConfigItem.KEY_THUMBNAIL_IMAGE_DIMENSIONS); int thumbnailImageDimensions = Integer.parseInt(thumbnailImageDimensionsKey.getConfigValue()); // Read the original image from the repository @@ -626,17 +648,17 @@ image.setThumbnailFileUuid(thumbnailNodeKey.getUuid()); } catch (RepositoryCheckedException e) { - ImageGalleryServiceImpl.log - .error(messageService.getMessage("error.msg.repository.checked.exception") + ":" + e.toString()); - throw new UploadImageGalleryFileException( - messageService.getMessage("error.msg.repository.checked.exception")); + ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.repository.checked.exception") + ":" + + e.toString()); + throw new UploadImageGalleryFileException(messageService + .getMessage("error.msg.repository.checked.exception")); } catch (NumberFormatException e) { - ImageGalleryServiceImpl.log - .error(messageService.getMessage("error.msg.number.format.exception") + ":" + e.toString()); + ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.number.format.exception") + ":" + + e.toString()); throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.number.format.exception")); } catch (IOException e) { - ImageGalleryServiceImpl.log - .error(messageService.getMessage("error.msg.io.exception.resizing") + ":" + e.toString()); + ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.io.exception.resizing") + ":" + + e.toString()); throw new ImageGalleryException(messageService.getMessage("error.msg.io.exception.resizing")); } } @@ -707,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; } @@ -773,8 +787,7 @@ toolContentObj = ImageGallery.newInstance(toolContentObj, toolContentId); Set images = toolContentObj.getImageGalleryItems(); for (ImageGalleryItem image : images) { - image.setComments(null); - + //convert file extension to lower case String fileName = image.getFileName(); String[] fileNameParts = fileName.split("\\."); @@ -818,15 +831,15 @@ try { // register version filter class exportContentService.registerImportVersionFilterClass(ImageGalleryImportContentVersionFilter.class); - + exportContentService.registerFileClassForImport(ImageGalleryAttachment.class.getName(), "fileUuid", "fileVersionId", "fileName", "fileType", null, null); Object toolPOJO = exportContentService.importToolContent(toolContentPath, imageGalleryToolContentHandler, fromVersion, toVersion); if (!(toolPOJO instanceof ImageGallery)) { - throw new ImportToolContentException( - "Import ImageGallery tool content failed. Deserialized object is " + toolPOJO); + throw new ImportToolContentException("Import ImageGallery tool content failed. Deserialized object is " + + toolPOJO); } ImageGallery toolContentObj = (ImageGallery) toolPOJO; @@ -900,23 +913,22 @@ while (iter.hasNext()) { ImageGalleryItem item = (ImageGalleryItem) iter.next(); if (item.isCreateByAuthor()) { - item.getComments().clear(); imageGalleryUserDao.saveObject(item.getCreateBy()); imageGalleryItemDao.saveObject(item); } else { iter.remove(); } } } - + imageGalleryDao.saveObject(toContent); } @Override public String getToolContentTitle(Long toolContentId) { return getImageGalleryByContentId(toolContentId).getTitle(); } - + @Override public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { ImageGallery imageGallery = imageGalleryDao.getByContentId(toolContentId); @@ -930,21 +942,10 @@ public boolean isContentEdited(Long toolContentId) { return getImageGalleryByContentId(toolContentId).isDefineLater(); } - + @Override - public boolean isReadOnly(Long toolContentId) { - for (ImageGallerySession session : imageGallerySessionDao.getByContentId(toolContentId)) { - if (!imageGalleryUserDao.getBySessionID(session.getSessionId()).isEmpty()) { - return true; - } - } - - return false; - } - - @Override - public void removeToolContent(Long toolContentId, boolean removeSessionData) - throws SessionDataExistsException, ToolException { + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, + ToolException { ImageGallery imageGallery = imageGalleryDao.getByContentId(toolContentId); if (removeSessionData) { List list = imageGallerySessionDao.getByContentId(toolContentId); @@ -960,40 +961,24 @@ @Override @SuppressWarnings("unchecked") public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { - if (ImageGalleryServiceImpl.log.isDebugEnabled()) { - ImageGalleryServiceImpl.log.debug( - "Removing Image Gallery content for user ID " + userId + " and toolContentId " + toolContentId); + if (log.isDebugEnabled()) { + log.debug("Removing Image Gallery content for user ID " + userId + " and toolContentId " + toolContentId); } ImageGallery gallery = imageGalleryDao.getByContentId(toolContentId); if (gallery == null) { - ImageGalleryServiceImpl.log - .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); + log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); return; } - + Iterator itemIterator = gallery.getImageGalleryItems().iterator(); while (itemIterator.hasNext()) { ImageGalleryItem item = itemIterator.next(); - Iterator 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) { @@ -1014,21 +999,19 @@ } } - for (ImageGallerySession session : imageGallerySessionDao.getByContentId(toolContentId)) { - ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndSessionID(userId.longValue(), - session.getSessionId()); - if (user != null) { - NotebookEntry entry = getEntry(user.getSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ImageGalleryConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - imageGalleryDao.removeObject(NotebookEntry.class, entry.getUid()); - } - - imageGalleryUserDao.removeObject(ImageGalleryUser.class, user.getUid()); + ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndContentID(userId.longValue(), toolContentId); + if (user != null) { + NotebookEntry entry = getEntry(user.getSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, + ImageGalleryConstants.TOOL_SIGNATURE, userId); + if (entry != null) { + imageGalleryDao.removeObject(NotebookEntry.class, entry.getUid()); } + + imageGalleryUserDao.removeObject(ImageGalleryUser.class, user.getUid()); } - } + } + @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ImageGallerySession session = new ImageGallerySession(); @@ -1064,14 +1047,13 @@ } @Override - public ToolSessionExportOutputData exportToolSession(Long toolSessionId) - throws DataMissingException, ToolException { + public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException { return null; } @Override - public ToolSessionExportOutputData exportToolSession(List toolSessionIds) - throws DataMissingException, ToolException { + public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, + ToolException { return null; } @@ -1089,7 +1071,7 @@ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return imageGalleryOutputFactory.getToolOutput(name, this, toolSessionId, learnerId); } - + @Override public void forceCompleteUser(Long toolSessionId, User user) { //no actions required @@ -1100,14 +1082,12 @@ /** * Import the data for a 1.0.2 Noticeboard or HTMLNoticeboard */ - @Override public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { } /** Set the description, throws away the title value as this is not supported in 2.0 */ - @Override - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { + public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException, + DataMissingException { ImageGallery toolContentObj = getImageGalleryByContentId(toolContentId); if (toolContentObj == null) { @@ -1194,29 +1174,6 @@ return images; } - @Override - @Deprecated - public Object[] getRatingForGroup(Long imageUid, Long sessionId) { - List users = imageGalleryUserDao.getBySessionID(sessionId); - Long numberRatings = new Long(0); - Float averageRating = new Float(0); - List 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 // ***************************************************************************** @@ -1243,40 +1200,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 dbComments = image.getComments(); - TreeSet comments = new TreeSet(new ImageCommentComparator()); - for (ImageComment comment : dbComments) { - if (comment.getCreateBy().getUserId().equals(user.getUserId())) { - comments.add(comment); - } - } - userContribution.setComments(comments); - - return userContribution; - } - - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getImageGalleryOutputFactory().getSupportedDefinitionClasses(definitionType); } Fisheye: Tag 434a2aec5c62876edcb6dc8908896939080f1cf2 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/AuthoringAction.java =================================================================== diff -u -rabdbd2600176087a5f0aa22d7d093ed667fb006f -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision abdbd2600176087a5f0aa22d7d093ed667fb006f) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -373,7 +373,7 @@ ImageGalleryItem delAtt = (ImageGalleryItem) iter.next(); iter.remove(); } - + // ********************************************** // finally persist imageGalleryPO again service.saveOrUpdateImageGallery(imageGalleryPO); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 sessionMap = (SessionMap) 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 comments = new TreeSet(new ImageCommentComparator()); - Set dbComments = image.getComments(); - //List 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 dbComments = dbItem.getComments(); - dbComments.add(comment); - service.saveOrUpdateImageGalleryItem(dbItem); - - // to make available new changes be visible in jsp page - TreeSet comments = new TreeSet(new ImageCommentComparator()); - dbComments = dbItem.getComments(); - List 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 =================================================================== diff -u -rdbbdbe1fcf86e07c4d5163178b4c679b4dedfed9 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision dbbdbe1fcf86e07c4d5163178b4c679b4dedfed9) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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> 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 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 434a2aec5c62876edcb6dc8908896939080f1cf2 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 =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java (.../ImageGalleryForm.java) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java (.../ImageGalleryForm.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 =================================================================== diff -u -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java (.../ImageRatingForm.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java (.../ImageRatingForm.java) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -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 --%> @@ -46,7 +47,10 @@ - + + + + <%--Rating stars area---------------------------------------%> Index: lams_tool_images/web/pages/authoring/advance.jsp =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/web/pages/authoring/advance.jsp (.../advance.jsp) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -64,17 +64,7 @@

- - -

@@ -118,11 +108,9 @@

- +

Index: lams_tool_images/web/pages/export/exportimageteacher.jsp =================================================================== diff -u -rd5e74a600d6f98a220972baea94c6fd877de1071 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/web/pages/export/exportimageteacher.jsp (.../exportimageteacher.jsp) (revision d5e74a600d6f98a220972baea94c6fd877de1071) +++ lams_tool_images/web/pages/export/exportimageteacher.jsp (.../exportimageteacher.jsp) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -111,27 +111,7 @@ - - - - ${userContribution.rating} - - - - - -

- -

- - - - Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp =================================================================== diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/web/pages/learning/parts/commentsarea.jsp (.../commentsarea.jsp) (revision a41ef185bfa95828df54b39993cbcfbad31f1d55) +++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp (.../commentsarea.jsp) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -19,14 +19,16 @@ var pathToImageFolder = "${lams}images/css/"; //vars for rating.js - var MAX_RATES = ${imageGallery.maximumRates}, + var AVG_RATING_LABEL = '@1@@2@', + YOUR_RATING_LABEL = '@1@@2@@3@', + 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 = '', WARN_COMMENTS_IS_BLANK_LABEL = '', - WARN_MIN_NUMBER_WORDS_LABEL = ''; + WARN_MIN_NUMBER_WORDS_LABEL = ''; @@ -55,6 +57,14 @@ + +

+ + : ${sessionMap.commentsMinWordsLimit} + +

+ + <%--Ranking area---------------------------------------%> Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp =================================================================== diff -u -rdbbdbe1fcf86e07c4d5163178b4c679b4dedfed9 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/web/pages/monitoring/imagesummary.jsp (.../imagesummary.jsp) (revision dbbdbe1fcf86e07c4d5163178b4c679b4dedfed9) +++ lams_tool_images/web/pages/monitoring/imagesummary.jsp (.../imagesummary.jsp) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -12,16 +12,28 @@ <%@ include file="/common/header.jsp"%> + + + + @@ -57,63 +69,43 @@
- -

${groupSummary[0].sessionName}

+ + + + + + + +

${groupSummary[0].sessionName}

- - -

- : ${groupSummary[0].numberRatings} -
- : ${groupSummary[0].averageRating} -

-
- - -

- : ${groupSummary[0].numberOfVotesForImage} -

-
- - +

+ : ${groupSummary[0].numberOfVotesForImage} +

+
- - - - - +

- -

+ + + - - - - - - - - + - - - - - - - + + + + + - - - - - - - - - - - - -

+ +		- -	- -
- -
+ +	@@ -125,46 +117,13 @@	- ${userImageContribution.rating} -	- - - - - - - ?sessionMapID=${sessionMapID}&commentUid=${comment.uid}&TB_iframe=true&height=300&width=300 - - - " style="border-style: none;"/> - - - - " style="border-style: none;"/> - - - - - -

- - + + + + + +
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -rdbbdbe1fcf86e07c4d5163178b4c679b4dedfed9 -r434a2aec5c62876edcb6dc8908896939080f1cf2 --- lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision dbbdbe1fcf86e07c4d5163178b4c679b4dedfed9) +++ lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) @@ -12,19 +12,57 @@ <%@ include file="/common/tabbedheader.jsp" %> + + + - - + + +