Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -rd55428a1d82ca2bd213d694d3a5cb08a08890609 -r6dc5dd81f61c7d41ce4983cc23eda350305a346e --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision d55428a1d82ca2bd213d694d3a5cb08a08890609) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 6dc5dd81f61c7d41ce4983cc23eda350305a346e) @@ -653,8 +653,8 @@ */ private NodeKey processFile(MultipartFile file) { NodeKey node = null; - if ((file != null) && !StringUtils.isEmpty(file.getName())) { - String fileName = file.getName(); + if ((file != null) && !StringUtils.isEmpty(file.getOriginalFilename())) { + String fileName = file.getOriginalFilename(); try { node = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType()); } catch (InvalidParameterException e) { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java =================================================================== diff -u -rd55428a1d82ca2bd213d694d3a5cb08a08890609 -r6dc5dd81f61c7d41ce4983cc23eda350305a346e --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision d55428a1d82ca2bd213d694d3a5cb08a08890609) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision 6dc5dd81f61c7d41ce4983cc23eda350305a346e) @@ -117,14 +117,16 @@ // get parameters from Request ToolAccessMode mode = null; try { - mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, LearnerController.MODE_OPTIONAL); + mode = WebUtil.getToolAccessMode((String)request.getAttribute(AttributeNames.PARAM_MODE)); } catch (Exception e) { } if (mode == null) { mode = ToolAccessMode.LEARNER; } + + request.setAttribute("mode", mode); - Long sessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); + Long toolSessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); // get session from shared session. HttpSession ss = SessionManager.getSession(); @@ -139,19 +141,20 @@ } ToolContentManager contentManager = getContentManager(); - SubmitFilesSession session = submitFilesService.getSessionById(sessionID); + SubmitFilesSession session = submitFilesService.getSessionById(toolSessionID); SubmitFilesContent content = session.getContent(); // this must before getFileUploadByUser() method becuase getCurrentLearner() // will create session user if it does not exist. - SubmitUser learner = getCurrentLearner(sessionID, submitFilesService); - List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false); + SubmitUser learner = getCurrentLearner(toolSessionID, submitFilesService); + List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, toolSessionID, request.getLocale(), + false); // check whehter finish lock is on/off boolean lock = content.isLockOnFinished() && learner.isFinished(); sessionMap.put(AttributeNames.PARAM_MODE, mode); - sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID); + sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID); sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, lock); sessionMap.put(SbmtConstants.ATTR_LOCK_ON_FINISH, content.isLockOnFinished()); sessionMap.put(SbmtConstants.ATTR_USE_SEL_LEADER, content.isUseSelectLeaderToolOuput()); @@ -177,7 +180,7 @@ content.setDefineLater(false); submitFilesService.saveOrUpdateContent(content); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, + LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, applicationContext.getServletContext()); // check if there is submission deadline @@ -209,17 +212,17 @@ IEventNotificationService.DELIVERY_METHOD_MAIL); } - SortedMap submittedFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale()); + SortedMap submittedFilesMap = submitFilesService.getFilesUploadedBySession(toolSessionID, request.getLocale()); // support for leader select feature SubmitUser groupLeader = content.isUseSelectLeaderToolOuput() - ? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, new Long(sessionID).longValue()) + ? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, new Long(toolSessionID).longValue()) : null; if (content.isUseSelectLeaderToolOuput() && !mode.isTeacher()) { // forwards to the leaderSelection page if (groupLeader == null) { - List groupUsers = submitFilesService.getUsersBySession(new Long(sessionID).longValue()); + List groupUsers = submitFilesService.getUsersBySession(new Long(toolSessionID).longValue()); request.setAttribute(SbmtConstants.ATTR_GROUP_USERS, groupUsers); request.setAttribute(SbmtConstants.ATTR_SUBMIT_FILES, submittedFilesMap); request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader"); @@ -231,7 +234,7 @@ if (isNonLeader && !learner.isFinished()) { List filesUploadedByLeader = submitFilesService.getFilesUploadedByUser(groupLeader.getUserID(), - sessionID, request.getLocale(), false); + toolSessionID, request.getLocale(), false); if (filesUploadedByLeader == null) { request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, @@ -256,7 +259,7 @@ } sessionMap.put(SbmtConstants.ATTR_GROUP_LEADER, groupLeader); - boolean isUserLeader = submitFilesService.isUserGroupLeader(learner, sessionID); + boolean isUserLeader = submitFilesService.isUserGroupLeader(learner, toolSessionID); sessionMap.put(SbmtConstants.ATTR_IS_USER_LEADER, isUserLeader); boolean hasEditRight = !content.isUseSelectLeaderToolOuput() Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java =================================================================== diff -u -r9bd48180632126e711896a486782d581e2e78750 -r6dc5dd81f61c7d41ce4983cc23eda350305a346e --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision 9bd48180632126e711896a486782d581e2e78750) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision 6dc5dd81f61c7d41ce4983cc23eda350305a346e) @@ -32,7 +32,6 @@ import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.tool.sbmt.web.form.SubmitFilesPedagogicalPlannerForm; import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp =================================================================== diff -u -rd55428a1d82ca2bd213d694d3a5cb08a08890609 -r6dc5dd81f61c7d41ce4983cc23eda350305a346e --- lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision d55428a1d82ca2bd213d694d3a5cb08a08890609) +++ lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision 6dc5dd81f61c7d41ce4983cc23eda350305a346e) @@ -105,9 +105,10 @@ var answer = confirm(msg); if (answer) { $.ajax({ + url: '', data: 'detailId=' + detailId, success: function () { - document.location.href = "learning/"+${sessionMap.mode}+".do?toolSessionID="+${sessionMap.toolSessionID}; + document.location.href = "learning/${sessionMap.mode}.do?toolSessionID=${sessionMap.toolSessionID}"; }, error: function(error){ alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status); @@ -395,4 +396,4 @@ - + \ No newline at end of file Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp =================================================================== diff -u -rd55428a1d82ca2bd213d694d3a5cb08a08890609 -r6dc5dd81f61c7d41ce4983cc23eda350305a346e --- lams_tool_sbmt/web/monitoring/parts/activity.jsp (.../activity.jsp) (revision d55428a1d82ca2bd213d694d3a5cb08a08890609) +++ lams_tool_sbmt/web/monitoring/parts/activity.jsp (.../activity.jsp) (revision 6dc5dd81f61c7d41ce4983cc23eda350305a346e) @@ -27,7 +27,8 @@ - + +