<%@ include file="new.jsp"%> @@ -71,23 +68,9 @@ - -

- - - - -

- - <%@ include file="topicview.jsp"%> - -

- - +

+ <%@ include file="allview.jsp"%> +

Index: lams_central/web/comments/msgview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/msgview.jsp,v diff -u -r1.4.2.5 -r1.4.2.6 --- lams_central/web/comments/msgview.jsp 23 Feb 2016 14:23:03 -0000 1.4.2.5 +++ lams_central/web/comments/msgview.jsp 27 Apr 2016 00:05:37 -0000 1.4.2.6 @@ -25,19 +25,30 @@

- - - + + + + + + + + + + + + - "> | () - + +

@@ -52,7 +63,7 @@

- + comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid} Reply · @@ -81,6 +92,13 @@ · + + comments/makeSticky.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}&sticky=${!commentDto.comment.sticky} + + + · + + ${commentDto.comment.likeCount} Index: lams_central/web/comments/msgviewwrapper.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/msgviewwrapper.jsp,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_central/web/comments/msgviewwrapper.jsp 9 Feb 2016 18:52:57 -0000 1.1.2.3 +++ lams_central/web/comments/msgviewwrapper.jsp 27 Apr 2016 00:05:37 -0000 1.1.2.4 @@ -16,6 +16,8 @@ + + Index: lams_central/web/comments/topicview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/topicview.jsp,v diff -u -r1.5.2.4 -r1.5.2.5 --- lams_central/web/comments/topicview.jsp 23 Feb 2016 14:23:03 -0000 1.5.2.4 +++ lams_central/web/comments/topicview.jsp 27 Apr 2016 00:05:37 -0000 1.5.2.5 @@ -18,6 +18,16 @@ } } +expandable:true,initialState:'collapsed', + expanderTemplate:' ${prompt}', + stringCollapse:'${hide}',stringExpand:'${show}', + clickableNodeNames:true,indent:${indent}, + onNodeInitialized:function() { + if (this.level() >= 2) { + this.collapse(); + } + } + + + @@ -133,12 +157,13 @@

@@ -158,7 +183,7 @@

Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml 12 Jan 2016 12:20:17 -0000 1.1.2.2 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml 27 Apr 2016 00:06:40 -0000 1.1.2.3 @@ -137,6 +137,13 @@ column="comment_level" /> + Index: lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java 12 Jan 2016 12:20:16 -0000 1.1.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java 27 Apr 2016 00:06:40 -0000 1.1.2.3 @@ -52,7 +52,8 @@ private Date lastReplyDate; private int replyNumber; private boolean hideFlag; - + private boolean sticky; + private Comment rootComment; private Comment threadComment; private short commentLevel; @@ -177,6 +178,13 @@ this.hideFlag = hideFlag; } + public boolean isSticky() { + return sticky; + } + + public void setSticky(boolean sticky) { + this.sticky = sticky; + } public Comment getParent() { return parent; } Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java 12 Jan 2016 12:20:17 -0000 1.2.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java 27 Apr 2016 00:06:40 -0000 1.2.2.3 @@ -23,5 +23,7 @@ public abstract SortedSet getNextThreadByThreadId(final Long rootTopicId, final Long previousThreadMessageId, Integer numberOfThreads, Integer sortBy, String extraSortParam, Integer userId); + + public abstract SortedSet getStickyThreads(final Long rootTopicId, Integer sortBy, String extraSortParam, Integer userId); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java 12 Jan 2016 12:20:17 -0000 1.3.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java 27 Apr 2016 00:06:40 -0000 1.3.2.3 @@ -123,10 +123,9 @@ } private static final String SQL_QUERY_FIND_FIRST_THREAD_TOP_BY_UID = "SELECT uid FROM lams_comment" - + " WHERE root_comment_uid = :rootUid AND comment_level = 1 ORDER BY uid DESC"; - + + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 0 ORDER BY uid DESC"; private static final String SQL_QUERY_FIND_NEXT_THREAD_TOP = "SELECT uid FROM lams_comment" - + " WHERE root_comment_uid = :rootUid AND uid < :lastUid AND comment_level = 1 ORDER BY uid DESC"; + + " WHERE root_comment_uid = :rootUid AND uid < :lastUid AND comment_level = 1 AND sticky = 0 ORDER BY uid DESC"; private static final String SQL_QUERY_FIND_NEXT_THREAD_MESSAGES = "SELECT c.*, SUM(l.vote) likes_total, l2.vote user_vote FROM lams_comment c " @@ -175,7 +174,7 @@ + " FROM lams_comment c " + " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid " + " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId " - + " WHERE root_comment_uid = :rootUid AND comment_level = 1 " + + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 0 " + " GROUP BY c.uid " + " ORDER BY likes_total DESC, c.uid DESC"; @@ -184,7 +183,7 @@ + " FROM lams_comment c " + " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid " + " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId " - + " WHERE root_comment_uid = :rootUid AND comment_level = 1 " + + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 0 " + " GROUP BY c.uid " + " ORDER BY likes_total DESC, c.uid DESC) cl " + " WHERE (cl.likes_total = :like AND cl.uid < :lastUid ) " @@ -245,4 +244,81 @@ } return new TreeSet(); } + + @Override + public SortedSet getStickyThreads(final Long rootTopicId, Integer sortBy, String extraSortParam, Integer userId) { + + if (ICommentService.SORT_BY_LIKE.equals(sortBy)) { + return getStickyByThreadIdLikes(rootTopicId, sortBy, extraSortParam, userId); + } else { + return getStickyByThreadIdNewestFirst(rootTopicId, sortBy, userId); + } + + } + + private static final String SQL_QUERY_FIND_STICKY_BY_UID = "SELECT uid FROM lams_comment" + + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 1 ORDER BY uid DESC"; + + @SuppressWarnings({"unchecked" }) + private SortedSet getStickyByThreadIdNewestFirst(final Long rootTopicId, Integer sortBy, Integer userId) { + + // the search to get to the top level is quite light, so get just the uids + // then build a complete set. + List threadUidList = (List) getSession(). + createSQLQuery(SQL_QUERY_FIND_STICKY_BY_UID) + .setLong("rootUid", rootTopicId) + .list(); + + if (threadUidList != null && threadUidList.size() > 0) { + SQLQuery query = getSession().createSQLQuery(SQL_QUERY_FIND_NEXT_THREAD_MESSAGES); + query.addEntity("comment", Comment.class) + .addScalar("likes_total", IntegerType.INSTANCE) + .addScalar("user_vote", IntegerType.INSTANCE) + .setLong("userId", userId != null ? userId : 0) + .setParameterList("threadIds", threadUidList); + List results = query.list(); + return upgradeComments(results, sortBy); + } + return new TreeSet(); + } + + private static final String SQL_QUERY_FIND_STICKY_BY_LIKES = "SELECT c.*, COALESCE(SUM(l.vote),0) likes_total, l2.vote user_vote" + + " FROM lams_comment c " + + " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid " + + " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId " + + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND c.sticky = 1 " + + " GROUP BY c.uid " + + " ORDER BY likes_total DESC, c.uid DESC"; + + @SuppressWarnings({ "unchecked" }) + private SortedSet getStickyByThreadIdLikes(final Long rootTopicId, Integer sortBy, String extraSortParam, Integer userId) { + + List topThreadObjects = (List) getSession().createSQLQuery(SQL_QUERY_FIND_STICKY_BY_LIKES) + .addEntity("comment", Comment.class) + .addScalar("likes_total", IntegerType.INSTANCE) + .addScalar("user_vote", IntegerType.INSTANCE) + .setLong("rootUid", rootTopicId) + .setLong("userId", userId != null ? userId : 0) + .list(); + + if (topThreadObjects != null && topThreadObjects.size() > 0) { + // build the list of uids + List threadUidList = new ArrayList(); + for ( Object[] rawObject : topThreadObjects ) { + Comment comment = (Comment) rawObject[0]; + threadUidList.add(comment.getUid()); + } + SQLQuery query = getSession().createSQLQuery(SQL_QUERY_FIND_NEXT_THREAD_MESSAGES_REPLIES_ONLY); + query.addEntity("comment", Comment.class) + .addScalar("likes_total", IntegerType.INSTANCE) + .addScalar("user_vote", IntegerType.INSTANCE) + .setLong("userId", userId != null ? userId : 0) + .setParameterList("threadIds", threadUidList); + List results = query.list(); + topThreadObjects.addAll(results); + return upgradeComments(topThreadObjects, sortBy); + } + return new TreeSet(); + } + } Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java 12 Jan 2016 12:20:16 -0000 1.3.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java 27 Apr 2016 00:06:40 -0000 1.3.2.3 @@ -78,7 +78,23 @@ SortedSet comments = commentDAO.getNextThreadByThreadId(rootTopic.getUid(), lastThreadMessageUid, pageSize, sortBy, extraSortParam, userId); return getSortedCommentDTO(comments); } - + + @Override + public List getTopicStickyThread(Long externalId, Integer externalType, String externalSignature, + Integer sortBy, String extraSortParam, Integer userId) { + + // hidden root of all the threads! + Comment rootTopic = commentDAO.getRootTopic(externalId, externalType, externalSignature); + + // first time through - no root topic. + if ( rootTopic == null ) { + return new ArrayList(); + } + + SortedSet comments = commentDAO.getStickyThreads(rootTopic.getUid(), sortBy, extraSortParam, userId); + return getSortedCommentDTO(comments); + } + private List getSortedCommentDTO(SortedSet comments) { List msgDtoList = new ArrayList(); @@ -215,6 +231,19 @@ } } + public Comment updateSticky(Long commentUid, Boolean newSticky) { + + Comment comment = commentDAO.getById(commentUid); + if ( comment != null ) { + comment.setSticky(newSticky); + commentDAO.saveOrUpdate(comment); + return comment; + } else { + log.error("Unable to update comment as comment not found. Comment uid "+commentUid + +" new sticky "+newSticky); + return null; + } + } public CommentDTO getComment(Long commentUid){ Comment comment = commentDAO.getById(commentUid); return comment != null ? CommentDTO.getCommentDTO(comment) : null; Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java 12 Jan 2016 12:20:17 -0000 1.2.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java 27 Apr 2016 00:06:40 -0000 1.2.2.3 @@ -37,10 +37,15 @@ public static final Integer SORT_BY_LIKE = 1; - /** Gets the comments for a tool, based on the tool session and the tool's id. Allows for paging */ + /** Gets the comments for a tool, based on the tool session and the tool's id. Allows for paging. + * Will not include the sticky - get them using getTopicStickyThread() */ List getTopicThread(Long externalId, Integer externalType, String externalSignature, Long lastMsgSeqId, Integer pageSize, Integer sortBy, String extraSortParam, Integer userId); + /** Gets all the sticky comments for a tool, based on the tool session and the tool's id */ + List getTopicStickyThread(Long externalId, Integer externalType, String externalSignature, + Integer sortBy, String extraSortParam, Integer userId); + /** Saves a comment - either creating a whole tree one if there is no parent or saving under the given parent. */ Comment createReply(Long parentId, String replyText, User user); Comment createReply(Comment parent, String replyText, User user); @@ -62,6 +67,9 @@ /** Update the body in a comment, and update the modified time, who by, etc, etc */ Comment updateComment(Long commentUid, String newBody, User user, boolean makeAuditEntry); + /** Update the sticky flag for a comment */ + Comment updateSticky(Long commentUid, Boolean newSticky); + /** Update the like list for Comment commentUid by likeVote. Returns true if like/dislike added. */ boolean addLike(Long commentUid, User user, Integer likeVote); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040061.sql'. Fisheye: No comparison available. Pass `N' to diff?