Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java =================================================================== diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java (.../ISubmissionDetailsDAO.java) (revision 1688016bbb43db756bca9b93361c2a3833089d12) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java (.../ISubmissionDetailsDAO.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -59,7 +59,7 @@ * @param sessionID * @return */ - public List getSubmissionDetailsBySession(Long sessionID); + public List getSubmissionDetailsBySession(Long sessionID); public List getBySessionAndLearner(Long sessionID, Integer userID); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java =================================================================== diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision 1688016bbb43db756bca9b93361c2a3833089d12) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -44,22 +44,11 @@ private static final String FIND_BY_SESSION_LEARNER = "from " + SubmissionDetails.class.getName() + " as d where d.submitFileSession.sessionID=? and d.learner.userID=?"; - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO#getSubmissionDetailsByID(java.lang.Long) - */ @Override public SubmissionDetails getSubmissionDetailsByID(Long submissionID) { return (SubmissionDetails) getSession().get(SubmissionDetails.class, submissionID); } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO#saveOrUpdate(org.lamsfoundation.lams.tool.sbmt. - * SubmitFilesSession) - */ @Override public void saveOrUpdate(SubmitFilesSession session) { getSession().saveOrUpdate(session); @@ -71,13 +60,8 @@ getSession().save(submissionDetails); } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO#getSubmissionDetailsBySession(java.lang.Long) - */ @Override - public List getSubmissionDetailsBySession(Long sessionID) { + public List getSubmissionDetailsBySession(Long sessionID) { if (sessionID != null) { return getSessionFactory().getCurrentSession().createQuery(FIND_BY_SESSION) .setLong(0, sessionID.longValue()).list(); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== diff -u -r309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -42,6 +42,7 @@ import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO; +import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO; import org.lamsfoundation.lams.tool.sbmt.util.SubmitFilesException; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -114,7 +115,7 @@ * Should files removed in monitor be included. * @return List The list of required objects. */ - public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale, boolean includeRemovedFiles); + public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale, boolean includeRemovedFiles); /** * This method returns a SortedMap of all files that were submitted users within a given sessionID. @@ -123,7 +124,8 @@ * The session_id to be looked up * @return SortedMap, the key is UserDTO, the value is a List of FileDetailsDTO objects */ - public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale); + public SortedMap> getFilesUploadedBySession(Long sessionID, + Locale currentLocale); /** * Updates the marks for a file, and also allows a file to be uploaded @@ -175,9 +177,8 @@ * Release marks and comments information to learners, for a special session. * * @param sessionID - * @return success return true, otherwise return false. */ - public boolean releaseMarksForSession(Long sessionID); + public void releaseMarksForSession(Long sessionID); public void deleteFromRepository(Long uuid, Long versionID); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java (.../ClearSessionAction.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java (.../ClearSessionAction.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -33,8 +33,6 @@ * This class give a chance to clear HttpSession when user save/close authoring page. * * @author Steve.Ni - * - * @version $Revision$ */ public class ClearSessionAction extends LamsAuthoringFinishAction { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java =================================================================== diff -u -r309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java (.../MarkAction.java) (revision 309d4e79cd4ea1ee0b3e4cf0e070dd5243e73203) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java (.../MarkAction.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -39,6 +39,7 @@ import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; +import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO; import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy; import org.lamsfoundation.lams.tool.sbmt.web.form.MarkForm; @@ -49,35 +50,18 @@ /** * @author lfoxton - * - * - * - * - * - * - * - * - * */ public class MarkAction extends LamsDispatchAction { private ISubmitFilesService submitFilesService; /** * Update mark. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws RepositoryCheckedException - * @throws InvalidParameterException */ public ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws InvalidParameterException, RepositoryCheckedException { - MarkForm markForm = (MarkForm) form; + getSubmitFilesService(); ActionMessages errors = new ActionMessages(); // Check whether the mark is valid. @@ -91,8 +75,7 @@ String comments = WebUtil.readStrParam(request, "comments", true); if (!errors.isEmpty()) { - submitFilesService = getSubmitFilesService(); - List report = new ArrayList(); + List report = new ArrayList(); FileDetailsDTO fileDetail = submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale()); // echo back the input, even they are wrong. fileDetail.setComments(comments); @@ -106,35 +89,27 @@ return mapping.findForward("updateMark"); } - if (submitFilesService == null) { - submitFilesService = getSubmitFilesService(); - } - // Update the mark based on the form - submitFilesService.updateMarks(markForm.getReportID(), marks, comments, markForm.getMarkFile(),markForm.getToolSessionID()); - + submitFilesService.updateMarks(markForm.getReportID(), marks, comments, markForm.getMarkFile(), + markForm.getToolSessionID()); + // Return to the appropriate screen based upon the updateMode request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, markForm.getToolSessionID()); if (StringUtils.equals(markForm.getUpdateMode(), "listMark")) { - List report = submitFilesService.getFilesUploadedByUser(markForm.getUserID(), markForm.getToolSessionID(), - request.getLocale(), true); + List report = submitFilesService.getFilesUploadedByUser(markForm.getUserID(), + markForm.getToolSessionID(), request.getLocale(), true); request.setAttribute("report", report); return mapping.findForward("listMark"); } else { - Map report = submitFilesService.getFilesUploadedBySession(markForm.getToolSessionID(), request.getLocale()); + Map> report = submitFilesService + .getFilesUploadedBySession(markForm.getToolSessionID(), request.getLocale()); request.setAttribute("reports", report); return mapping.findForward("listAllMarks"); } } /** * Display update mark initial page. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ public ActionForward newMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { @@ -148,7 +123,7 @@ FileDetailsDTO fileDetailsDTO = submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale()); updateMarkForm(markForm, fileDetailsDTO); - List report = new ArrayList(); + List report = new ArrayList(); report.add(submitFilesService.getFileDetails(markForm.getDetailID(), request.getLocale())); request.setAttribute("updateMode", markForm.getUpdateMode()); @@ -160,9 +135,6 @@ /** * Update the form - * - * @param markForm - * @param fileDetailsDTO */ private void updateMarkForm(MarkForm markForm, FileDetailsDTO fileDetailsDTO) { @@ -177,12 +149,6 @@ /** * Remove a mark file - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ public ActionForward removeMarkFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java (.../ReflectAction.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java (.../ReflectAction.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -1,7 +1,6 @@ package org.lamsfoundation.lams.tool.sbmt.web.action; import java.util.Date; -import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,9 +26,7 @@ import org.lamsfoundation.lams.web.util.SessionMap; /** - * * @author steven - * */ public class ReflectAction extends Action { @@ -51,12 +48,6 @@ /** * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ public ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { @@ -96,12 +87,6 @@ /** * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ public ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { @@ -148,13 +133,7 @@ ActionErrors errors = new ActionErrors(); String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Integer userID = user.getUserID(); - - List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale(), false); int minUpload = (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD); if (minUpload > 0) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.learning.minimum.upload.number.less")); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java (.../SubmitFilesPedagogicalPlannerAction.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java (.../SubmitFilesPedagogicalPlannerAction.java) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -45,13 +45,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; /** - * @author - * @version - * - * - * - * - * */ public class SubmitFilesPedagogicalPlannerAction extends LamsDispatchAction { Index: lams_tool_sbmt/web/monitoring/monitoring.jsp =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -ra4e51b53558198aa759795a1d5268bd99dd119c4 --- lams_tool_sbmt/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision a4e51b53558198aa759795a1d5268bd99dd119c4) @@ -68,7 +68,6 @@ -