Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java =================================================================== diff -u -r42cd8d7da9fa6615dbd82d376984000024b4b0fe -re1fac48f7bb8bf00cc7e591c0a19ad767172eda0 --- lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java (.../IRatingService.java) (revision 42cd8d7da9fa6615dbd82d376984000024b4b0fe) +++ lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java (.../IRatingService.java) (revision e1fac48f7bb8bf00cc7e591c0a19ad767172eda0) @@ -119,16 +119,6 @@ boolean isCommentsByOtherUsersRequired, Long userId); /** - * Returns item DTO with all corresponding ratings and comments. Doesn't contain average and total amount of rates. - * - * @param contentId - * @param itemId - * @return - */ - ItemRatingDTO getRatingCriteriaDtoWithActualRatings(Long contentId, Long itemId); - - - /** * Used by tools to get the ratings and comments relating to their items. To be used within SQL and supply the toolContentId as :toolContentId, * criteria id as :ratingCriteriaId and current user id as :userId * If getByUser == true then returns data for all users, as left by the current user, otherwise gives the data for the current user as left by other users Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java =================================================================== diff -u -r223de22225bd6f7969f417b6d17ba681671af095 -re1fac48f7bb8bf00cc7e591c0a19ad767172eda0 --- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java (.../RatingService.java) (revision 223de22225bd6f7969f417b6d17ba681671af095) +++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java (.../RatingService.java) (revision e1fac48f7bb8bf00cc7e591c0a19ad767172eda0) @@ -338,58 +338,6 @@ } @Override - public ItemRatingDTO getRatingCriteriaDtoWithActualRatings(Long contentId, Long itemId) { - - NumberFormat numberFormat = NumberFormat.getInstance(Locale.US); - numberFormat.setMaximumFractionDigits(1); - List criterias = getCriteriasByToolContentId(contentId); - - // handle comments criteria - List itemIds = Collections.singletonList(itemId); - boolean isCommentsByOtherUsersRequired = false;// not important as it's not used - Long userId = -1L; // passing impossible user id as there is no need in this info - List itemDtos = handleCommentsCriteria(criterias, itemIds, isCommentsByOtherUsersRequired, - userId); - ItemRatingDTO itemDto = itemDtos.get(0); - - //get all data from DB - List itemRatings = ratingDAO.getRatingsByItem(contentId, itemId); - - // handle all criterias except for comments' one - List criteriaDtos = new LinkedList(); - for (RatingCriteria criteria : criterias) { - Long criteriaId = criteria.getRatingCriteriaId(); - - // comments' criteria are handled earlier, at the beginning of this function - if (criteria.isCommentRating()) { - continue; - } - - ItemRatingCriteriaDTO criteriaDto = new ItemRatingCriteriaDTO(); - criteriaDto.setRatingCriteria(criteria); - List ratingDtos = new ArrayList(); - - //find according to that criteria itemRatings - for (Rating itemRating : itemRatings) { - if (itemRating.getRatingCriteria().getRatingCriteriaId().equals(criteria.getRatingCriteriaId())) { - RatingDTO ratingDto = new RatingDTO(); - String ratingStr = numberFormat.format(itemRating.getRating()); - ratingDto.setRating(ratingStr); - ratingDto.setLearner(itemRating.getLearner()); - ratingDtos.add(ratingDto); - } - } - criteriaDto.setRatingDtos(ratingDtos); - - criteriaDtos.add(criteriaDto); - } - itemDto.setCriteriaDtos(criteriaDtos); - - return itemDto; - } - - - @Override public List getCriteriasByToolContentId(Long toolContentId) { List criterias = ratingCriteriaDAO.getByToolContentId(toolContentId); return criterias;