Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java,v diff -u -r1.1.2.9 -r1.1.2.10 --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java 16 Nov 2016 04:16:02 -0000 1.1.2.9 +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java 14 Feb 2017 12:33:32 -0000 1.1.2.10 @@ -79,7 +79,7 @@ // Used by tools to get the ratings and comments relating to their items, as submitted by a particular user. // To be used within SQL and supply the userId as :userId and criteriaId as :ratingCriteriaId // See Peer Review for example usage. Special version for comment style as there is no entry in the lams_rating table for a comment style rating. - private static final String TOOL_SELECT_LEFT_JOIN_BY_USER_STANDARD = "SELECT r.item_id, rc.comment, r2.rating, AVG(r.rating) average_rating, COUNT(r.rating) count_vote " + private static final String TOOL_SELECT_LEFT_JOIN_BY_USER_STANDARD = "SELECT r.item_id, ANY_VALUE(rc.comment) comment, ANY_VALUE(r2.rating) rating, AVG(r.rating) average_rating, COUNT(r.rating) count_vote " + " FROM lams_rating r " + " LEFT JOIN lams_rating r2 ON r2.rating_criteria_id = r.rating_criteria_id AND r.item_id = r2.item_id AND r2.user_id = :userId " + " LEFT JOIN lams_rating_comment rc ON rc.rating_criteria_id = r.rating_criteria_id AND rc.item_id = r2.item_id AND rc.user_id = :userId " Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java,v diff -u -r1.1.2.13 -r1.1.2.14 --- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java 11 Feb 2017 03:32:39 -0000 1.1.2.13 +++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java 14 Feb 2017 12:33:32 -0000 1.1.2.14 @@ -559,7 +559,7 @@ dto.setComment((String) row[2]); dto.setItemDescription((String) row[numColumns - 1]); if ( ! isComment ) { - dto.setUserRating(row[3] == null ? "" : numberFormat.format((Float) row[3])); + dto.setUserRating(row[3] == null ? "" : numberFormat.format((Double) row[3])); dto.setAverageRating(row[4] == null ? "" : numberFormat.format((Double) row[4])); dto.setNumberOfVotes(row[5] == null ? "" : numberFormat.format((BigInteger) row[5])); } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java 14 Oct 2016 03:42:40 -0000 1.1.2.4 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java 14 Feb 2017 12:34:37 -0000 1.1.2.5 @@ -41,7 +41,9 @@ private static final String GET_RESOURCE_BY_CONTENTID = "from " + Peerreview.class.getName() + " as r where r.contentId=?"; - private static final String GET_STATS = "SELECT s.session_id as \"sessionId\", s.session_name as \"sessionName\", " + // ANY_VALUE is needed for Mysql setting ONLY_FULL_GROUP_BY - the sessionName will always be the same + // as it is from the same table as sessionId. (LDEV-4222) + private static final String GET_STATS = "SELECT s.session_id as \"sessionId\", ANY_VALUE(s.session_name) as \"sessionName\", " + " count(u.uid) as \"numLearnersInSession\", sum(u.session_finished) as \"numLearnersComplete\" " + " FROM tl_laprev11_session s " + " JOIN tl_laprev11_peerreview p ON p.content_id = :toolContentId AND s.peerreview_uid = p.uid "