Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r3b1173ef93b0596dabed3fa494e64ca3254d0558 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3b1173ef93b0596dabed3fa494e64ca3254d0558) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -244,7 +244,7 @@ label.submit = Finish label.authoring.advance.numbered.questions = Enable questions' numbering label.learning.draft.autosaved = Draft autosaved -label.waiting.for.leader = Please, wait while somebody will become a group leader +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r0e599997be3b68482ac7c3c6e91c2bb897101109 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0e599997be3b68482ac7c3c6e91c2bb897101109) +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -244,7 +244,7 @@ label.submit = Finish label.authoring.advance.numbered.questions = Enable questions' numbering label.learning.draft.autosaved = Draft autosaved -label.waiting.for.leader = Please, wait while somebody will become a group leader +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r5aabc63ac1eb20bb16e7b586981129b3208323e3 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 5aabc63ac1eb20bb16e7b586981129b3208323e3) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -212,22 +212,14 @@ AssessmentSession assessmentSession = getSessionBySessionId(toolSessionId); AssessmentUser leader = assessmentSession.getGroupLeader(); - // check leader select tool for a leader only in case QA tool doesn't know it. As otherwise it will screw + // check leader select tool for a leader only in case Assessment tool doesn't know it. As otherwise it will screw // up previous scratches done if (leader == null) { Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue()); - if (leaderUserId != null) { - leader = getUserByIDAndSession(leaderUserId, toolSessionId); - - // create new user in a DB - if (leader == null) { - log.debug("creating new user with userId: " + leaderUserId); - User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue()); - leader = new AssessmentUser(leaderDto.getUserDTO(), assessmentSession); - createUser(leader); - } - + // set leader only if current user is the leader + if (user.getUserId().equals(leaderUserId)) { + leader = user; // set group leader assessmentSession.setGroupLeader(leader); assessmentSessionDao.saveObject(assessmentSession); Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r6a39e27cc3af4928e764f8b8ffbde218656c7a9e -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6a39e27cc3af4928e764f8b8ffbde218656c7a9e) +++ lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -63,7 +63,7 @@ label.group.leader = Team leader: {0} label.team.leader = Team leader: label.monitoring.team.leader = team leader -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.refresh = Refresh label.shared.pad.id = Shared pad id that allows using the same pad between several doKu activities Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r6a39e27cc3af4928e764f8b8ffbde218656c7a9e -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6a39e27cc3af4928e764f8b8ffbde218656c7a9e) +++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -63,7 +63,7 @@ label.group.leader = Team leader: {0} label.team.leader = Team leader: label.monitoring.team.leader = team leader -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.refresh = Refresh label.shared.pad.id = Shared pad id that allows using the same pad between several doKu activities Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java =================================================================== diff -u -r2509a4b8ae30079b238c0af1c508466517584e3b -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 2509a4b8ae30079b238c0af1c508466517584e3b) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -203,19 +203,11 @@ // check leader select tool for a leader only in case Dokumaran tool doesn't know it. As otherwise it will // screw up previous scratches done if (leader == null) { - Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue()); - if (leaderUserId != null) { - leader = getUserByIDAndSession(leaderUserId, toolSessionId); + // set leader only if current user is the leader + if (user.getUserId().equals(leaderUserId)) { + leader = user; - // create new user in a DB - if (leader == null) { - log.debug("creating new user with userId: " + leaderUserId); - User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue()); - leader = new DokumaranUser(leaderDto.getUserDTO(), session); - saveOrUpdate(leader); - } - // set group leader session.setGroupLeader(leader); dokumaranSessionDao.saveObject(session); Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java =================================================================== diff -u -re0cdeed1959c06ed434e7a4abec0aa5722128c8b -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision e0cdeed1959c06ed434e7a4abec0aa5722128c8b) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -125,7 +125,7 @@ // support for leader select feature List leaders = dokumaran.isUseSelectLeaderToolOuput() - ? dokumaranService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionId).longValue(), + ? dokumaranService.checkLeaderSelectToolForSessionLeader(user, toolSessionId, isFirstTimeAccess) : new ArrayList<>(); // forwards to the leaderSelection page Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r4409f4bd1640395d7eacbf1681be39628304d815 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_lamc/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4409f4bd1640395d7eacbf1681be39628304d815) +++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -177,7 +177,7 @@ label.monitoring.summary.learner.summary = Learner summary label.monitoring.user.summary.response = Response label.monitoring.user.summary.grade = Grade -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r4409f4bd1640395d7eacbf1681be39628304d815 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4409f4bd1640395d7eacbf1681be39628304d815) +++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -177,7 +177,7 @@ label.monitoring.summary.learner.summary = Learner summary label.monitoring.user.summary.response = Response label.monitoring.user.summary.grade = Grade -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -rc82d171dbdd8918839e396f2851d6e11b68bb9e8 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision c82d171dbdd8918839e396f2851d6e11b68bb9e8) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -168,20 +168,10 @@ if (leader == null) { Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getQueUsrId().intValue()); - if (leaderUserId != null) { + // set leader only if current user is the leader + if (user.getQueUsrId().equals(leaderUserId)) { + leader = user; - leader = getMcUserBySession(leaderUserId, mcSession.getUid()); - - // create new user in a DB - if (leader == null) { - logger.debug("creating new user with userId: " + leaderUserId); - User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue()); - String userName = leaderDto.getLogin(); - String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName(); - leader = new McQueUsr(leaderUserId, userName, fullName, mcSession); - mcUserDAO.saveMcUser(user); - } - // set group leader mcSession.setGroupLeader(leader); mcSessionDAO.updateMcSession(mcSession); Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rfa8175bc3e7c902954f9332e0ad5e173737c8c0c -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_laqa/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fa8175bc3e7c902954f9332e0ad5e173737c8c0c) +++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -167,7 +167,7 @@ label.learning.answer = Answer label.learning.rating = Rating button.submit = Finish -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rfa8175bc3e7c902954f9332e0ad5e173737c8c0c -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fa8175bc3e7c902954f9332e0ad5e173737c8c0c) +++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -167,7 +167,7 @@ label.learning.answer = Answer label.learning.rating = Rating button.submit = Finish -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java =================================================================== diff -u -rc4e8969c8dd14ae2428a6cfd6bb941dfe5cf479a -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java (.../QaQueUsr.java) (revision c4e8969c8dd14ae2428a6cfd6bb941dfe5cf479a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java (.../QaQueUsr.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -44,9 +44,9 @@ import org.apache.commons.lang.builder.ToStringBuilder; /** - * + * * Represents tool users. - * + * * @author Ozgur Demirtas */ @Entity @@ -83,7 +83,7 @@ private Set qaUsrResps; public QaQueUsr() { - this.qaUsrResps = new TreeSet(); + this.qaUsrResps = new TreeSet<>(); }; /** full constructor */ @@ -92,7 +92,7 @@ this.username = username; this.fullname = fullname; this.qaSession = qaSession; - this.qaUsrResps = qaUsrResps != null ? qaUsrResps : new TreeSet(); + this.qaUsrResps = qaUsrResps != null ? qaUsrResps : new TreeSet<>(); } /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -rc393d2b92ec8c8bdc5916ac5f53e0adcaeee0ce3 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision c393d2b92ec8c8bdc5916ac5f53e0adcaeee0ce3) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -141,18 +141,10 @@ if (leader == null) { Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getQueUsrId().intValue()); - if (leaderUserId != null) { - leader = getUserByIdAndSession(leaderUserId, toolSessionId); + // set leader only if current user is the leader + if (user.getQueUsrId().equals(leaderUserId)) { + leader = user; - // create new user in a DB - if (leader == null) { - User leaderDto = (User) getUserManagementService().findById(User.class, leaderUserId.intValue()); - String userName = leaderDto.getLogin(); - String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName(); - leader = new QaQueUsr(leaderUserId, userName, fullName, qaSession, new TreeSet<>()); - qaQueUsrDAO.createUsr(user); - } - // set group leader qaSession.setGroupLeader(leader); this.updateSession(qaSession); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java =================================================================== diff -u -r39643e682162f21bc4cfa85af3d4a120843ea220 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision 39643e682162f21bc4cfa85af3d4a120843ea220) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -126,7 +126,8 @@ request.setAttribute("qaLearningForm", qaLearningForm); QaQueUsr groupLeader = null; if (qaContent.isUseSelectLeaderToolOuput()) { - groupLeader = qaService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionID).longValue()); + groupLeader = qaService.checkLeaderSelectToolForSessionLeader(user, + Long.valueOf(toolSessionID).longValue()); // forwards to the leaderSelection page if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) { Index: lams_tool_laqa/web/learning/WaitForLeader.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_laqa/web/learning/WaitForLeader.jsp (.../WaitForLeader.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/web/learning/WaitForLeader.jsp (.../WaitForLeader.jsp) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -35,9 +35,9 @@
- +
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r4409f4bd1640395d7eacbf1681be39628304d815 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4409f4bd1640395d7eacbf1681be39628304d815) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -146,7 +146,7 @@ errors.required = {0} is required. errors.maxfilesize = Uploaded file exceeded maximum size: {0} label.add = Add -label.waiting.for.leader = Please, wait while somebody will become a group leader +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.refresh = Refresh label.waiting.for.leader.finish = Please wait until a group leader finishes the activity. Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r4409f4bd1640395d7eacbf1681be39628304d815 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4409f4bd1640395d7eacbf1681be39628304d815) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -146,7 +146,7 @@ errors.required = {0} is required. errors.maxfilesize = Uploaded file exceeded maximum size: {0} label.add = Add -label.waiting.for.leader = Please, wait while somebody will become a group leader +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.refresh = Refresh label.waiting.for.leader.finish = Please wait until a group leader finishes the activity. Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r5c1bac8c09133d94e7134da9b42e6652a51c15bd -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 5c1bac8c09133d94e7134da9b42e6652a51c15bd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -1360,24 +1360,10 @@ // up previous scratches done if (leader == null) { Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserID().intValue()); - if (leaderUserId != null) { - leader = submitUserDAO.getLearner(toolSessionId, leaderUserId.intValue()); - // create new user in a DB - if (leader == null) { - log.debug("creating new user with userId: " + leaderUserId); - User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue()); -// String userName = leaderDto.getLogin(); -// String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName(); - // leader = new SubmitUser(leaderDto.getUserDTO(), submitFileSession); - leader = new SubmitUser(); - leader.setLogin(leaderDto.getLogin()); - leader.setFirstName(leaderDto.getFirstName()); - leader.setLastName(leaderDto.getLastName()); - leader.setUserID(leaderDto.getUserId()); + // set leader only if current user is the leader + if (user.getUserID().equals(leaderUserId.intValue())) { + leader = user; - createUser(leader); - } - // set group leader submitFileSession.setGroupLeader(leader); submitFilesSessionDAO.insertOrUpdate(submitFileSession); Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rf5c66dec0b21a25db202a56a6973ee2a8461b9a5 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f5c66dec0b21a25db202a56a6973ee2a8461b9a5) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -138,7 +138,7 @@ label.learners.feedback = Learner's feedback label.monitoring.team.leader = team leader label.authoring.import.qti = Import IMS QTI -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.total = Total label.report.by.team.tra = Report by team Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rf5c66dec0b21a25db202a56a6973ee2a8461b9a5 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f5c66dec0b21a25db202a56a6973ee2a8461b9a5) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -138,7 +138,7 @@ label.learners.feedback = Learner's feedback label.monitoring.team.leader = team leader label.authoring.import.qti = Import IMS QTI -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.total = Total label.report.by.team.tra = Report by team Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r5aabc63ac1eb20bb16e7b586981129b3208323e3 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 5aabc63ac1eb20bb16e7b586981129b3208323e3) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -338,17 +338,10 @@ // up previous scratches done if (leader == null) { Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue()); - if (leaderUserId != null) { - leader = getUserByIDAndSession(leaderUserId, toolSessionId); + // set leader only if current user is the leader + if (user.getUserId().equals(leaderUserId)) { + leader = user; - // create new user in a DB - if (leader == null) { - log.debug("creating new user with userId: " + leaderUserId); - User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue()); - leader = new ScratchieUser(leaderDto.getUserDTO(), scratchieSession); - this.createUser(leader); - } - // set group leader scratchieSession.setGroupLeader(leader); saveOrUpdateScratchieSession(scratchieSession); Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r13f3e7acf738bee2a21ace1c0694894bd1f48cdc -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_vote/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 13f3e7acf738bee2a21ace1c0694894bd1f48cdc) +++ lams_tool_vote/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -132,7 +132,7 @@ monitor.summary.notification = Notification monitor.summary.date.restriction.set = Deadline has been set monitor.summary.date.restriction.removed = Deadline has been removed -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r13f3e7acf738bee2a21ace1c0694894bd1f48cdc -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 13f3e7acf738bee2a21ace1c0694894bd1f48cdc) +++ lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -132,7 +132,7 @@ monitor.summary.notification = Notification monitor.summary.date.restriction.set = Deadline has been set monitor.summary.date.restriction.removed = Deadline has been removed -label.waiting.for.leader = Please, wait while somebody will become a group leader. +label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity. label.users.from.group = Other learners participating in current group: label.use.select.leader.tool.output = Use leaders from Select Leader tool label.group.leader = Group leader: {0} Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java =================================================================== diff -u -r20aa6cbca9fc96d341080e6ad39f82593443f792 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 20aa6cbca9fc96d341080e6ad39f82593443f792) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -152,26 +152,11 @@ // check leader select tool for a leader only in case QA tool doesn't know it. As otherwise it will screw // up previous scratches done if (leader == null) { - if (logger.isDebugEnabled()) { - logger.debug("If QA tool does not know it checking leader select tool for leader only" + leader); - } Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getQueUsrId().intValue()); - if (leaderUserId != null) { + // set leader only if current user is the leader + if (user.getQueUsrId().equals(leaderUserId)) { + leader = user; - leader = getVoteUserBySession(leaderUserId, session.getUid()); - - // create new user in a DB - if (leader == null) { - if (logger.isDebugEnabled()) { - logger.debug("creating new user with userId: " + leaderUserId); - } - User leaderDto = (User) getUserManagementService().findById(User.class, leaderUserId.intValue()); - String userName = leaderDto.getLogin(); - String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName(); - leader = new VoteQueUsr(leaderUserId, userName, fullName, session, new TreeSet()); - voteUserDAO.saveVoteUser(user); - } - // set group leader session.setGroupLeader(leader); voteSessionDAO.updateVoteSession(session); @@ -251,19 +236,19 @@ if (voteContent.isAllowText()) { userEntries = voteUsrAttemptDAO.getSessionOpenTextUserEntries(toolSessionUid); } else { - userEntries = new ArrayList(0); + userEntries = new ArrayList<>(0); } } Long mapIndex = 1L; int totalStandardVotesCount = 0; - Map mapStandardUserCount = new TreeMap(new VoteComparator()); - Map mapStandardNominationsHTMLedContent = new TreeMap(new VoteComparator()); - Map mapStandardQuestionUid = new TreeMap(new VoteComparator()); - Map mapStandardToolSessionUid = new TreeMap(new VoteComparator()); - Map mapStandardNominationsContent = new TreeMap(new VoteComparator()); - Map mapVoteRates = new TreeMap(new VoteComparator()); + Map mapStandardUserCount = new TreeMap<>(new VoteComparator()); + Map mapStandardNominationsHTMLedContent = new TreeMap<>(new VoteComparator()); + Map mapStandardQuestionUid = new TreeMap<>(new VoteComparator()); + Map mapStandardToolSessionUid = new TreeMap<>(new VoteComparator()); + Map mapStandardNominationsContent = new TreeMap<>(new VoteComparator()); + Map mapVoteRates = new TreeMap<>(new VoteComparator()); for (VoteQueContent question : voteContent.getVoteQueContents()) { @@ -318,7 +303,7 @@ @Override public LinkedList getSessionDTOs(Long toolContentID) { - LinkedList sessionDTOs = new LinkedList(); + LinkedList sessionDTOs = new LinkedList<>(); VoteContent voteContent = this.getVoteContent(toolContentID); for (VoteSession session : voteContent.getVoteSessions()) { @@ -332,11 +317,11 @@ Long mapIndex = 1L; int totalStandardVotesCount = 0; - Map mapVoteRates = new TreeMap(new VoteComparator()); - Map mapStandardUserCount = new TreeMap(new VoteComparator()); - Map mapStandardNominationsHTMLedContent = new TreeMap(new VoteComparator()); - Map mapStandardQuestionUid = new TreeMap(new VoteComparator()); - Map mapStandardToolSessionUid = new TreeMap(new VoteComparator()); + Map mapVoteRates = new TreeMap<>(new VoteComparator()); + Map mapStandardUserCount = new TreeMap<>(new VoteComparator()); + Map mapStandardNominationsHTMLedContent = new TreeMap<>(new VoteComparator()); + Map mapStandardQuestionUid = new TreeMap<>(new VoteComparator()); + Map mapStandardToolSessionUid = new TreeMap<>(new VoteComparator()); for (VoteQueContent question : voteContent.getVoteQueContents()) { mapStandardNominationsHTMLedContent.put(mapIndex, question.getQuestion()); @@ -390,11 +375,11 @@ totalSessionDTO.setSessionId("0"); totalSessionDTO.setSessionName(messageService.getMessage("label.all.groups.total")); - List totalOpenVotes = new ArrayList(); + List totalOpenVotes = new ArrayList<>(); int totalPotentialUserCount = 0; int totalCompletedSessionUserCount = 0; int allSessionsVotesCount = 0; - Map totalMapStandardUserCount = new TreeMap(new VoteComparator()); + Map totalMapStandardUserCount = new TreeMap<>(new VoteComparator()); for (SessionDTO sessionDTO : sessionDTOs) { totalPotentialUserCount += sessionDTO.getSessionUserCount(); @@ -440,7 +425,7 @@ // All groups total -- totalMapVoteRates part Long mapIndex = 1L; - Map totalMapVoteRates = new TreeMap(new VoteComparator()); + Map totalMapVoteRates = new TreeMap<>(new VoteComparator()); int totalStandardVotesCount = 0; for (VoteQueContent question : voteContent.getVoteQueContents()) { @@ -472,7 +457,7 @@ @Override public SortedSet getMonitoringSessionDTOs(Long toolContentID) { - SortedSet sessionDTOs = new TreeSet(); + SortedSet sessionDTOs = new TreeSet<>(); VoteContent voteContent = this.getVoteContent(toolContentID); for (VoteSession session : voteContent.getVoteSessions()) { @@ -525,7 +510,7 @@ totalSessionDTO.setSessionName(messageService.getMessage("label.all.groups.total")); totalSessionDTO.setNominations(new TreeSet()); - HashMap nominationsTotals = new HashMap(); + HashMap nominationsTotals = new HashMap<>(); int totalOpenVotes = 0; int totalVotes = 0; for (SummarySessionDTO sessionDTO : sessionDTOs) { @@ -583,7 +568,7 @@ public List getOpenVotes(Long voteContentUid, Long currentSessionId, Long userId) { Set userEntries = voteUsrAttemptDAO.getUserEntries(voteContentUid); - List monitoredAnswersDTOs = new LinkedList(); + List monitoredAnswersDTOs = new LinkedList<>(); for (String userEntry : userEntries) { if ((userEntry == null) || (userEntry.length() == 0)) { @@ -594,7 +579,7 @@ voteMonitoredAnswersDTO.setQuestion(userEntry); List userAttempts = voteUsrAttemptDAO.getUserAttempts(voteContentUid, userEntry); - List monitoredUserContainerDTOs = new LinkedList(); + List monitoredUserContainerDTOs = new LinkedList<>(); for (VoteUsrAttempt voteUsrAttempt : userAttempts) { VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO(); @@ -664,7 +649,7 @@ @Override public List getReflectionData(VoteContent voteContent, Long userID) { - List reflectionsContainerDTO = new LinkedList(); + List reflectionsContainerDTO = new LinkedList<>(); if (userID == null) { for (Iterator sessionIter = voteContent.getVoteSessions().iterator(); sessionIter.hasNext();) { @@ -744,7 +729,7 @@ List list = voteUsrAttemptDAO.getAttemptsForUserAndSessionUseOpenAnswer(userUid, sessionUid); //String openAnswer = ""; - Set userEntries = new HashSet(); + Set userEntries = new HashSet<>(); if ((list != null) && (list.size() > 0)) { Iterator listIterator = list.iterator(); while (listIterator.hasNext()) { @@ -829,7 +814,7 @@ @Override public Map buildQuestionMap(VoteContent voteContent, Collection checkedOptions) { - Map mapQuestionsContent = new TreeMap(new VoteComparator()); + Map mapQuestionsContent = new TreeMap<>(new VoteComparator()); Set questions = voteContent.getVoteQueContents(); // should we add questions from data flow from other activities? @@ -1219,7 +1204,7 @@ List questionDTOs, List deletedQuestions) { // create list of modified questions - List modifiedQuestions = new ArrayList(); + List modifiedQuestions = new ArrayList<>(); for (VoteQueContent oldQuestion : oldQuestions) { for (VoteQuestionDTO questionDTO : questionDTOs) { if (oldQuestion.getUid().equals(questionDTO.getUid())) { @@ -1563,7 +1548,7 @@ public void auditLogStartEditingActivityInMonitor(long toolContentID) { toolService.auditLogStartEditingActivityInMonitor(toolContentID); } - + @Override public boolean isLastActivity(Long toolSessionId) { return toolService.isLastActivity(toolSessionId); @@ -1614,7 +1599,7 @@ @Override public List getToolOutputs(String name, Long toolContentId) { - return new ArrayList(); + return new ArrayList<>(); } @Override Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -r20aa6cbca9fc96d341080e6ad39f82593443f792 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 20aa6cbca9fc96d341080e6ad39f82593443f792) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -182,7 +182,7 @@ List attempts = voteService.getAttemptsForUser(voteQueUsr.getUid()); - Map mapQuestionsContent = new TreeMap(new VoteComparator()); + Map mapQuestionsContent = new TreeMap<>(new VoteComparator()); Iterator listIterator = attempts.iterator(); int order = 0; while (listIterator.hasNext()) { @@ -411,15 +411,15 @@ } if ((mapGeneralCheckedOptionsContent.size() == 0 && (userEntryAvailable == true))) { - Map mapLeanerCheckedOptionsContent = new TreeMap(new VoteComparator()); + Map mapLeanerCheckedOptionsContent = new TreeMap<>(new VoteComparator()); if (userEntry.length() > 0) { voteService.createAttempt(user, mapLeanerCheckedOptionsContent, userEntry, session, voteContentUid); } } if ((mapGeneralCheckedOptionsContent.size() > 0) && (userEntryAvailable == true)) { - Map mapLeanerCheckedOptionsContent = new TreeMap(new VoteComparator()); + Map mapLeanerCheckedOptionsContent = new TreeMap<>(new VoteComparator()); if (userEntry.length() > 0) { voteService.createAttempt(user, mapLeanerCheckedOptionsContent, userEntry, session, voteContentUid); @@ -477,7 +477,7 @@ Map mapQuestionsContent = voteService.buildQuestionMap(voteContent, null); request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent); - Map mapGeneralCheckedOptionsContent = new TreeMap(new VoteComparator()); + Map mapGeneralCheckedOptionsContent = new TreeMap<>(new VoteComparator()); request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent); voteLearningForm.setUserEntry(""); @@ -864,7 +864,7 @@ if (user != null) { attempts = voteService.getAttemptsForUser(user.getUid()); } - Map localMapQuestionsContent = new TreeMap(new VoteComparator()); + Map localMapQuestionsContent = new TreeMap<>(new VoteComparator()); if (attempts != null) { @@ -902,7 +902,7 @@ private static void setupAttributes(HttpServletRequest request, VoteContent voteContent, VoteLearningForm voteLearningForm, VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO) { - Map mapGeneralCheckedOptionsContent = new TreeMap(new VoteComparator()); + Map mapGeneralCheckedOptionsContent = new TreeMap<>(new VoteComparator()); request.setAttribute(VoteAppConstants.MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent); voteLearningForm.setActivityTitle(voteContent.getTitle()); Index: lams_tool_vote/web/learning/WaitForLeader.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b845931db55d90f0dcabc0b33cce5c7df688153 --- lams_tool_vote/web/learning/WaitForLeader.jsp (.../WaitForLeader.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_vote/web/learning/WaitForLeader.jsp (.../WaitForLeader.jsp) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) @@ -36,9 +36,9 @@ - + \ No newline at end of file