Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/conf/language/lams/ApplicationResources.properties,v diff -u -r1.4 -r1.5 --- lams_tool_preview/conf/language/lams/ApplicationResources.properties 31 Aug 2015 12:43:28 -0000 1.4 +++ lams_tool_preview/conf/language/lams/ApplicationResources.properties 8 Sep 2015 23:25:05 -0000 1.5 @@ -81,9 +81,9 @@ label.no.minimum =No minimum label.no.maximum =No maximum label.minimum.number.words =Minimum number of words in a comment {0} -warning.minimum.number.words =There is a minimum required number of words in a comment: {0}. So far you've entered {1} word(s). -label.comment.textarea.tip =Please, provide some comment here... -label.max.number.marks.each.user =Max number of marks for a each user. +warning.minimum.number.words =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s). +label.comment.textarea.tip =Type your comment here then click on the green tick. +label.max.number.marks.each.user =Max number of reviews per user label.move.up =Move Up label.move.down =Move Down label.allow.comments =Allow learners to comment on other learners Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.4 -r1.5 --- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties 31 Aug 2015 12:43:28 -0000 1.4 +++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties 8 Sep 2015 23:25:05 -0000 1.5 @@ -81,9 +81,9 @@ label.no.minimum =No minimum label.no.maximum =No maximum label.minimum.number.words =Minimum number of words in a comment {0} -warning.minimum.number.words =There is a minimum required number of words in a comment: {0}. So far you've entered {1} word(s). -label.comment.textarea.tip =Please, provide some comment here... -label.max.number.marks.each.user =Max number of marks for a each user. +warning.minimum.number.words =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s). +label.comment.textarea.tip =Type your comment here then click on the green tick. +label.max.number.marks.each.user =Max number of reviews per user. label.move.up =Move Up label.move.down =Move Down label.allow.comments =Allow learners to comment on other learners Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java,v diff -u -r1.6 -r1.7 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 3 Sep 2015 00:29:58 -0000 1.6 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 8 Sep 2015 23:25:05 -0000 1.7 @@ -76,6 +76,7 @@ import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser; import org.lamsfoundation.lams.tool.peerreview.util.PeerreviewToolContentHandler; import org.lamsfoundation.lams.tool.service.ILamsToolService; +import org.lamsfoundation.lams.tool.service.LamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -319,20 +320,25 @@ try { boolean wasNotInSetAlready = creatingUsersForSessionIds.add(toolSessionId); if (!wasNotInSetAlready) { - log.debug("Peer Review: Already processing session " + toolSessionId); +// log.debug("Peer Review: Already processing session " + toolSessionId); return false; } - log.debug("Peer Review: Processing session " + toolSessionId); +// log.debug("Peer Review: Processing session " + toolSessionId); long start = System.currentTimeMillis(); int usersAdded = 0; PeerreviewSession session = getPeerreviewSessionBySessionId(toolSessionId); - Set lessonUsers = toolService.getUsersFromGroupingActivity(toolSessionId); + Integer numberPotentialLearners = toolService.getCountUsersForActivity(toolSessionId); +// log.debug("Peer Review UserCreateThread " + toolSessionId + ": getCountUsersForActivity took: " +// + (System.currentTimeMillis() - start) + "ms. numLearners "+numberPotentialLearners); List sessionUserIds = peerreviewUserDao.getUserIdsBySessionID(toolSessionId); - boolean needsUpdate = sessionUserIds.size() != lessonUsers.size(); +// log.debug("Peer Review UserCreateThread " + toolSessionId + ": getUserIdsBySessionID took: " +// + (System.currentTimeMillis() - start) + "ms."); + boolean needsUpdate = sessionUserIds.size() != numberPotentialLearners.intValue(); if (needsUpdate) { + Set lessonUsers = toolService.getToolSession(toolSessionId).getLearners(); // create all new users for (User lessonUser : lessonUsers) { currentUser = lessonUser; @@ -343,8 +349,8 @@ } } - log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: " - + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded); +// log.debug("Peer Review UserCreateThread " + toolSessionId + ": Update needsUpdate "+needsUpdate+" took: " +// + (System.currentTimeMillis() - start) + "ms. Added " + usersAdded); creatingUsersForSessionIds.remove(toolSessionId); return true; } catch (Throwable e) { Index: lams_tool_preview/web/pages/learning/definelater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/definelater.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_preview/web/pages/learning/definelater.jsp 31 Aug 2015 12:43:28 -0000 1.2 +++ lams_tool_preview/web/pages/learning/definelater.jsp 8 Sep 2015 23:25:05 -0000 1.3 @@ -7,7 +7,7 @@ <%@ include file="/common/header.jsp"%> - +