Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java =================================================================== diff -u -r4d3e6f238197f6f125591b3a2d6e6c8916b59ee0 -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java (.../PeerreviewUserDAOHibernate.java) (revision 4d3e6f238197f6f125591b3a2d6e6c8916b59ee0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java (.../PeerreviewUserDAOHibernate.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -310,7 +310,7 @@ queryText.append(notebookEntryStrings[1]); - buildNameSearch(searchString, queryText, true); + buildNameSearch(searchString, queryText, false); // Now specify the sort based on the switch statement above. queryText.append(sortingOrder); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java =================================================================== diff -u -re755d63f41781aa02a1fb97ae349019d01a58782 -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java (.../IPeerreviewService.java) (revision e755d63f41781aa02a1fb97ae349019d01a58782) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java (.../IPeerreviewService.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -151,9 +151,6 @@ */ List getGroupSummaries(Long contentId); - List getUsersForTablesorter(final Long qaSessionId, final Long excludeUserId, int page, int size, - int sorting); - int getCountUsersBySession(final Long qaSessionId, final Long excludeUserId); /** @@ -246,13 +243,13 @@ * user, set getByUser to false and set currentUserId to the current user id. */ StyledCriteriaRatingDTO getUsersRatingsCommentsByCriteriaIdDTO(Long toolContentId, Long toolSessionId, RatingCriteria criteria, - Long currentUserId, boolean skipRatings, int sorting, boolean getAllUsers, boolean getByUser); + Long currentUserId, boolean skipRatings, int sorting, String searchString, boolean getAllUsers, boolean getByUser); /** * Gets all the users in the session and any existing ratings for a given criteria in JSON format. */ JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Long currentUserId, - Integer page, Integer size, int sorting, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException ; + Integer page, Integer size, int sorting, String searchString, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException ; /** * Gets all the users in the session and the ratings / comments they have left for a particular learner. Used by monitoring. @@ -263,7 +260,7 @@ * Gets all the users in the session and the number of comments that have been left for them. Used by monitoring. */ List getCommentsCounts(Long toolContentId, Long toolSessionId, RatingCriteria criteria, - Integer page, Integer size, int sorting); + Integer page, Integer size, int sorting, String searchString); String getLocalisedMessage(String key, Object[] args); @@ -273,5 +270,6 @@ /** Get all the notebook entries for a session * Will return List<[user.user_id, user.first_name, user.first_name + user.last_name, notebook entry, notebook date]> */ - List getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting); -} + List getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, String searchString); + + } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -re755d63f41781aa02a1fb97ae349019d01a58782 -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision e755d63f41781aa02a1fb97ae349019d01a58782) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -241,12 +241,6 @@ } @Override - public List getUsersForTablesorter(final Long toolSessionId, final Long excludeUserId, int page, - int size, int sorting) { - return peerreviewUserDao.getUsersForTablesorter(toolSessionId, excludeUserId, page, size, sorting); - } - - @Override public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) { return peerreviewUserDao.getCountUsersBySession(toolSessionId, excludeUserId); } @@ -342,14 +336,14 @@ @Override public StyledCriteriaRatingDTO getUsersRatingsCommentsByCriteriaIdDTO(Long toolContentId, Long toolSessionId, RatingCriteria criteria, - Long currentUserId, boolean skipRatings, int sorting, boolean getAllUsers, boolean getByUser) { + Long currentUserId, boolean skipRatings, int sorting, String searchString, boolean getAllUsers, boolean getByUser) { if ( skipRatings ) { return ratingService.convertToStyledDTO(criteria, currentUserId, getAllUsers, null); } List rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria, - currentUserId, null, null, sorting, getByUser, ratingService); + currentUserId, null, null, sorting, searchString, getByUser, ratingService); for ( Object[] raw : rawData ) { int len = raw.length; @@ -363,10 +357,10 @@ @Override public JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Long currentUserId, - Integer page, Integer size, int sorting, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException { + Integer page, Integer size, int sorting, String searchString, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException { List rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria, - currentUserId, page, size, sorting, getByUser, ratingService); + currentUserId, page, size, sorting, searchString, getByUser, ratingService); for ( Object[] raw : rawData ) { int len = raw.length; @@ -397,10 +391,10 @@ @Override public List getCommentsCounts(Long toolContentId, Long toolSessionId, RatingCriteria criteria, - Integer page, Integer size, int sorting) { + Integer page, Integer size, int sorting, String searchString) { List rawData = peerreviewUserDao.getCommentsCounts(toolContentId, toolSessionId, criteria, - page, size, sorting); + page, size, sorting, searchString); // raw data: user_id, comment_count, first_name, last_name for ( Object[] raw : rawData ) { @@ -426,9 +420,9 @@ return peerreviewDao.getStatistics(toolContentId); } - public List getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting) { + public List getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, String searchString) { List rawData = peerreviewUserDao.getUserNotebookEntriesForTablesorter(toolSessionId, - page, size, sorting, coreNotebookService); + page, size, sorting, searchString, coreNotebookService); for ( Object[] raw : rawData ) { StringBuilder description = new StringBuilder((String)raw[1] ).append(" ").append((String)raw[2]); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java =================================================================== diff -u -r48c14c8aeedd10c8cc5fd8331e21f6478fba012c -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 48c14c8aeedd10c8cc5fd8331e21f6478fba012c) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -392,6 +392,8 @@ sorting = PeerreviewConstants.SORT_BY_NOTEBOOK_ENTRY_ASC; } } + + String searchString = WebUtil.readStrParam(request, "itemDescription", true); // setting date format to ISO8601 for jquery.timeago DateFormat dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT); @@ -408,7 +410,7 @@ responcedata.put("records", service.getCountUsersBySession(toolSessionId, dummyUserId)); List nbEntryList = service.getUserNotebookEntriesForTablesorter(toolSessionId, - page, size, sorting); + page, size, sorting, searchString); // processed data from db is user.user_id, user.first_name, escaped( first_name + last_name), notebook entry, notebook date // if no rating or comment, then the entries will be null and not an empty string Index: lams_tool_preview/web/pages/monitoring/criteria.jsp =================================================================== diff -u -rf059acd48464d2785b1ab003d64cc21747bba49d -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/web/pages/monitoring/criteria.jsp (.../criteria.jsp) (revision f059acd48464d2785b1ab003d64cc21747bba49d) +++ lams_tool_preview/web/pages/monitoring/criteria.jsp (.../criteria.jsp) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -7,7 +7,7 @@ - <fmt:message key="label.learning.title" /> + <title><fmt:message key="label.monitoring.heading" /> <%@ include file="/common/header.jsp"%> Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp =================================================================== diff -u -r223de22225bd6f7969f417b6d17ba681671af095 -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 223de22225bd6f7969f417b6d17ba681671af095) +++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -28,12 +28,11 @@ colNames:[ 'itemId', '', - '${heading}' - ], + '${heading}' ], colModel:[ {name:'itemId', index:'itemId', width:0, hidden: true}, - {name:'itemDescription', index:'itemDescription', width:260}, - {name:'rating', index:'rating', width:160, align:"center"} + {name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false }}, + {name:'rating', index:'rating', width:100, align:"center", search:false} ], rowNum:10, rowList:[10,20,30,40,50,100], @@ -90,9 +89,11 @@ } }) } - }).jqGrid('navGrid','#pager${toolSessionId}',{add:false,del:false,edit:false,search:false}); + }).jqGrid('filterToolbar', { + searchOnEnter: false + }) + .navGrid('#pager${toolSessionId}',{add:false,del:false,edit:false,search:false}); - //jqgrid autowidth (http://stackoverflow.com/a/1610197) $(window).bind('resize', function() { resizeJqgrid(jQuery(".ui-jqgrid-btable:visible")); @@ -113,9 +114,13 @@ setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300); }); - + + + +
+

Index: lams_tool_preview/web/pages/monitoring/reflections.jsp =================================================================== diff -u -re755d63f41781aa02a1fb97ae349019d01a58782 -r1493a89e84185e53ff46dc7fc532850053e8cab2 --- lams_tool_preview/web/pages/monitoring/reflections.jsp (.../reflections.jsp) (revision e755d63f41781aa02a1fb97ae349019d01a58782) +++ lams_tool_preview/web/pages/monitoring/reflections.jsp (.../reflections.jsp) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) @@ -7,12 +7,13 @@ - <fmt:message key="label.learning.title" /> + <title><fmt:message key="label.monitoring.heading" /> <%@ include file="/common/header.jsp"%> + @@ -39,8 +40,8 @@ ], colModel:[ {name:'itemId', index:'itemId', width:0, hidden: true}, - {name:'itemDescription', index:'itemDescription', width:100}, - {name:'notebook', index:'notebook', width:200} + {name:'itemDescription', index:'itemDescription', width:100, searchoptions: { clearSearch: false }}, + {name:'notebook', index:'notebook', width:200, search:false} ], rowNum:10, rowList:[10,20,30,40,50,100], @@ -51,7 +52,10 @@ }, // caption: "${groupSummary.sessionName}" use Bootstrap panels as the title bar subGrid: false - }).jqGrid('navGrid','#pager${toolSessionId}',{add:false,del:false,edit:false,search:false}); + }).jqGrid('filterToolbar', { + searchOnEnter: false + }) + .navGrid('#pager${toolSessionId}',{add:false,del:false,edit:false,search:false}); //jqgrid autowidth (http://stackoverflow.com/a/1610197)