Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.50 -r1.51 --- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties 30 Dec 2014 03:48:43 -0000 1.50 +++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties 8 Jan 2015 23:51:50 -0000 1.51 @@ -233,5 +233,6 @@ label.authoring.advance.min.limited.input =Minimum number of characters per posting label.char.required =Characters required - +label.number.of.posts =Number of posts +label.number.of.replies =Number of replies #======= End labels: Exported 226 labels for en AU ===== Index: lams_tool_forum/conf/xdoclet/struts-actions.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v diff -u -r1.53 -r1.54 --- lams_tool_forum/conf/xdoclet/struts-actions.xml 6 Jan 2015 01:09:43 -0000 1.53 +++ lams_tool_forum/conf/xdoclet/struts-actions.xml 8 Jan 2015 23:51:50 -0000 1.54 @@ -311,15 +311,6 @@ - - - - getMessageDTO(List msgList){ + public static List getMessageDTO(List msgList){ List retSet = new ArrayList(); if(msgList == null || msgList.isEmpty()) return retSet; - Iterator iter = msgList.iterator(); + Iterator iter = msgList.iterator(); while(iter.hasNext()){ - Message msg = (Message) iter.next(); + Message msg = iter.next(); MessageDTO msgDto = new MessageDTO(); msgDto.setMessage(msg); if(msg.getCreatedBy() != null) Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java,v diff -u -r1.2 -r1.3 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java 7 May 2008 06:33:45 -0000 1.2 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java 8 Jan 2015 23:51:50 -0000 1.3 @@ -4,83 +4,95 @@ public class UserDTO { - private Long userUid; - private String fullName; - private String loginName; - private int noOfPosts; - private boolean hasRefection; - private String reflectInstrctions; - private boolean finishReflection; - private String reflect; - private boolean anyPostsMarked; - - public UserDTO(){ - } - - public UserDTO(ForumUser user) { - this.setLoginName(user.getLoginName()); - this.setFullName(user.getFirstName()+" "+user.getLastName()); - this.setUserUid(user.getUid()); - - } - public String getFullName() { - return fullName; - } - public void setFullName(String fullName) { - this.fullName = fullName; - } - public boolean isHasRefection() { - return hasRefection; - } - public void setHasRefection(boolean hasRefection) { - this.hasRefection = hasRefection; - } - public String getLoginName() { - return loginName; - } - public void setLoginName(String loginName) { - this.loginName = loginName; - } - public int getNoOfPosts() { - return noOfPosts; - } - public void setNoOfPosts(int noOfPosts) { - this.noOfPosts = noOfPosts; - } - public Long getUserUid() { - return userUid; - } - public void setUserUid(Long userUid) { - this.userUid = userUid; - } - public String getReflect() { - return reflect; - } - public void setReflect(String reflection) { - this.reflect = reflection; - } + private Long userUid; + private String fullName; + private String loginName; + private int noOfPosts; + private boolean hasRefection; + private String reflectInstrctions; + private boolean finishReflection; + private String reflect; + private boolean anyPostsMarked; - public String getReflectInstrctions() { - return reflectInstrctions; - } + public UserDTO() { + } - public void setReflectInstrctions(String reflectInstrctions) { - this.reflectInstrctions = reflectInstrctions; - } + public UserDTO(ForumUser user) { + this.setLoginName(user.getLoginName()); + this.setFullName(user.getFirstName() + " " + user.getLastName()); + this.setUserUid(user.getUid()); - public boolean isFinishReflection() { - return finishReflection; - } + } - public void setFinishReflection(boolean finishReflection) { - this.finishReflection = finishReflection; - } + public String getFullName() { + return fullName; + } - public boolean isAnyPostsMarked() { - return anyPostsMarked; - } + public void setFullName(String fullName) { + this.fullName = fullName; + } - public void setAnyPostsMarked(boolean anyPostsMarked) { - this.anyPostsMarked = anyPostsMarked; - } + public boolean isHasRefection() { + return hasRefection; + } + + public void setHasRefection(boolean hasRefection) { + this.hasRefection = hasRefection; + } + + public String getLoginName() { + return loginName; + } + + public void setLoginName(String loginName) { + this.loginName = loginName; + } + + public int getNoOfPosts() { + return noOfPosts; + } + + public void setNoOfPosts(int noOfPosts) { + this.noOfPosts = noOfPosts; + } + + public Long getUserUid() { + return userUid; + } + + public void setUserUid(Long userUid) { + this.userUid = userUid; + } + + public String getReflect() { + return reflect; + } + + public void setReflect(String reflection) { + this.reflect = reflection; + } + + public String getReflectInstrctions() { + return reflectInstrctions; + } + + public void setReflectInstrctions(String reflectInstrctions) { + this.reflectInstrctions = reflectInstrctions; + } + + public boolean isFinishReflection() { + return finishReflection; + } + + public void setFinishReflection(boolean finishReflection) { + this.finishReflection = finishReflection; + } + + public boolean isAnyPostsMarked() { + return anyPostsMarked; + } + + public void setAnyPostsMarked(boolean anyPostsMarked) { + this.anyPostsMarked = anyPostsMarked; + } } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java,v diff -u -r1.9 -r1.10 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java 6 Jan 2015 01:09:42 -0000 1.9 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java 8 Jan 2015 23:51:50 -0000 1.10 @@ -43,10 +43,14 @@ private static final String SQL_QUERY_FIND_BY_SESSION_AND_QUESTION_LIMIT = "from user in class ForumUser " + "where user.session.sessionId=:sessionId order by "; - + + private static final String SQL_QUERY_FIND_BY_SESSION_LIMIT_ORDER_BY_NUM_POSTS = "SELECT user, COUNT(message.uid) AS postCount FROM " + + Message.class.getName() + " as message " + + " RIGHT JOIN ForumUser as user " + + " WHERE user.session.sessionId=:sessionId GROUP BY user.userId ORDER BY postCount "; + private static final String GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION = "SELECT COUNT(*) from " - + ForumUser.class.getName() - + " as user where user.session.sessionId=?"; + + ForumUser.class.getName() + " as user where user.session.sessionId=?"; public List getBySessionId(Long sessionID) { return this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, sessionID); @@ -86,17 +90,39 @@ sortingOrder = "user.lastName"; break; case ForumConstants.SORT_BY_USER_NAME_ASC: - sortingOrder = "user.lastName ASC"; + sortingOrder = "user.lastName ASC, user.firstName ASC"; break; case ForumConstants.SORT_BY_USER_NAME_DESC: - sortingOrder = "user.lastName DESC"; + sortingOrder = "user.lastName DESC, user.firstName DESC"; break; + case ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC: + sortingOrder = "ASC"; + break; + case ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC: + sortingOrder = "DESC"; + break; } - return getSession().createQuery(SQL_QUERY_FIND_BY_SESSION_AND_QUESTION_LIMIT + sortingOrder) - .setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size).list(); + if (sorting == ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC + || sorting == ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC) { + + String SQL_QUERY_FIND_BY_SESSION_LIMIT_ORDER_BY_NUM_POSTS = "SELECT user FROM " + + Message.class.getName() + " as message " + + " RIGHT JOIN message.createdBy as user " + + " WHERE user.session.sessionId=:sessionId GROUP BY user.userId ORDER BY COUNT(message) "; + + List list = getSession().createQuery(SQL_QUERY_FIND_BY_SESSION_LIMIT_ORDER_BY_NUM_POSTS + sortingOrder) + .setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size).list(); + + return list; + + } else { + + return getSession().createQuery(SQL_QUERY_FIND_BY_SESSION_AND_QUESTION_LIMIT + sortingOrder) + .setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size).list(); + } } - + public int getCountUsersBySession(final Long sessionId) { List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION, new Object[] { sessionId }); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java,v diff -u -r1.31 -r1.32 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java 6 Jan 2015 01:09:43 -0000 1.31 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java 8 Jan 2015 23:51:50 -0000 1.32 @@ -70,7 +70,7 @@ * @param sessionId * @return */ - public List getRootTopics(Long sessionId) { + public List getRootTopics(Long sessionId) { return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_TOPICS, sessionId); } @@ -80,7 +80,7 @@ * @param forumUid * @return */ - public List getTopicsFromAuthor(Long forumUid) { + public List getTopicsFromAuthor(Long forumUid) { return this.getHibernateTemplate().find(SQL_QUERY_FIND_TOPICS_FROM_AUTHOR, forumUid); } @@ -97,7 +97,7 @@ * @param parentId * @return */ - public List getChildrenTopics(Long parentId) { + public List getChildrenTopics(Long parentId) { return this.getHibernateTemplate().find(SQL_QUERY_FIND_CHILDREN, parentId); } @@ -108,7 +108,7 @@ * @param sessionId * @return */ - public List getByUserAndSession(Long userUid, Long sessionId) { + public List getByUserAndSession(Long userUid, Long sessionId) { return this.getHibernateTemplate().find(SQL_QUERY_BY_USER_SESSION, new Object[] { userUid, sessionId }); } @@ -118,7 +118,7 @@ * @param sessionId * @return */ - public List getBySession(Long sessionId) { + public List getBySession(Long sessionId) { return this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION, sessionId); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.130 -r1.131 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 6 Jan 2015 01:09:42 -0000 1.130 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 8 Jan 2015 23:51:50 -0000 1.131 @@ -490,8 +490,8 @@ } @Override - public List getMessagesByUserUid(Long userId, Long sessionId) { - List list = messageDao.getByUserAndSession(userId, sessionId); + public List getMessagesByUserUid(Long userId, Long sessionId) { + List list = messageDao.getByUserAndSession(userId, sessionId); return MessageDTO.getMessageDTO(list); } @@ -504,8 +504,8 @@ @Override public void releaseMarksForSession(Long sessionID) { // udate release mark date for each message. - List list = messageDao.getBySession(sessionID); - Iterator iter = list.iterator(); + List list = messageDao.getBySession(sessionID); + Iterator iter = list.iterator(); ForumToolSession session = forumToolSessionDao.getBySessionId(sessionID); Forum forum = session.getForum(); boolean notifyLearnersOnMarkRelease = getEventNotificationService().eventExists(ForumConstants.TOOL_SIGNATURE, @@ -518,7 +518,7 @@ } while (iter.hasNext()) { - Message msg = (Message) iter.next(); + Message msg = iter.next(); ForumReport report = msg.getReport(); if (report != null) { report.setDateMarksReleased(new Date()); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v diff -u -r1.54 -r1.55 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 6 Jan 2015 01:09:42 -0000 1.54 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 8 Jan 2015 23:51:50 -0000 1.55 @@ -222,7 +222,7 @@ * @param userId * @return */ - List getMessagesByUserUid(Long userId, Long sessionId); + List getMessagesByUserUid(Long userId, Long sessionId); /** * Get how many post of this user post in a special session. DOES NOT include posts from author. Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.63 -r1.64 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 6 Jan 2015 01:09:43 -0000 1.63 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 8 Jan 2015 23:51:50 -0000 1.64 @@ -37,6 +37,8 @@ public static final int SORT_BY_NO = 0; public static final int SORT_BY_USER_NAME_ASC = 1; public static final int SORT_BY_USER_NAME_DESC = 2; + public static final int SORT_BY_NUMBER_OF_POSTS_ASC = 3; + public static final int SORT_BY_NUMBER_OF_POSTS_DESC = 4; // See LDEV652 // For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc. @@ -132,7 +134,7 @@ public static final String ATTR_USER_UID = "userUid"; - public static final String ATTR_REPORT = "report"; + public static final String ATTR_MESSAGES = "messages"; public static final String PARAM_UPDATE_MODE = "updateMode"; @@ -167,8 +169,6 @@ public static final String ATTR_MAXIMUM_REPLY = "maximumReply"; - public static final String MARK_UPDATE_FROM_SESSION = "listAllMarks"; - public static final String MARK_UPDATE_FROM_USER = "listMarks"; public static final String MARK_UPDATE_FROM_FORUM = "viewForum"; Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/UserDTOComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v diff -u -r1.47 -r1.48 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 6 Jan 2015 01:09:43 -0000 1.47 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 8 Jan 2015 23:51:50 -0000 1.48 @@ -67,7 +67,6 @@ import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.forum.dto.MessageDTO; import org.lamsfoundation.lams.tool.forum.dto.SessionDTO; -import org.lamsfoundation.lams.tool.forum.dto.UserDTO; import org.lamsfoundation.lams.tool.forum.persistence.Forum; import org.lamsfoundation.lams.tool.forum.persistence.ForumReport; import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession; @@ -78,7 +77,6 @@ import org.lamsfoundation.lams.tool.forum.util.ForumUserComparator; import org.lamsfoundation.lams.tool.forum.util.ForumWebUtils; import org.lamsfoundation.lams.tool.forum.util.SessionDTOComparator; -import org.lamsfoundation.lams.tool.forum.util.UserDTOComparator; import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm; import org.lamsfoundation.lams.tool.forum.web.forms.MarkForm; import org.lamsfoundation.lams.util.DateUtil; @@ -117,9 +115,6 @@ } // ***************** Marks Functions ******************** - if (param.equals("viewAllMarks")) { - return viewAllMarks(mapping, form, request, response); - } if (param.equals("downloadMarks")) { return downloadMarks(mapping, form, request, response); } @@ -193,8 +188,6 @@ Forum forum = forumService.getForumByContentId(toolContentId); request.setAttribute("forum", forum); - boolean hasReflection = forum.isReflectOnActivity(); - List sessions = forumService.getSessionsByContentId(toolContentId); Set sessionDtos = new TreeSet( @@ -242,10 +235,17 @@ Integer isSort2 = WebUtil.readIntParam(request, "column[1]", true); int sorting = ForumConstants.SORT_BY_NO; - if (isSort1 != null && isSort1.equals(0)) { + if ((isSort1 != null) && isSort1.equals(0)) { sorting = ForumConstants.SORT_BY_USER_NAME_ASC; - } else if (isSort1 != null && isSort1.equals(1)) { + + } else if ((isSort1 != null) && isSort1.equals(1)) { sorting = ForumConstants.SORT_BY_USER_NAME_DESC; + + } else if ((isSort2 != null) && isSort2.equals(0)) { + sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_ASC; + + } else if ((isSort2 != null) && isSort2.equals(1)) { + sorting = ForumConstants.SORT_BY_NUMBER_OF_POSTS_DESC; } List users = forumService.getUsersForTablesorter(sessionId, page, size, sorting); @@ -263,7 +263,7 @@ JSONObject responseRow = new JSONObject(); responseRow.put(ForumConstants.ATTR_USER_UID, user.getUid()); - responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getFirstName() + " " + user.getLastName())); + responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getLastName() + " " + user.getFirstName())); int numberOfPosts = 0; boolean isAnyPostsMarked = false; @@ -594,37 +594,6 @@ // ========================================================================================== /** - * View all user marks for a special Session ID - * - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - // only one param for session scope marks - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); - - // create sessionMap - SessionMap sessionMap = new SessionMap(); - request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); - sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID); - sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_SESSION); - - request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - - // get tool session scope topics - forumService = getForumService(); - List topicList = forumService.getAllTopicsFromSession(sessionID); - - Map> topicsByUser = getTopicsSortedByAuthor(topicList); - request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser); - return mapping.findForward("success"); - } - - /** * View a special user's mark * * @param mapping @@ -648,14 +617,12 @@ request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); // get this user's all topics forumService = getForumService(); - List messageList = forumService.getMessagesByUserUid(userUid, sessionId); + List messages = forumService.getMessagesByUserUid(userUid, sessionId); + request.setAttribute(ForumConstants.ATTR_MESSAGES, messages); + ForumUser user = forumService.getUser(userUid); + request.setAttribute(ForumConstants.ATTR_USER, user); - // each back to web page - Map> report = new TreeMap(new ForumUserComparator()); - report.put(user, messageList); - request.setAttribute(ForumConstants.ATTR_REPORT, report); - return mapping.findForward("success"); } @@ -671,7 +638,7 @@ private ActionForward editMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { MarkForm markForm = (MarkForm) form; - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID()); + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID()); String updateMode = (String) sessionMap.get(ForumConstants.PARAM_UPDATE_MODE); // view forum mode if (StringUtils.isBlank(updateMode)) { @@ -770,21 +737,12 @@ // echo back to topic list page: it depends which screen is come from: view special user mark, or view all user // marks. - if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_SESSION)) { - List topicList = forumService.getAllTopicsFromSession(sessionId); - Map> topicsByUser = getTopicsSortedByAuthor(topicList); - request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser); - // listMark or listAllMark. + if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_USER)) { + List messages = forumService.getMessagesByUserUid(user.getUid(), sessionId); + request.setAttribute(ForumConstants.ATTR_MESSAGES, messages); + // listMark return mapping.findForward("success"); - } else if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_USER)) { - List messageList = forumService.getMessagesByUserUid(user.getUid(), sessionId); - Map> topicMap = new TreeMap(new ForumUserComparator()); - topicMap.put(user, messageList); - request.setAttribute(ForumConstants.ATTR_REPORT, topicMap); - // listMark or listAllMark. - return mapping.findForward("success"); - } else { // mark from view forum // display root topic rather than leaf one Long rootTopicId = forumService.getRootTopicId(msg.getUid()); Index: lams_tool_forum/web/jsps/monitoring/statisticpart.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/statisticpart.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_forum/web/jsps/monitoring/statisticpart.jsp 3 Apr 2014 12:56:48 -0000 1.6 +++ lams_tool_forum/web/jsps/monitoring/statisticpart.jsp 8 Jan 2015 23:51:50 -0000 1.7 @@ -16,63 +16,57 @@ +

+ : +

+ - + + + + + + + + + +
- - : - + + + + + +
+ + + + + + + + + + +
+ - - - - + + Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v diff -u -r1.33 -r1.34 --- lams_tool_forum/web/jsps/monitoring/summary.jsp 6 Jan 2015 01:09:42 -0000 1.33 +++ lams_tool_forum/web/jsps/monitoring/summary.jsp 8 Jan 2015 23:51:50 -0000 1.34 @@ -25,8 +25,7 @@ } .tablesorter, .pager { - width: 60%; - width: 97%; + width: 97%; margin-left: 10px; } @@ -74,7 +73,9 @@ $(".tablesorter").tablesorter({ theme: 'blue', - widthFixed: true + widthFixed: true, + sortInitialOrder: 'desc', + sortList: [[0]] }); $(".tablesorter").each(function() { @@ -99,15 +100,20 @@ rows += userData["numberOfPosts"]; rows += ''; + //anyPostsMarked column rows += ''; if (${forum.reflectOnActivity}) { @@ -180,10 +186,10 @@ - - Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v diff -u -r1.27 -r1.28 --- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp 4 Apr 2014 15:26:37 -0000 1.27 +++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp 8 Jan 2015 23:51:50 -0000 1.28 @@ -1,61 +1,39 @@ <%@ include file="/common/taglibs.jsp"%> - - + -
- - - - - - - - - - - - - -
- - - - - -
- - - - - - - - - - -
-
'; - - rows += (userData["anyPostsMarked"]) ? '' : ''; - - var viewUserMarkUrl = '?userUid=' + userData["userUid"] + "&toolSessionID=" + $(table).attr('data-session-id'); - rows += ''; - rows += ''; - rows += ''; - + if (userData["numberOfPosts"] == 0) { + rows += "-"; + + } else { + var anyPostsMarked = (userData["anyPostsMarked"]) ? '' : ''; + rows += anyPostsMarked; + + var viewUserMarkUrl = '?userUid=' + userData["userUid"] + "&toolSessionID=" + $(table).attr('data-session-id'); + rows += ''; + rows += ''; + rows += ''; + } rows += ' - Number of posts + + +
- - - - - - - - - - - -
- - - , - - -
- - - - - - - - - "> - - - - - - - - - - - - - -
+

+ + + + (): +

+ +

+ + + + + + + + "> + + + +

+ +
<%@ include file="/common/messages.jsp"%>
* @@ -70,25 +48,20 @@
+ toolbarSet="DefaultMonitor"> +
-
+
" class="button" /> -
-
+ ?userID=${user.uid}&toolSessionID=${sessionMap.toolSessionID} - - - ?toolSessionID=${sessionMap.toolSessionID} - - ?sessionMapID=${formBean.sessionMapID}&topicID=${sessionMap.rootUid}&hideReflection=${sessionMap.hideReflection} Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp 27 Dec 2014 00:03:15 -0000 1.11 +++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp 8 Jan 2015 23:51:50 -0000 1.12 @@ -1,129 +1,107 @@ <%@ include file="/common/taglibs.jsp"%> - + +

+ + + +

+ + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + +
-
- -
-
-
- -
-
+ + + + + + + + + "> + +
+ +
+ + : + + ${topic.message.replyNumber} +
- - , - - - -
- - - - - - - - - "> - - - - - - - - - - - - - -
- - : - - - - - - - - - -
- - : - - - - - - - - - -
-
- - - - " class="button" /> - -
-
+ + : + -
- -
+ + + + + + + +
+ + : + + + + + + + + + +
+ + + + + " class="button" /> + +
+ +