Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java (.../SbmtConstants.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java (.../SbmtConstants.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -81,7 +81,7 @@ public static final String ATTR_LIMIT_UPLOAD_NUMBER = "limitUploadNumber"; - public static final Object ATTR_ARRIVE_LIMIT = "arriveLimit"; + public static final String ATTR_ARRIVE_LIMIT = "arriveLimit"; public static final String ATTR_USER_FINISHED = "userFinished"; Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7694dd245cc58c5b7beb2348aaefb2762c47dc8d refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java (.../ISubmissionDetailsDAO.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java (.../ISubmissionDetailsDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -28,8 +28,8 @@ import java.util.List; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.model.SubmissionDetails; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; /** * @author Manpreet Minhas Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java (.../ISubmitFilesContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java (.../ISubmitFilesContentDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -26,7 +26,7 @@ package org.lamsfoundation.lams.tool.sbmt.dao; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; /** * @author Manpreet Minhas Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java (.../ISubmitFilesReportDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java (.../ISubmitFilesReportDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -26,7 +26,7 @@ package org.lamsfoundation.lams.tool.sbmt.dao; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesReport; /** * @author Manpreet Minhas Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java (.../ISubmitFilesSessionDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java (.../ISubmitFilesSessionDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -28,7 +28,7 @@ import java.util.List; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; /** * @author Manpreet Minhas Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java (.../ISubmitUserDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java (.../ISubmitUserDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -29,8 +29,8 @@ import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; public interface ISubmitUserDAO extends IBaseDAO { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -28,9 +28,9 @@ import java.util.List; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmissionDetails; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; import org.springframework.stereotype.Repository; /** @@ -63,7 +63,7 @@ @Override public List getSubmissionDetailsBySession(Long sessionID) { if (sessionID != null) { - return getSessionFactory().getCurrentSession().createQuery(FIND_BY_SESSION) + return getSession().createQuery(FIND_BY_SESSION, SubmissionDetails.class) .setParameter("sessionID", sessionID.longValue()).list(); } return null; @@ -72,8 +72,6 @@ @Override @SuppressWarnings("unchecked") public List getBySessionAndLearner(Long sessionID, Integer userID) { - return (List) doFind(FIND_BY_SESSION_LEARNER, new Object[] { sessionID, userID }); - } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java (.../SubmitFilesContentDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java (.../SubmitFilesContentDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -26,8 +26,8 @@ package org.lamsfoundation.lams.tool.sbmt.dao.hibernate; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; import org.springframework.stereotype.Repository; /** @@ -36,22 +36,11 @@ @Repository public class SubmitFilesContentDAO extends LAMSBaseDAO implements ISubmitFilesContentDAO { - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO#getContentByID(java.lang.Long) - */ @Override public SubmitFilesContent getContentByID(Long contentID) { return (SubmitFilesContent) super.find(SubmitFilesContent.class, contentID); } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO#save(org.lamsfoundation.lams.tool.sbmt. - * SubmitFilesContent) - */ @Override public void saveOrUpdate(SubmitFilesContent content) { getSession().saveOrUpdate(content); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java (.../SubmitFilesReportDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java (.../SubmitFilesReportDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -28,8 +28,8 @@ import java.util.List; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesReport; import org.springframework.stereotype.Repository; /** @@ -41,21 +41,11 @@ private static final String FIND_BY_SUBMISSION = "from " + SubmitFilesReport.class.getName() + " where submission_id=?"; - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO#getReportByID(java.lang.Long) - */ @Override public SubmitFilesReport getReportByID(Long reportID) { return (SubmitFilesReport) super.find(SubmitFilesReport.class, reportID); } - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO#getReportBySubmissionID(java.lang.Long) - */ @Override public SubmitFilesReport getReportBySubmissionID(Long submissionID) { @@ -67,12 +57,6 @@ } } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO#updateReport(org.lamsfoundation.lams.tool.sbmt. - * SubmitFilesReport) - */ @Override public void updateReport(SubmitFilesReport report) { getSession().update(report); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -28,8 +28,8 @@ import java.util.List; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; import org.springframework.stereotype.Repository; /** @@ -41,23 +41,11 @@ private static final String FIND_LEARNER_BY_CONTENT_ID = " from " + SubmitFilesSession.class.getName() + " as session where session.content.contentID = :contentID"; - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO#getSessionByID(java.lang.Long) - */ @Override public SubmitFilesSession getSessionByID(Long sessionID) { return (SubmitFilesSession) super.find(SubmitFilesSession.class, sessionID); } - /* - * (non-Javadoc) - * - * @see - * org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO#createSession(org.lamsfoundation.lams.tool.sbmt. - * SubmitFilesSession) - */ @Override public void createSession(SubmitFilesSession submitSession) { getSession().save(submitSession); @@ -66,8 +54,8 @@ @Override public List getSubmitFilesSessionByContentID(Long contentID) { if (contentID != null) { - return getSessionFactory().getCurrentSession().createQuery(FIND_LEARNER_BY_CONTENT_ID) - .setParameter("contentID", contentID.longValue()).list(); + return getSession().createQuery(FIND_LEARNER_BY_CONTENT_ID, SubmitFilesSession.class) + .setParameter("contentID", contentID).list(); } return null; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java (.../SubmitUserDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java (.../SubmitUserDAO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -37,9 +37,9 @@ import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.sbmt.SbmtConstants; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitUserDAO; import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.stereotype.Repository; @@ -78,24 +78,19 @@ return (List) doFind(FIND_BY_SESSION_ID, sessionID); } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.sbmt.dao.ILearnerDAO#updateLearer(org.lamsfoundation.lams.tool.sbmt.Learner) - */ @Override public void saveOrUpdateUser(SubmitUser learner) { this.insertOrUpdate(learner); } - @Override - @SuppressWarnings("unchecked") /** * Will return List<[SubmitUser, Integer1, Integer2, String], [SubmitUser, Integer1, Integer2, String], ... , * [SubmitUser, Integer1, Integer2, String]> * where Integer1 is the number of files uploaded, Integer2 is the number of files marked * and String is the notebook entry. No notebook entries needed? Will return null in their place. */ + @Override + @SuppressWarnings("unchecked") public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService, IUserManagementService userManagementService) { @@ -160,7 +155,7 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); - NativeQuery query = getSession().createNativeQuery(queryText.toString()); + NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", SubmitUser.class) .addScalar("portraitId", IntegerType.INSTANCE) .addScalar("numFiles", IntegerType.INSTANCE).addScalar("numFilesRemoved", IntegerType.INSTANCE) @@ -189,7 +184,7 @@ "SELECT count(*) FROM tl_lasbmt11_user user WHERE user.session_id = :sessionId "); buildNameSearch(searchString, queryText); - List list = getSession().createSQLQuery(queryText.toString()).setParameter("sessionId", sessionId).list(); + List list = getSession().createNativeQuery(queryText.toString()).setParameter("sessionId", sessionId).list(); if (list == null || list.size() == 0) { return 0; } @@ -205,8 +200,7 @@ @Override @SuppressWarnings("unchecked") public List getStatisticsBySession(final Long contentId) { - - NativeQuery query = getSession().createNativeQuery(GET_STATISTICS); + NativeQuery query = getSession().createNativeQuery(GET_STATISTICS); query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE) .addScalar("totalUploadedFiles", IntegerType.INSTANCE).addScalar("markedCount", IntegerType.INSTANCE) .setParameter("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); @@ -228,8 +222,7 @@ @Override @SuppressWarnings("unchecked") public List getLeaderStatisticsBySession(final Long contentId) { - - NativeQuery query = getSession().createNativeQuery(GET_LEADER_STATISTICS); + NativeQuery query = getSession().createNativeQuery(GET_LEADER_STATISTICS); query.addScalar("sessionId", LongType.INSTANCE).addScalar("sessionName", StringType.INSTANCE) .addScalar("totalUploadedFiles", IntegerType.INSTANCE).addScalar("markedCount", IntegerType.INSTANCE) .setParameter("contentId", contentId).setResultTransformer(Transformers.aliasToBean(StatisticDTO.class)); @@ -252,14 +245,12 @@ @Override @SuppressWarnings("unchecked") public List getReportsForGroup(final Long sessionId, final Long reportId) { - - NativeQuery query = getSession().createNativeQuery(GET_GROUP_REPORTS); + NativeQuery query = getSession().createNativeQuery(GET_GROUP_REPORTS); query.addScalar("reportId", LongType.INSTANCE) .setParameter("sessionId", sessionId) .setParameter("reportId", reportId); return query.list(); - } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java (.../AuthoringDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java (.../AuthoringDTO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -29,7 +29,7 @@ import java.lang.reflect.InvocationTargetException; import org.apache.commons.beanutils.PropertyUtils; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; /** * Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java (.../FileDetailsDTO.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java (.../FileDetailsDTO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -30,9 +30,9 @@ import java.util.Date; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; +import org.lamsfoundation.lams.tool.sbmt.model.SubmissionDetails; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesReport; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.util.NumberUtil; /** Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java (.../SubmitUserDTO.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java (.../SubmitUserDTO.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -29,7 +29,7 @@ import java.util.Date; import java.util.List; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; /** * @author Manpreet Minhas Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmissionDetails.java (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -0,0 +1,251 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.sbmt.model; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.MapsId; +import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.Table; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; + +@Entity +@Table(name = "tl_lasbmt11_submission_details") +public class SubmissionDetails implements Serializable, Cloneable { + private static final long serialVersionUID = 5093528405144051727L; + private static Logger log = Logger.getLogger(SubmissionDetails.class); + + @Id + @Column(name = "submission_id",unique=true, nullable=false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long submissionID; + + @Column + private String filePath; + + @Column + private String fileDescription; + + @Column(name = "date_of_submission") + private Date dateOfSubmission; + + @Column + private Long uuid; + + @Column(name = "version_id") + private Long versionID; + + @Column(nullable = false) + private Boolean removed; + + @OneToOne(cascade = CascadeType.ALL) + @PrimaryKeyJoinColumn +// @PrimaryKeyJoinColumn(name="submission_id", referencedColumnName="report_id") + private SubmitFilesReport report; + + @ManyToOne + @JoinColumn(name = "learner_id") + private SubmitUser learner; + + /** persistent field, but not cloned to avoid to clone block */ + @ManyToOne + @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) + @JoinColumn(name = "session_id") + private SubmitFilesSession submitFileSession; + + /** default constructor */ + public SubmissionDetails() { + this.removed = Boolean.FALSE; + } + + @Override + public String toString() { + return new ToStringBuilder(this).append("submissionID", getSubmissionID()).append("filePath", getFilePath()) + .append("fileDescription", getFileDescription()).append("dateOfSubmission", getDateOfSubmission()) + .append("uuid", getUuid()).append("versionID", getVersionID()).append("report", getReport()).toString(); + } + + @Override + public boolean equals(Object other) { + if ((this == other)) { + return true; + } + if (!(other instanceof SubmissionDetails)) { + return false; + } + SubmissionDetails castOther = (SubmissionDetails) other; + return new EqualsBuilder().append(this.getSubmissionID(), castOther.getSubmissionID()) + .append(this.getFilePath(), castOther.getFilePath()) + .append(this.getFileDescription(), castOther.getFileDescription()) + .append(this.getDateOfSubmission(), castOther.getDateOfSubmission()) + .append(this.getUuid(), castOther.getUuid()).append(this.getVersionID(), castOther.getVersionID()) + .append(this.getReport(), castOther.getReport()).isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(getSubmissionID()).append(getFilePath()).append(getFileDescription()) + .append(getDateOfSubmission()).append(getUuid()).append(getVersionID()).append(getReport()) + .toHashCode(); + } + + @Override + public Object clone() { + Object obj = null; + try { + obj = super.clone(); + //never clone key! + ((SubmissionDetails) obj).setSubmissionID(null); + if (this.report != null) { + ((SubmissionDetails) obj).report = (SubmitFilesReport) this.report.clone(); + } + } catch (CloneNotSupportedException e) { + log.error("When clone " + SubmissionDetails.class + " failed"); + } + return obj; + } + + // *********************************************************** + // Get / Set methods + // *********************************************************** + + public Long getSubmissionID() { + return this.submissionID; + } + + public void setSubmissionID(Long submissionID) { + this.submissionID = submissionID; + } + + public String getFilePath() { + return this.filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getFileDescription() { + return this.fileDescription; + } + + public void setFileDescription(String fileDescription) { + this.fileDescription = fileDescription; + } + + public Date getDateOfSubmission() { + return this.dateOfSubmission; + } + + public void setDateOfSubmission(Date dateOfSubmission) { + this.dateOfSubmission = dateOfSubmission; + } + + public Long getUuid() { + return this.uuid; + } + + public void setUuid(Long uuid) { + this.uuid = uuid; + } + + public Long getVersionID() { + return this.versionID; + } + + public void setVersionID(Long versionID) { + this.versionID = versionID; + } + + /** + * @return Returns the report. + */ + public SubmitFilesReport getReport() { + return report; + } + + /** + * @param report + * The report to set. + */ + public void setReport(SubmitFilesReport report) { + this.report = report; + } + + /** + * @return Returns the submitFileSession. + */ + public SubmitFilesSession getSubmitFileSession() { + return submitFileSession; + } + + /** + * @param submitFileSession + * The submitFileSession to set. + */ + public void setSubmitFileSession(SubmitFilesSession submitFileSession) { + this.submitFileSession = submitFileSession; + } + + /** + * @return Returns the learner. + */ + public SubmitUser getLearner() { + return learner; + } + + /** + * @param learner + * The learner to set. + */ + public void setLearner(SubmitUser learner) { + this.learner = learner; + } + + public Boolean isRemoved() { + return removed; + } + + public void setRemoved(Boolean removed) { + this.removed = removed; + } + + +} Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -0,0 +1,322 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.sbmt.model; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; + +@Entity +@Table(name = "tl_lasbmt11_content") +public class SubmitFilesContent implements Serializable, Cloneable { + private static final long serialVersionUID = 9072799761861936838L; + private static Logger log = Logger.getLogger(SubmitFilesContent.class); + + @Id + @Column(name = "content_id") + private Long contentID; + + // basic tab fields + + @Column(nullable = false) + private String title; + + @Column(nullable = false) + private String instruction; + + // advance tab fields + + @Column(name = "lock_on_finished") + private boolean lockOnFinished; + + @Column(name = "mark_release_notify") + private boolean notifyLearnersOnMarkRelease; + + @Column(name = "file_submit_notify") + private boolean notifyTeachersOnFileSubmit; + + // system level fields + + @Column(name = "define_later") + private boolean defineLater; + + @Column(name = "content_in_use") + private boolean contentInUse; + + @Column(name = "use_select_leader_tool_ouput") + private boolean useSelectLeaderToolOuput; + + @Column(name = "limit_upload") + private boolean limitUpload; + + @Column(name = "limit_upload_number") + private int limitUploadNumber; + + @Column(name = "reflect_on_activity") + private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") + private String reflectInstructions; + + @Column + private Date created; + + @Column + private Date updated; + + @Column(name = "submission_deadline") + private Date submissionDeadline; + + @ManyToOne + @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) + @JoinColumn(name = "created_by") + private SubmitUser createdBy; + + /** + * Copy constructor to create a new SubmitFiles tool's content. + * + * @param content + * The original tool content + * @param newContentID + * The new SubmitFiles contentID + * @param toolContentHandler + * @return SubmitFilesContent The new SubmitFilesContent object + */ + public static SubmitFilesContent newInstance(SubmitFilesContent content, Long newContentID) { + SubmitFilesContent newContent = (SubmitFilesContent) content.clone(); + newContent.setContentID(newContentID); + return newContent; + } + + @Override + public String toString() { + return new ToStringBuilder(this).append("contentID", getContentID()).append("title", getTitle()) + .append("instructions", getInstruction()).toString(); + } + + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof SubmitFilesContent)) { + return false; + } + SubmitFilesContent castOther = (SubmitFilesContent) other; + return new EqualsBuilder().append(this.getContentID(), castOther.getContentID()) + .append(this.getTitle(), castOther.getTitle()).append(this.getInstruction(), castOther.getInstruction()) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(getContentID()).append(getTitle()).append(getInstruction()).toHashCode(); + } + + @Override + public Object clone() { + SubmitFilesContent content = null; + try { + content = (SubmitFilesContent) super.clone(); + // never clone key! + content.setContentID(null); + + // clone SubmitUser as well + if (createdBy != null) { + content.setCreatedBy((SubmitUser) createdBy.clone()); + } + } catch (CloneNotSupportedException e) { + SubmitFilesContent.log.error("When clone " + SubmitFilesContent.class + " failed"); + } + + return content; + } + + // *********************************************************** + // Get / Set methods + // *********************************************************** + + public Long getContentID() { + return contentID; + } + + public void setContentID(Long contentID) { + this.contentID = contentID; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getInstruction() { + return instruction; + } + + public void setInstruction(String instructions) { + instruction = instructions; + } + + public boolean isDefineLater() { + return defineLater; + } + + public void setDefineLater(boolean defineLater) { + this.defineLater = defineLater; + } + + /** + * @return Returns the contentInUse. + */ + public boolean isContentInUse() { + return contentInUse; + } + + /** + * @param contentInUse + * The contentInUse to set. + */ + public void setContentInUse(boolean contentInUse) { + this.contentInUse = contentInUse; + } + + /** + * @return Returns the lockOnFinished. + */ + public boolean isLockOnFinished() { + return lockOnFinished; + } + + /** + * @param lockOnFinished + * The lockOnFinished to set. + */ + public void setLockOnFinished(boolean lockOnFinished) { + this.lockOnFinished = lockOnFinished; + } + + public String getReflectInstructions() { + return reflectInstructions; + } + + public void setReflectInstructions(String reflectInstructions) { + this.reflectInstructions = reflectInstructions; + } + + public boolean isReflectOnActivity() { + return reflectOnActivity; + } + + public void setReflectOnActivity(boolean reflectOnActivity) { + this.reflectOnActivity = reflectOnActivity; + } + + public boolean isLimitUpload() { + return limitUpload; + } + + public void setLimitUpload(boolean limitUpload) { + this.limitUpload = limitUpload; + } + + public int getLimitUploadNumber() { + return limitUploadNumber; + } + + public void setLimitUploadNumber(int limitUploadNumber) { + this.limitUploadNumber = limitUploadNumber; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public SubmitUser getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(SubmitUser createdBy) { + this.createdBy = createdBy; + } + + public Date getUpdated() { + return updated; + } + + public void setUpdated(Date updated) { + this.updated = updated; + } + + public Date getSubmissionDeadline() { + return submissionDeadline; + } + + public void setSubmissionDeadline(Date submissionDeadline) { + this.submissionDeadline = submissionDeadline; + } + + public boolean isNotifyLearnersOnMarkRelease() { + return notifyLearnersOnMarkRelease; + } + + public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) { + this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease; + } + + public boolean isNotifyTeachersOnFileSubmit() { + return notifyTeachersOnFileSubmit; + } + + public void setNotifyTeachersOnFileSubmit(boolean notifyTeachersOnFileSubmit) { + this.notifyTeachersOnFileSubmit = notifyTeachersOnFileSubmit; + } + + public boolean isUseSelectLeaderToolOuput() { + return useSelectLeaderToolOuput; + } + + public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) { + this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; + } +} Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesReport.java =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesReport.java (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesReport.java (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -0,0 +1,190 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.sbmt.model; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Parameter; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.MapsId; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.log4j.Logger; +import org.hibernate.annotations.GenericGenerator; + +@Entity +@Table(name = "tl_lasbmt11_report") +public class SubmitFilesReport implements Serializable, Cloneable { + private static final long serialVersionUID = -3415065437595925246L; + private static Logger log = Logger.getLogger(SubmitFilesReport.class); + + @Id + @Column(name = "report_id") + private Long reportID; + + @MapsId + @OneToOne(mappedBy = "report") + @JoinColumn(name = "report_id") + private SubmissionDetails details; + + + +// @Id +// @GeneratedValue(generator="foreign") +// @GenericGenerator(name="foreign", strategy = "foreign", parameters={ +// @Parameter(name="property", value="person") +// }) +// @Column(name="report_id") + +// @Id +// @Column(name = "report_id") +// @GeneratedValue(strategy = GenerationType.IDENTITY) + + + + @Column + private String comments; + + @Column + private Float marks; + + @Column(name = "mark_file_uuid") + private Long markFileUUID; + + @Column(name = "mark_file_name") + private String markFileName; + + @Column(name = "mark_file_version_id") + private Long markFileVersionID; + + @Override + public String toString() { + return new ToStringBuilder(this).append("reportID", getReportID()).append("comments", getComments()) + .append("marks", getMarks()).toString(); + } + + @Override + public Object clone() { + + Object obj = null; + try { + obj = super.clone(); + //never clone key! + ((SubmitFilesReport) obj).setReportID(null); + } catch (CloneNotSupportedException e) { + log.error("When clone " + SubmitFilesReport.class + " failed"); + } + return obj; + } + + @Override + public boolean equals(Object other) { + if ((this == other)) { + return true; + } + if (!(other instanceof SubmitFilesReport)) { + return false; + } + SubmitFilesReport castOther = (SubmitFilesReport) other; + return new EqualsBuilder().append(this.getReportID(), castOther.getReportID()) + .append(this.getComments(), castOther.getComments()).append(this.getMarks(), castOther.getMarks()) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(getReportID()).append(getComments()).append(getMarks()).toHashCode(); + } + + // *********************************************************** + // Get / Set methods + // *********************************************************** + + public Long getReportID() { + return this.reportID; + } + + public void setReportID(Long reportID) { + this.reportID = reportID; + } + + public SubmissionDetails getDetails() { + return details; + } + + public void setDetails(SubmissionDetails details) { + this.details = details; + } + + public String getComments() { + return this.comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + public Float getMarks() { + return this.marks; + } + + public void setMarks(Float marks) { + this.marks = marks; + } + + public Long getMarkFileUUID() { + return markFileUUID; + } + + public void setMarkFileUUID(Long markFileUUID) { + this.markFileUUID = markFileUUID; + } + + public String getMarkFileName() { + return markFileName; + } + + public void setMarkFileName(String markFileName) { + this.markFileName = markFileName; + } + + public Long getMarkFileVersionID() { + return markFileVersionID; + } + + public void setMarkFileVersionID(Long markFileVersionID) { + this.markFileVersionID = markFileVersionID; + } +} Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesSession.java =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesSession.java (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesSession.java (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -0,0 +1,207 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.sbmt.model; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.log4j.Logger; + +@Entity +@Table(name = "tl_lasbmt11_session") +public class SubmitFilesSession implements Serializable, Cloneable { + private static final long serialVersionUID = 3399851325547422573L; + private static Logger log = Logger.getLogger(SubmitFilesSession.class); + + public final static int INCOMPLETE = 0; + public final static int COMPLETED = 1; + + @Id + @Column(name = "session_id") + private Long sessionID; + + @Column(name = "session_name") + private String sessionName; + + @Column + private Integer status; + + @Column(name = "marks_released") + private boolean marksReleased; + + @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "submitFileSession") + private Set submissionDetails = new HashSet<>(); + + /** persistent field, but not cloned to avoid to clone block */ + @ManyToOne + @JoinColumn(name = "content_id") + private SubmitFilesContent content; + + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "group_leader_uid") + private SubmitUser groupLeader; + + @Override + public String toString() { + return new ToStringBuilder(this).append("sessionID", getSessionID()).append("status", getStatus()).toString(); + } + + @Override + public boolean equals(Object other) { + if ((this == other)) { + return true; + } + if (!(other instanceof SubmitFilesSession)) { + return false; + } + SubmitFilesSession castOther = (SubmitFilesSession) other; + return new EqualsBuilder().append(this.getSessionID(), castOther.getSessionID()) + .append(this.getStatus(), castOther.getStatus()).isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(getSessionID()).append(getStatus()).toHashCode(); + } + + @Override + public Object clone() { + Object obj = null; + try { + obj = super.clone(); + //never clone key! + ((SubmitFilesSession) obj).setSessionID(null); + //clone SubmissionDetails object + if (submissionDetails != null) { + Iterator iter = submissionDetails.iterator(); + Set set = new HashSet<>(); + while (iter.hasNext()) { + set.add((SubmissionDetails) (iter.next()).clone()); + } + ((SubmitFilesSession) obj).submissionDetails = set; + } + + } catch (CloneNotSupportedException e) { + log.error("When clone " + SubmissionDetails.class + " failed"); + } + return obj; + } + + // *********************************************************** + // Get / Set methods + // *********************************************************** + + public Long getSessionID() { + return this.sessionID; + } + + public void setSessionID(Long sessionID) { + this.sessionID = sessionID; + } + + public Integer getStatus() { + return this.status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + + /** + * @return Returns the submissionDetails. + */ + public Set getSubmissionDetails() { + return submissionDetails; + } + + /** + * @param submissionDetails + * The submissionDetails to set. + */ + public void setSubmissionDetails(Set submissionDetails) { + this.submissionDetails = submissionDetails; + } + + /** + * @return Returns the content. + */ + public SubmitFilesContent getContent() { + return content; + } + + /** + * @param content + * The content to set. + */ + public void setContent(SubmitFilesContent content) { + this.content = content; + } + + /** + * @return Returns the session name. + */ + public String getSessionName() { + return sessionName; + } + + /** + * @param sessionName + * The session name to set. + */ + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } + + public SubmitUser getGroupLeader() { + return groupLeader; + } + + public void setGroupLeader(SubmitUser groupLeader) { + this.groupLeader = groupLeader; + } + + public boolean isMarksReleased() { + return marksReleased; + } + + public void setMarksReleased(boolean marksReleased) { + this.marksReleased = marksReleased; + } +} Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitUser.java =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitUser.java (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitUser.java (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -0,0 +1,186 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.sbmt.model; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.log4j.Logger; + +/** + * @author Steve.Ni + */ +@Entity +@Table(name = "tl_lasbmt11_user") +public class SubmitUser implements Serializable, Cloneable { + private static final long serialVersionUID = 4951104689120529660L; + private static Logger log = Logger.getLogger(SubmitUser.class); + + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long uid; + + @Column(name = "user_id") + private Integer userID; + + @Column(name = "first_name") + private String firstName; + + @Column(name = "last_name") + private String lastName; + + @Column(name = "login_name") + private String login; + + @Column(name = "session_id") + private Long sessionID; + + @Column(name = "content_id") + private Long contentID; + + @Column + private boolean finished; + + @Override + public Object clone() { + SubmitUser user = null; + try { + user = (SubmitUser) super.clone(); + user.setUid(null); + // never clone session + user.setSessionID(null); + } catch (CloneNotSupportedException e) { + log.error("When clone " + SubmitUser.class + " failed"); + } + return user; + } + + // *********************************************************** + // Get / Set methods + // *********************************************************** + + /** + * @return Returns the learnerID. + */ + public Long getUid() { + return uid; + } + + /** + * @param learnerID + * The learnerID to set. + */ + public void setUid(Long uid) { + this.uid = uid; + } + + /** + * @return Returns the userID. + */ + public Integer getUserID() { + return userID; + } + + /** + * @param userID + * The userID to set. + */ + public void setUserID(Integer userID) { + this.userID = userID; + } + + /** + * @return Returns the finished. + */ + public boolean isFinished() { + return finished; + } + + /** + * @param finished + * The finished to set. + */ + public void setFinished(boolean finished) { + this.finished = finished; + } + + /** + * @return Returns the sessionID. + */ + public Long getSessionID() { + return sessionID; + } + + /** + * @param sessionID + * The sessionID to set. + */ + public void setSessionID(Long sessionID) { + this.sessionID = sessionID; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLogin() { + return login; + } + + public void setLogin(String loginName) { + this.login = loginName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String secondName) { + this.lastName = secondName; + } + + public Long getContentID() { + return contentID; + } + + public void setContentID(Long contentID) { + this.contentID = contentID; + } + + public String getFullName() { + return new StringBuilder(getLastName()).append(" ").append(getFirstName()).toString(); + } +} Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -31,14 +31,14 @@ import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; -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.model.SubmissionDetails; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesReport; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.util.SubmitFilesException; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.springframework.web.multipart.MultipartFile; @@ -214,7 +214,7 @@ * @return a list of SubmitFileSession */ // public List getSubmitFilesSessionsByContentID(Long contentID); - public List getSubmitFilesSessionByContentID(Long contentID); + public List getSubmitFilesSessionByContentID(Long contentID); /** * Save or update tool content into database. Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java (.../SubmitFilesImportContentVersionFilter.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java (.../SubmitFilesImportContentVersionFilter.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.sbmt.service; import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; /** * Import filter class for different version of SubmitFiles content. Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java (.../SubmitFilesOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java (.../SubmitFilesOutputFactory.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -41,14 +41,11 @@ public class SubmitFilesOutputFactory extends OutputFactory { - /** - * {@inheritDoc} - */ @Override public SortedMap getToolOutputDefinitions(Object toolContentObject, int definitionType) throws ToolException { TreeMap definitionMap = new TreeMap(); - Class arrayOfSimpleUrlArrayClass = SimpleURL[][].class; + Class arrayOfSimpleUrlArrayClass = SimpleURL[][].class; switch (definitionType) { case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION: break; @@ -63,7 +60,6 @@ /** * Follows {@link PixlrService#getToolOutput(List, Long, Long)}. - * */ public SortedMap getToolOutput(List names, ISubmitFilesService submitFilesService, Long toolSessionId, Long learnerId) { @@ -90,7 +86,6 @@ } return outputs; - } public ToolOutput getToolOutput(String name, ISubmitFilesService submitFilesService, Long toolSessionId, Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -66,11 +66,6 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.sbmt.SbmtConstants; -import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO; @@ -79,6 +74,11 @@ 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.model.SubmissionDetails; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesReport; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.util.SubmitFilesException; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; @@ -282,6 +282,7 @@ SubmitFilesReport userreport = usersubmission.getReport(); if (userreport == null) { userreport = new SubmitFilesReport(); + userreport.setDetails(usersubmission); usersubmission.setReport(userreport); } userreport.setComments(leaderReport.getComments()); @@ -438,7 +439,7 @@ submitSession.setSessionID(toolSessionId); submitSession.setSessionName(toolSessionName); - submitSession.setStatus(new Integer(SubmitFilesSession.INCOMPLETE)); + submitSession.setStatus(SubmitFilesSession.INCOMPLETE); submitSession.setContent(submitContent); submitFilesSessionDAO.createSession(submitSession); log.debug("Submit File session created"); @@ -462,7 +463,7 @@ SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(toolSessionId); if (session != null) { - session.setStatus(new Integer(SubmitFilesSession.COMPLETED)); + session.setStatus(SubmitFilesSession.COMPLETED); submitFilesSessionDAO.update(session); } else { log.error("Fail to leave tool Session.Could not find submit file " + "session by given session id: " @@ -479,7 +480,7 @@ } @Override - public ToolSessionExportOutputData exportToolSession(List toolSessionIds) { + public ToolSessionExportOutputData exportToolSession(List toolSessionIds) { return null; } @@ -500,11 +501,11 @@ } private void removeToolSession(SubmitFilesSession session) { - Set filesUploaded = session.getSubmissionDetails(); + Set filesUploaded = session.getSubmissionDetails(); if (filesUploaded != null) { - Iterator fileIterator = filesUploaded.iterator(); + IteratorfileIterator = filesUploaded.iterator(); while (fileIterator.hasNext()) { - SubmissionDetails details = (SubmissionDetails) fileIterator.next(); + SubmissionDetails details = fileIterator.next(); try { sbmtToolContentHandler.deleteFile(details.getUuid()); } catch (RepositoryCheckedException e) { @@ -566,11 +567,12 @@ details.setUuid(nodeKey.getUuid()); details.setVersionID(nodeKey.getVersion()); SubmitFilesReport report = new SubmitFilesReport(); + report.setDetails(details); details.setReport(report); details.setSubmitFileSession(session); // update session, then insert the detail too. - Set detailSet = session.getSubmissionDetails(); + Set detailSet = session.getSubmissionDetails(); detailSet.add(details); session.setSubmissionDetails(detailSet); submissionDetailsDAO.saveOrUpdate(session); @@ -821,7 +823,7 @@ // push outputs to gradebook for (Integer userId : userIdToTotalMarkMap.keySet()) { Double userTotalMark = userIdToTotalMarkMap.get(userId) == null ? null - : new Double(userIdToTotalMarkMap.get(userId)); + : userIdToTotalMarkMap.get(userId).doubleValue(); toolService.updateActivityMark(userTotalMark, null, userId, sessionID, false); } } @@ -995,8 +997,7 @@ @Override public Long getToolDefaultContentIdBySignature(String toolSignature) { - Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + Long contentId = toolService.getToolDefaultContentIdBySignature(toolSignature); if (contentId == null) { String error = "Could not retrieve default content id for this tool"; log.error(error); @@ -1034,12 +1035,12 @@ } @Override - public List getSubmitFilesSessionByContentID(Long contentID) { - List learners = submitFilesSessionDAO.getSubmitFilesSessionByContentID(contentID); - if (learners == null) { - learners = new ArrayList(); // return sized 0 list rather than null value + public List getSubmitFilesSessionByContentID(Long contentID) { + List sessions = submitFilesSessionDAO.getSubmitFilesSessionByContentID(contentID); + if (sessions == null) { + sessions = new ArrayList<>(); // return sized 0 list rather than null value } - return learners; + return sessions; } @Override @@ -1242,7 +1243,7 @@ } @Override - public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getSubmitFilesOutputFactory().getSupportedDefinitionClasses(definitionType); } @@ -1346,8 +1347,8 @@ 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(); +// String userName = leaderDto.getLogin(); +// String fullName = leaderDto.getFirstName() + " " + leaderDto.getLastName(); // leader = new SubmitUser(leaderDto.getUserDTO(), submitFileSession); leader = new SubmitUser(); leader.setLogin(leaderDto.getLogin()); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -31,10 +31,9 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.tool.sbmt.web.form.AuthoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -57,7 +56,6 @@ @Controller @RequestMapping("/authoring") public class AuthoringController { - private Logger log = Logger.getLogger(AuthoringController.class); @Autowired private ISubmitFilesService submitFilesService; @@ -78,7 +76,7 @@ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); sessionMap.put(AttributeNames.PARAM_MODE, mode); - Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); // get back the upload file list and display them on page @@ -109,6 +107,7 @@ /** * Update all content for submit tool except online/offline instruction files list. */ + @SuppressWarnings("unchecked") @RequestMapping("/updateContent") public String updateContent(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ClearSessionController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ClearSessionController.java (.../ClearSessionController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ClearSessionController.java (.../ClearSessionController.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -43,8 +43,6 @@ * This class give a chance to clear HttpSession when user save/close authoring page. * * @author Steve.Ni - * - * @version $Revision$ */ @Controller public class ClearSessionController extends LamsAuthoringFinishController implements SbmtConstants { @@ -62,7 +60,7 @@ public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) { session.removeAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG); if (mode.isAuthor()) { - ClearSessionController.logger.debug("In Author mode"); + logger.debug("In Author mode"); session.removeAttribute(customiseSessionID); } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -45,11 +45,11 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.sbmt.SbmtConstants; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.tool.sbmt.util.SubmitFilesException; import org.lamsfoundation.lams.tool.sbmt.web.form.LearnerForm; @@ -82,7 +82,6 @@ @Controller @RequestMapping("/learning") public class LearnerController implements SbmtConstants { - public static Logger logger = Logger.getLogger(LearnerController.class); @Autowired @@ -101,7 +100,7 @@ @RequestMapping("/learner") public String learner(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) { // initial session Map - SessionMap sessionMap = new SessionMap(); + SessionMap sessionMap = new SessionMap(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); @@ -116,10 +115,9 @@ if (mode == null) { mode = ToolAccessMode.LEARNER; } - request.setAttribute("mode", mode); - Long toolSessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); + Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); // get session from shared session. HttpSession ss = SessionManager.getSession(); @@ -139,8 +137,8 @@ // this must before getFileUploadByUser() method becuase getCurrentLearner() // will create session user if it does not exist. SubmitUser learner = getCurrentLearner(toolSessionID, submitFilesService); - List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, toolSessionID, request.getLocale(), - false); + List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, toolSessionID, + request.getLocale(), false); // check whehter finish lock is on/off boolean lock = content.isLockOnFinished() && learner.isFinished(); @@ -205,17 +203,18 @@ IEventNotificationService.DELIVERY_METHOD_MAIL); } - SortedMap submittedFilesMap = submitFilesService.getFilesUploadedBySession(toolSessionID, request.getLocale()); + SortedMap> submittedFilesMap = submitFilesService + .getFilesUploadedBySession(toolSessionID, request.getLocale()); // support for leader select feature SubmitUser groupLeader = content.isUseSelectLeaderToolOuput() - ? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, new Long(toolSessionID).longValue()) + ? submitFilesService.checkLeaderSelectToolForSessionLeader(learner, toolSessionID) : null; if (content.isUseSelectLeaderToolOuput() && !mode.isTeacher()) { // forwards to the leaderSelection page if (groupLeader == null) { - List groupUsers = submitFilesService.getUsersBySession(new Long(toolSessionID).longValue()); + List groupUsers = submitFilesService.getUsersBySession(toolSessionID); 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"); @@ -226,8 +225,8 @@ boolean isNonLeader = !userID.equals(groupLeader.getUserID()); if (isNonLeader && !learner.isFinished()) { - List filesUploadedByLeader = submitFilesService.getFilesUploadedByUser(groupLeader.getUserID(), - toolSessionID, request.getLocale(), false); + List filesUploadedByLeader = submitFilesService + .getFilesUploadedByUser(groupLeader.getUserID(), toolSessionID, request.getLocale(), false); if (filesUploadedByLeader == null) { request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, @@ -282,7 +281,7 @@ @RequestMapping("/refresh") public String refresh(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) { String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); learnerForm.setSessionMapID(sessionMap.getSessionID()); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID); @@ -293,7 +292,8 @@ Integer userID = user.getUserID(); Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), false); + List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, + request.getLocale(), false); SubmitUser learner = getCurrentLearner(sessionID, submitFilesService); ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); setLearnerDTO(request, sessionMap, learner, filesUploaded, mode); @@ -309,9 +309,8 @@ */ @RequestMapping("/uploadFile") public String uploadFile(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) { - String sessionMapID = learnerForm.getSessionMapID(); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); request.setAttribute("sessionMapID", sessionMapID); // set the mode into http session @@ -368,9 +367,8 @@ */ @RequestMapping("/finish") public String finish(HttpServletRequest request, HttpServletResponse response) { - String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); @@ -422,11 +420,11 @@ } if (learnerForm.getFile() != null) { - LearnerController.logger.debug("Learner submit file : " + learnerForm.getFile().getName()); + logger.debug("Learner submit file : " + learnerForm.getFile().getName()); } if (learnerForm.getFile() != null && FileUtil.isExecutableFile(learnerForm.getFile().getName())) { - LearnerController.logger.debug("File is executatable : " + learnerForm.getFile().getName()); + logger.debug("File is executatable : " + learnerForm.getFile().getName()); errorMap.add("GLOBAL", messageService.getMessage("error.attachment.executable")); } @@ -442,16 +440,16 @@ * Set information into learner DTO object for page display. Fill file list uploaded by the special user into web * form. Remove the unauthorized mark and comments. */ - private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser, - List filesUploaded, ToolAccessMode mode) { + private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser, + List filesUploaded, ToolAccessMode mode) { SubmitUserDTO dto = new SubmitUserDTO(currUser); if (currUser != null) { // if Monitoring does not release marks, then skip this mark and comment content. if (filesUploaded != null) { - Iterator iter = filesUploaded.iterator(); + Iterator iter = filesUploaded.iterator(); while (iter.hasNext()) { - FileDetailsDTO filedto = (FileDetailsDTO) iter.next(); + FileDetailsDTO filedto = iter.next(); if (mode.isTeacher() || currUser.getUid().equals(filedto.getOwner().getUserUid())) { filedto.setCurrentLearner(true); } else { @@ -470,15 +468,14 @@ int limit = (Integer) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER); int limitUploadLeft = 0; if (limit <= filesUploaded.size()) { - sessionMap.put(SbmtConstants.ATTR_ARRIVE_LIMIT, true); + sessionMap.put(SbmtConstants.ATTR_ARRIVE_LIMIT, Boolean.TRUE); } else { limitUploadLeft = limit - filesUploaded.size(); } dto.setLimitUploadLeft(limitUploadLeft); } // retrieve notebook reflection entry. - NotebookEntry notebookEntry = submitFilesService.getEntry( (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID), CoreNotebookConstants.NOTEBOOK_TOOL, SbmtConstants.TOOL_SIGNATURE, currUser.getUserID()); @@ -508,8 +505,6 @@ @RequestMapping("/deleteLearnerFile") public void deleteLearnerFile(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - HttpSession ss = SessionManager.getSession(); - UserDTO currentUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); Long detailID = WebUtil.readLongParam(request, "detailId"); @@ -551,7 +546,7 @@ // get the existing reflection entry - SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID); Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID); NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, SbmtConstants.TOOL_SIGNATURE, user.getUserID()); @@ -574,7 +569,7 @@ String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // check for existing notebook entry @@ -597,14 +592,15 @@ public static void validateBeforeFinish(HttpServletRequest request, ISubmitFilesService submitFilesService) { String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + 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(); MultiValueMap errorMap = new LinkedMultiValueMap<>(); - List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale(), false); + List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale(), + false); int minUpload = (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD); if (minUpload > 0) { errorMap.add("GLOBAL", messageService.getMessage("error.learning.minimum.upload.number.less")); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java (.../MarkController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java (.../MarkController.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -81,7 +81,7 @@ String comments = WebUtil.readStrParam(request, "comments", true); if (!errorMap.isEmpty()) { - 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); @@ -161,7 +161,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()); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -30,6 +30,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.SortedMap; import java.util.SortedSet; import java.util.TimeZone; import java.util.TreeSet; @@ -45,15 +46,15 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.lamsfoundation.lams.tool.sbmt.SbmtConstants; -import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO; import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO; import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO; import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO; +import org.lamsfoundation.lams.tool.sbmt.model.SubmissionDetails; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.DateUtil; @@ -122,12 +123,13 @@ @RequestMapping("/monitoring") public String unspecified(HttpServletRequest request) { String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, contentID); - List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID); + List submitFilesSessionList = submitFilesService + .getSubmitFilesSessionByContentID(contentID); summary(request, submitFilesSessionList); statistic(request, contentID); @@ -164,7 +166,7 @@ @ResponseBody public String getUsers(HttpServletRequest request, HttpServletResponse response) { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); // paging parameters of tablesorter @@ -242,7 +244,7 @@ @RequestMapping("/doStatistic") public String doStatistic(HttpServletRequest request) { - Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); statistic(request, contentID); request.setAttribute(SbmtConstants.ATTR_IS_GROUPED_ACTIVITY, submitFilesService.isGroupedActivity(contentID)); return "monitoring/parts/statisticpart"; @@ -268,7 +270,7 @@ public void releaseMarks(HttpServletRequest request, HttpServletResponse response) { // get service then update report table - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); submitFilesService.releaseMarksForSession(sessionID); } @@ -278,9 +280,10 @@ @RequestMapping("/downloadMarks") public void downloadMarks(HttpServletRequest request, HttpServletResponse response) { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); // return FileDetailsDTO list according to the given sessionID - Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale()); + SortedMap> userFilesMap = submitFilesService + .getFilesUploadedBySession(sessionID, request.getLocale()); // construct Excel file format and download MultiValueMap errorMap = new LinkedMultiValueMap<>(); try { @@ -291,8 +294,8 @@ HSSFRow row; HSSFCell cell; - Iterator iter = userFilesMap.values().iterator(); - Iterator dtoIter; + Iterator> iter = userFilesMap.values().iterator(); + Iterator dtoIter; int idx = 0; @@ -310,11 +313,11 @@ cell.setCellValue(messageService.getMessage("label.learner.comments")); while (iter.hasNext()) { - List list = (List) iter.next(); + List list = iter.next(); dtoIter = list.iterator(); while (dtoIter.hasNext()) { - FileDetailsDTO dto = (FileDetailsDTO) dtoIter.next(); + FileDetailsDTO dto = dtoIter.next(); if (!dto.isRemoved()) { row = sheet.createRow(idx++); @@ -413,12 +416,13 @@ */ @RequestMapping("/listMark") public String listMark(HttpServletRequest request) { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); SubmitFilesSession session = submitFilesService.getSessionById(sessionID); Integer userID = WebUtil.readIntParam(request, "userID"); // return FileDetailsDTO list according to the given userID and sessionID - List files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), true); + List files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale(), + true); request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID); request.setAttribute(SbmtConstants.ATTR_IS_MARKS_RELEASED, session.isMarksReleased()); @@ -432,7 +436,7 @@ @RequestMapping("/listAllMarks") public String listAllMarks(HttpServletRequest request) { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); SubmitFilesSession session = submitFilesService.getSessionById(sessionID); // return FileDetailsDTO list according to the given sessionID @@ -510,7 +514,8 @@ } } - List files = submitFilesService.getFilesUploadedByUser(learnerUserID, sessionID, request.getLocale(), true); + List files = submitFilesService.getFilesUploadedByUser(learnerUserID, sessionID, + request.getLocale(), true); request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID); request.setAttribute("report", files); @@ -559,14 +564,14 @@ /** * Save Summary information into HttpRequest. */ - private void summary(HttpServletRequest request, List submitFilesSessionList) { + private void summary(HttpServletRequest request, List submitFilesSessionList) { SortedSet sessions = new TreeSet<>(this.new SessionComparator()); // build a map with all users in the submitFilesSessionList - Iterator it = submitFilesSessionList.iterator(); + Iterator it = submitFilesSessionList.iterator(); while (it.hasNext()) { SessionDTO sessionDto = new SessionDTO(); - SubmitFilesSession sfs = (SubmitFilesSession) it.next(); + SubmitFilesSession sfs = it.next(); Long sessionID = sfs.getSessionID(); sessionDto.setSessionID(sessionID); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -25,22 +25,19 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; 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.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @Controller @RequestMapping("/pedagogicalPlanner") public class SubmitFilesPedagogicalPlannerController { - private static Logger logger = Logger.getLogger(SubmitFilesPedagogicalPlannerController.class); @Autowired private ISubmitFilesService submitFilesService; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java (.../AuthoringForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java (.../AuthoringForm.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -2,12 +2,10 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; /** - * * @author Dapeng.Ni - * */ public class AuthoringForm { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/LearnerForm.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/LearnerForm.java (.../LearnerForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/LearnerForm.java (.../LearnerForm.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -3,10 +3,7 @@ import org.springframework.web.multipart.MultipartFile; /** - * * Learner Form. - * - * */ public class LearnerForm { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/MarkForm.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/MarkForm.java (.../MarkForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/MarkForm.java (.../MarkForm.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -26,13 +26,9 @@ /** * @author lfoxton - * - * */ public class MarkForm { - private static final long serialVersionUID = -8680214759155659983L; - private Long toolSessionID; private Integer userID; private Long detailID; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/ReflectionForm.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -23,17 +23,10 @@ package org.lamsfoundation.lams.tool.sbmt.web.form; -import org.apache.log4j.Logger; - /** - * * Reflection Form. - * - * */ public class ReflectionForm { - private static final long serialVersionUID = -9054365604649146735L; - private static Logger logger = Logger.getLogger(ReflectionForm.class.getName()); private Integer userID; private String sessionMapID; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java (.../SubmitFilesPedagogicalPlannerForm.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java (.../SubmitFilesPedagogicalPlannerForm.java) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -23,7 +23,7 @@ package org.lamsfoundation.lams.tool.sbmt.web.form; import org.lamsfoundation.lams.planner.PedagogicalPlannerActivitySpringForm; -import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; +import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; public class SubmitFilesPedagogicalPlannerForm extends PedagogicalPlannerActivitySpringForm { String instruction; Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7694dd245cc58c5b7beb2348aaefb2762c47dc8d --- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp (.../allmarks.jsp) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp (.../allmarks.jsp) (revision 7694dd245cc58c5b7beb2348aaefb2762c47dc8d) @@ -22,7 +22,7 @@ //constants for marks.js var LABEL_DELETE = ''; var LABEL_RESTORE = ''; - var MONITOR_URL = ""; + var MONITOR_URL = ""; function updateMark(detailId,reportId,sessionId,userId){ location.href="mark/newMark.do?updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;