Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r2fc43e946ceac81d8635ac056d0896cbc4750bb7 --- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1688016bbb43db756bca9b93361c2a3833089d12) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7) @@ -65,7 +65,7 @@ label.monitoring.edit.activity.update =Update activity label.select.leader =Leader selection label.waiting.for.leader.launch.time.limit =Leader has not started the activity. Please wait until he/she commences it. -label.waiting.for.leader.finish =Time limit set by teacher is over. Please wait until a group leader finishes the activity. +label.waiting.for.leader.finish =Please wait until a group leader finishes the activity. monitoring.statistic.title =Statistic for monitoring monitoring.statistic.marked =Marked files: monitoring.statistic.not.marked =Not marked files: @@ -161,5 +161,8 @@ errors.maxfilesize =Uploaded file exceeded maximum size: {0} label.add =Add label.use.select.leader.tool.output =Use leaders from Select Leader tool +label.waiting.for.leader =Please, wait while somebody will become a group leader +label.users.from.group =Other learners participating in current group: +label.refresh =Refresh #======= End labels: Exported 151 labels for en AU ===== Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r363bdebfd5f12500c30a56db2aec8888fd199c46 -r2fc43e946ceac81d8635ac056d0896cbc4750bb7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 363bdebfd5f12500c30a56db2aec8888fd199c46) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7) @@ -247,15 +247,13 @@ List submissions = submissionDetailsDAO.getBySessionAndLearner(session.getSessionID(), userId); submissionDetailsDAO.deleteAll(submissions); - SubmitUser user = submitUserDAO.getLearner(session.getSessionID(), userId); if (user != null) { NotebookEntry entry = getEntry(session.getSessionID(), CoreNotebookConstants.NOTEBOOK_TOOL, SbmtConstants.TOOL_SIGNATURE, userId); if (entry != null) { submitFilesContentDAO.delete(entry); } - gradebookService.updateActivityMark(null, null, user.getUserID(), session.getSessionID(), false); submitUserDAO.delete(user); @@ -270,7 +268,7 @@ List leadersubmissions = submissionDetailsDAO.getBySessionAndLearner(fromUser.getSessionID(),fromUser.getUserID()); for (SubmissionDetails leadersubmission : leadersubmissions) { - if(leadersubmission.getSubmitFileSession().getSessionID()==toUser.getSessionID()){ + if(leadersubmission.getSubmitFileSession().getSessionID().equals(toUser.getSessionID())){ SubmissionDetails usersubmission = new SubmissionDetails(); usersubmission.setLearner(toUser); usersubmission.setDateOfSubmission(new Date()); @@ -948,6 +946,16 @@ SubmitUser learner = submitUserDAO.getLearner(sessionID, userID); learner.setFinished(true); submitUserDAO.saveOrUpdateUser(learner); + + SubmitFilesContent content = getSessionById(sessionID).getContent(); + + if(content.isUseSelectLeaderToolOuput()){ + SubmitFilesSession sbmtFilesSession = submitFilesSessionDAO.getSessionByID(sessionID); + if(sbmtFilesSession.getGroupLeader()==learner){ + sbmtFilesSession.setGroupLeader(learner); + submitFilesSessionDAO.insertOrUpdate(sbmtFilesSession); + } + } } /** @@ -1388,7 +1396,6 @@ // 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) { - Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserID().intValue()); if (leaderUserId != null) { leader = submitUserDAO.getLearner(toolSessionId, (Integer)leaderUserId.intValue()); @@ -1439,6 +1446,9 @@ return (groupLeader != null) && user.getUserID().equals(groupLeader.getUserID()); } + + + } \ No newline at end of file Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java =================================================================== diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r2fc43e946ceac81d8635ac056d0896cbc4750bb7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java (.../LearnerAction.java) (revision 1688016bbb43db756bca9b93361c2a3833089d12) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java (.../LearnerAction.java) (revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7) @@ -105,6 +105,8 @@ SessionMap sessionMap = new SessionMap(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + + ((LearnerForm) form).setSessionMapID(sessionMap.getSessionID()); // get parameters from Request @@ -205,7 +207,6 @@ SortedMap submittedFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale()); - System.out.println("Deadline coming soon 1>>"+content.isUseSelectLeaderToolOuput()); // support for leader select feature SubmitUser groupLeader = content.isUseSelectLeaderToolOuput() ? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, new Long(sessionID).longValue()) @@ -227,7 +228,7 @@ if (isNonLeader && !learner.isFinished()) { List filesUploadedByLeader = submitFilesService.getFilesUploadedByUser(groupLeader.getUserID(), sessionID, request.getLocale(), false); - //show waitForLeaderLaunchTimeLimit page if the leader hasn't started activity or hasn't pressed OK button to launch time limit + if (filesUploadedByLeader == null ) { request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader.launch.time.limit"); return mapping.findForward(SbmtConstants.WAIT_FOR_LEADER_TIME_LIMIT); @@ -242,7 +243,6 @@ // check if leader has submitted all answers if (groupLeader.isFinished()) { - submitFilesService.copyLearnerContent(groupLeader,learner); filesUploaded = submitFilesService.getFilesUploadedByUser(learner.getUserID(), learner.getSessionID(), request.getLocale(), false); setLearnerDTO(request, sessionMap, learner, filesUploaded, mode); Index: lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp =================================================================== diff -u --- lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp (revision 0) +++ lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp (revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7) @@ -0,0 +1,40 @@ + +<%@ include file="/common/taglibs.jsp"%> + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + Index: lams_tool_sbmt/web/learner/waitforleader.jsp =================================================================== diff -u --- lams_tool_sbmt/web/learner/waitforleader.jsp (revision 0) +++ lams_tool_sbmt/web/learner/waitforleader.jsp (revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7) @@ -0,0 +1,53 @@ + +<%@ include file="/common/taglibs.jsp"%> + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + + + + + + +

+ +

+ +
+ +
+ +
+ +
+ +
+ +
+ + + + + + + + +