Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -41,8 +41,8 @@ /** * @author Ozgur Demirtas * - * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code - * Templates + * TODO To change the template for this generated type comment go to Window - + * Preferences - Java - Code Style - Code Templates */ public class QaContentDAO extends HibernateDaoSupport implements IQaContentDAO { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java =================================================================== diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java (.../QaQueContentDAO.java) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java (.../QaQueContentDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -37,8 +37,8 @@ /** * @author Ozgur Demirtas * - * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code - * Templates + * TODO To change the template for this generated type comment go to Window - + * Preferences - Java - Code Style - Code Templates */ public class QaQueContentDAO extends HibernateDaoSupport implements IQaQueContentDAO { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -35,138 +35,106 @@ import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - - /** - * @author Ozgur Demirtas - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates + * @author Ozgur Demirtas fixed by lfoxton + * + * TODO To change the template for this generated type comment go to Window - + * Preferences - Java - Code Style - Code Templates */ public class QaQueUsrDAO extends HibernateDaoSupport implements IQaQueUsrDAO { - static Logger logger = Logger.getLogger(QaQueUsrDAO.class.getName()); - - private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSessionId= :qaSession"; - private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where qaQueUsr.qaSessionId= :qaSessionId"; - - public QaQueUsr getQaUserByUID(Long uid) - { - return (QaQueUsr) this.getHibernateTemplate() - .get(QaQueUsr.class, uid); - } + static Logger logger = Logger.getLogger(QaQueUsrDAO.class.getName()); - - public int countSessionUser(QaSession qaSession) - { - return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_USER, - "qaSession", - qaSession)).size(); - } - + private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSessionId= :qaSession"; + private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where qaQueUsr.qaSessionId= :qaSessionId"; - public QaQueUsr getQaQueUsrById(long qaQueUsrId) - { - String query = "from QaQueUsr user where user.queUsrId=?"; - - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(query) - .setLong(0,qaQueUsrId) - .list(); - - if(list != null && list.size() > 0){ - QaQueUsr qu = (QaQueUsr) list.get(0); - return qu; - } - return null; - } + public QaQueUsr getQaUserByUID(Long uid) { + return (QaQueUsr) this.getHibernateTemplate().get(QaQueUsr.class, uid); + } + public int countSessionUser(QaSession qaSession) { + return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_USER, "qaSession", qaSession)).size(); + } - public QaQueUsr getQaUserBySession(final Long queUsrId, final Long qaSessionId) - { - - String strGetUser = "from qaQueUsr in class QaQueUsr where qaQueUsr.queUsrId=:queUsrId and qaQueUsr.qaSessionId=:qaSessionId"; - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(strGetUser) - .setLong("queUsrId", queUsrId.longValue()) - .setLong("qaSessionId", qaSessionId.longValue()) - .list(); - - if(list != null && list.size() > 0){ - QaQueUsr usr = (QaQueUsr) list.get(0); - return usr; - } - return null; - } + public QaQueUsr getQaQueUsrById(long qaQueUsrId) { + String query = "from QaQueUsr user where user.queUsrId=?"; - - - - public List getUserBySessionOnly(final QaSession qaSession) - { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) - .setLong("qaSessionId", qaSession.getUid().longValue()) - .list(); - return list; - } - - - public QaQueUsr loadQaQueUsrById(long qaQueUsrId) - { - return getQaQueUsrById(qaQueUsrId); - } + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(query).setLong(0, qaQueUsrId).list(); - - public void createUsr(QaQueUsr usr) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(usr); - } - - public void updateUsr(QaQueUsr usr) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(usr); - } + if (list != null && list.size() > 0) { + QaQueUsr qu = (QaQueUsr) list.get(0); + return qu; + } + return null; + } - - public void deleteQaQueUsr(QaQueUsr qaQueUsr) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaQueUsr); + public QaQueUsr getQaUserBySession(final Long queUsrId, final Long qaSessionId) { + + String strGetUser = "from qaQueUsr in class QaQueUsr where qaQueUsr.queUsrId=:queUsrId and qaQueUsr.qaSessionId=:qaSessionId"; + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()).setLong( + "qaSessionId", qaSessionId.longValue()).list(); + + if (list != null && list.size() > 0) { + QaQueUsr usr = (QaQueUsr) list.get(0); + return usr; + } + return null; + } + + public List getUserBySessionOnly(final QaSession qaSession) { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(LOAD_USER_FOR_SESSION).setLong("qaSessionId", + qaSession.getUid().longValue()).list(); + return list; + } + + public QaQueUsr loadQaQueUsrById(long qaQueUsrId) { + return getQaQueUsrById(qaQueUsrId); + } + + public void createUsr(QaQueUsr usr) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().save(usr); + } + + public void updateUsr(QaQueUsr usr) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().update(usr); + } + + public void deleteQaQueUsr(QaQueUsr qaQueUsr) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().delete(qaQueUsr); + } + + public int getTotalNumberOfUsers() { + String query = "from obj in class QaQueUsr"; + return this.getHibernateTemplate().find(query).size(); + } + + public int getTotalNumberOfUsers(QaContent qa) { + String strGetUser = "from qaQueUsr in class QaQueUsr"; + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(strGetUser).list(); + logger.debug("strGetUser: " + strGetUser); + logger.debug("qa: " + qa); + logger.debug("list: " + list); + + int totalUserCount = 0; + if (list != null && list.size() > 0) { + QaQueUsr usr = (QaQueUsr) list.get(0); + logger.debug("usr: " + usr); + logger.debug("local usr content uid versus incoming content uid: " + + usr.getQaSession().getQaContent().getUid().intValue() + " versus " + qa.getUid().intValue()); + + if (usr.getQaSession().getQaContent().getUid().intValue() == qa.getUid().intValue()) { + ++totalUserCount; } - - public int getTotalNumberOfUsers() { - String query="from obj in class QaQueUsr"; - return this.getHibernateTemplate().find(query).size(); - } - - - public int getTotalNumberOfUsers(QaContent qa) - { - String strGetUser = "from qaQueUsr in class QaQueUsr"; - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(strGetUser) - .list(); - logger.debug("strGetUser: " + strGetUser); - logger.debug("qa: " + qa); - logger.debug("list: " + list); - - int totalUserCount=0; - if(list != null && list.size() > 0){ - QaQueUsr usr = (QaQueUsr) list.get(0); - logger.debug("usr: " + usr); - logger.debug("local usr content uid versus incoming content uid: " + - usr.getQaSession().getQaContent().getUid().intValue() + " versus " + qa.getUid().intValue()); - - if (usr.getQaSession().getQaContent().getUid().intValue() == qa.getUid().intValue()) - { - ++totalUserCount; - } - } - logger.debug("final totalUserCount: " + totalUserCount); - return totalUserCount; - } - -} \ No newline at end of file + } + logger.debug("final totalUserCount: " + totalUserCount); + return totalUserCount; + } + +} \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -1,5 +1,4 @@ /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -33,169 +32,129 @@ import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - - /** * @author Ozgur Demirtas - * + * */ -public class QaSessionDAO extends HibernateDaoSupport implements - IQaSessionDAO -{ - private static final String COUNT_SESSION_INCOMPLITE = "select qaSession.session_status from QaSession qaSession where qaSession.session_status='INCOMPLETE' and qaSession.qaContentId = :qa"; - private static final String COUNT_SESSION_ACTIVITY = "select qaSession.session_status from QaSession qaSession where qaSession.qaContentId = :qa"; - private static final String GET_SESSION_IDS_FOR_CONTENT = "select qaSession.qaSessionId from QaSession qaSession where qaSession.qaContentId = :qa"; - private static final String COUNT_SESSION_COMPLETE = "from qaSession in class QaSession where qaSession.session_status='COMPLETE'"; - private static final String COUNT_SESSION_INCOMPLETE = "from qaSession in class QaSession where qaSession.session_status='INCOMPLETE'"; - private static final String GET_SESSIONS_FROM_CONTENT = "select qas.qaSessionId from QaSession qas where qas.qaContent=:qaContent order by qas.qaSessionId"; - private static final String GET_SESSIONNAMES_FROM_CONTENT = "select qas.session_name from QaSession qas where qas.qaContent=:qaContent order by qas.qaSessionId"; - - public int countSessionComplete() - { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(COUNT_SESSION_COMPLETE) - .list(); - - if(list != null && list.size() > 0){ - return list.size(); - } - else return 0; - } - - public int countSessionComplete(QaContent qa) - { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(COUNT_SESSION_COMPLETE) - .list(); +public class QaSessionDAO extends HibernateDaoSupport implements IQaSessionDAO { + private static final String COUNT_SESSION_INCOMPLITE = "select qaSession.session_status from QaSession qaSession where qaSession.session_status='INCOMPLETE' and qaSession.qaContentId = :qa"; + private static final String COUNT_SESSION_ACTIVITY = "select qaSession.session_status from QaSession qaSession where qaSession.qaContentId = :qa"; + private static final String GET_SESSION_IDS_FOR_CONTENT = "select qaSession.qaSessionId from QaSession qaSession where qaSession.qaContentId = :qa"; + private static final String COUNT_SESSION_COMPLETE = "from qaSession in class QaSession where qaSession.session_status='COMPLETE'"; + private static final String COUNT_SESSION_INCOMPLETE = "from qaSession in class QaSession where qaSession.session_status='INCOMPLETE'"; + private static final String GET_SESSIONS_FROM_CONTENT = "select qas.qaSessionId from QaSession qas where qas.qaContent=:qaContent order by qas.qaSessionId"; + private static final String GET_SESSIONNAMES_FROM_CONTENT = "select qas.session_name from QaSession qas where qas.qaContent=:qaContent order by qas.qaSessionId"; - int sessionCount=0; - if(list != null && list.size() > 0){ - QaSession qaSession = (QaSession) list.get(0); - logger.debug("qaSession: " + qaSession); - logger.debug("local session's content uid versus incoming content uid: " + - qaSession.getQaContent().getUid().intValue() + " versus " + qa.getUid().intValue()); - - if (qaSession.getQaContent().getUid().intValue() == qa.getUid().intValue()) - { - ++sessionCount; - } - } - logger.debug("sessionCount: " + sessionCount); - return sessionCount; - } + public int countSessionComplete() { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(COUNT_SESSION_COMPLETE).list(); - - public int countSessionIncomplete() - { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(COUNT_SESSION_INCOMPLETE) - .list(); - - if(list != null && list.size() > 0){ - return list.size(); - } - else return 0; + if (list != null && list.size() > 0) { + return list.size(); + } else + return 0; + } + + public int countSessionComplete(QaContent qa) { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(COUNT_SESSION_COMPLETE).list(); + + int sessionCount = 0; + if (list != null && list.size() > 0) { + QaSession qaSession = (QaSession) list.get(0); + logger.debug("qaSession: " + qaSession); + logger.debug("local session's content uid versus incoming content uid: " + + qaSession.getQaContent().getUid().intValue() + " versus " + qa.getUid().intValue()); + + if (qaSession.getQaContent().getUid().intValue() == qa.getUid().intValue()) { + ++sessionCount; + } } + logger.debug("sessionCount: " + sessionCount); + return sessionCount; + } - - public int studentActivityOccurred(QaContent qa) - { - return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_ACTIVITY, - "qa", - qa)).size(); + public int countSessionIncomplete() { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(COUNT_SESSION_INCOMPLETE).list(); + + if (list != null && list.size() > 0) { + return list.size(); + } else + return 0; } - - - public List getToolSessionsForContent(QaContent qa) - { - - List lisToolSessionIds=(getHibernateTemplate().findByNamedParam(GET_SESSION_IDS_FOR_CONTENT, - "qa", - qa)); - return lisToolSessionIds; + + public int studentActivityOccurred(QaContent qa) { + return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_ACTIVITY, "qa", qa)).size(); } - + + public List getToolSessionsForContent(QaContent qa) { + + List lisToolSessionIds = (getHibernateTemplate().findByNamedParam(GET_SESSION_IDS_FOR_CONTENT, "qa", qa)); + return lisToolSessionIds; + } + /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#getSurveySessionById(long) */ - public QaSession getQaSessionById(long qaSessionId) - { - String query = "from QaSession as qus where qus.qaSessionId = ?"; - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(query) - .setLong(0,qaSessionId) - .list(); - - if(list != null && list.size() > 0){ - QaSession qus = (QaSession) list.get(0); - return qus; - } - return null; + public QaSession getQaSessionById(long qaSessionId) { + String query = "from QaSession as qus where qus.qaSessionId = ?"; + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(query).setLong(0, qaSessionId).list(); + + if (list != null && list.size() > 0) { + QaSession qus = (QaSession) list.get(0); + return qus; + } + return null; } - - - public String getSessionNameById(long qaSessionId) - { - String query = "from QaSession as qus where qus.qaSessionId = ?"; - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(query) - .setLong(0,qaSessionId) - .list(); - - if(list != null && list.size() > 0){ - QaSession qus = (QaSession) list.get(0); - return qus.getSession_name() ; - } - return null; + + public String getSessionNameById(long qaSessionId) { + String query = "from QaSession as qus where qus.qaSessionId = ?"; + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(query).setLong(0, qaSessionId).list(); + + if (list != null && list.size() > 0) { + QaSession qus = (QaSession) list.get(0); + return qus.getSession_name(); + } + return null; } - - - public QaSession getQaSessionOrNullById(long qaSessionId) - { - return getQaSessionById(qaSessionId); + + public QaSession getQaSessionOrNullById(long qaSessionId) { + return getQaSessionById(qaSessionId); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#CreateSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ - public void CreateQaSession(QaSession session) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(session); + public void CreateQaSession(QaSession session) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().save(session); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#UpdateSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ - public void UpdateQaSession(QaSession session) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(session); + public void UpdateQaSession(QaSession session) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().update(session); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#deleteSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ - public void deleteQaSession(QaSession qaSession) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaSession); + public void deleteQaSession(QaSession qaSession) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().delete(qaSession); } - - public List getSessionsFromContent(QaContent qaContent) - { - return (getHibernateTemplate().findByNamedParam(GET_SESSIONS_FROM_CONTENT, - "qaContent", - qaContent)); - } - - public List getSessionNamesFromContent(QaContent qaContent) - { - return (getHibernateTemplate().findByNamedParam(GET_SESSIONNAMES_FROM_CONTENT, - "qaContent", - qaContent)); - } - - - + + public List getSessionsFromContent(QaContent qaContent) { + return (getHibernateTemplate().findByNamedParam(GET_SESSIONS_FROM_CONTENT, "qaContent", qaContent)); + } + + public List getSessionNamesFromContent(QaContent qaContent) { + return (getHibernateTemplate().findByNamedParam(GET_SESSIONNAMES_FROM_CONTENT, "qaContent", qaContent)); + } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java (.../QaUploadedFileDAO.java) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java (.../QaUploadedFileDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -34,119 +34,98 @@ import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - /** * @author Ozgur Demirtas - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates + * + * TODO To change the template for this generated type comment go to Window - + * Preferences - Java - Code Style - Code Templates */ public class QaUploadedFileDAO extends HibernateDaoSupport implements IQaUploadedFileDAO { - static Logger logger = Logger.getLogger(QaUploadedFileDAO.class.getName()); - - private static final String GET_UPLOADED_FILES = "from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContent.qaContentId = :contentId"; - - private static final String DELETE_FILES_META_DATA = "from qaUploadedFile in class QaUploadedFile"; - - public QaUploadedFile getUploadedFileById(long submissionId) - { - return (QaUploadedFile) this.getHibernateTemplate() - .load(QaUploadedFile.class, new Long(submissionId)); - } - - /** - * - * return null if not found - */ - public QaUploadedFile loadUploadedFileById(long submissionId) - { - return (QaUploadedFile) this.getHibernateTemplate().get(QaUploadedFile.class, new Long(submissionId)); - } + static Logger logger = Logger.getLogger(QaUploadedFileDAO.class.getName()); - - - public void updateUploadFile(QaUploadedFile qaUploadedFile) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(qaUploadedFile); + private static final String GET_UPLOADED_FILES = "from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContent.qaContentId = :contentId"; + + private static final String DELETE_FILES_META_DATA = "from qaUploadedFile in class QaUploadedFile"; + + public QaUploadedFile getUploadedFileById(long submissionId) { + return (QaUploadedFile) this.getHibernateTemplate().load(QaUploadedFile.class, new Long(submissionId)); + } + + /** + * + * return null if not found + */ + public QaUploadedFile loadUploadedFileById(long submissionId) { + return (QaUploadedFile) this.getHibernateTemplate().get(QaUploadedFile.class, new Long(submissionId)); + } + + public void updateUploadFile(QaUploadedFile qaUploadedFile) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().update(qaUploadedFile); + } + + public void saveUploadFile(QaUploadedFile qaUploadedFile) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().save(qaUploadedFile); + } + + public void createUploadFile(QaUploadedFile qaUploadedFile) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().save(qaUploadedFile); + } + + public void UpdateUploadFile(QaUploadedFile qaUploadedFile) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().update(qaUploadedFile); + } + + public void cleanUploadedFilesMetaData() { + /* + String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile"; + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().delete(query); + */ + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(DELETE_FILES_META_DATA).list(); + + if (list != null && list.size() > 0) { + Iterator listIterator = list.iterator(); + while (listIterator.hasNext()) { + QaUploadedFile mcFile = (QaUploadedFile) listIterator.next(); + this.getSession().setFlushMode(FlushMode.AUTO); + templ.delete(mcFile); + templ.flush(); } - - - public void saveUploadFile(QaUploadedFile qaUploadedFile) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(qaUploadedFile); - } - - public void createUploadFile(QaUploadedFile qaUploadedFile) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(qaUploadedFile); - } - - public void UpdateUploadFile(QaUploadedFile qaUploadedFile) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(qaUploadedFile); - } + } + } - - public void cleanUploadedFilesMetaData() - { - /* - String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile"; - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(query); - */ - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(DELETE_FILES_META_DATA) - .list(); + public void removeUploadFile(Long submissionId) { + if (submissionId != null) { - if(list != null && list.size() > 0){ - Iterator listIterator=list.iterator(); - while (listIterator.hasNext()) - { - QaUploadedFile mcFile=(QaUploadedFile)listIterator.next(); - this.getSession().setFlushMode(FlushMode.AUTO); - templ.delete(mcFile); - templ.flush(); - } - } + String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile" + + " where uploadedFile.submissionId = ?"; + Object obj = this.getSession().createQuery(query).setLong(0, submissionId.longValue()).uniqueResult(); + if (obj != null) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().delete(obj); } - - public void removeUploadFile(Long submissionId) - { - if (submissionId != null ) { - - String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile" - + " where uploadedFile.submissionId = ?"; - Object obj = this.getSession().createQuery(query) - .setLong(0,submissionId.longValue()) - .uniqueResult(); - if ( obj != null ) { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(obj); - } - } - } - - public List retrieveQaUploadedFiles(QaContent qa) - { - List listFilenames=null; - listFilenames=(getHibernateTemplate().findByNamedParam(GET_UPLOADED_FILES, "contentId", qa.getQaContentId())); - return listFilenames; - } - - public void deleteUploadFile(QaUploadedFile qaUploadedFile) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(qaUploadedFile); - } - - public void flush() - { - this.getHibernateTemplate().flush(); - } - -} \ No newline at end of file + } + } + + public List retrieveQaUploadedFiles(QaContent qa) { + List listFilenames = null; + listFilenames = (getHibernateTemplate().findByNamedParam(GET_UPLOADED_FILES, "contentId", qa.getQaContentId())); + return listFilenames; + } + + public void deleteUploadFile(QaUploadedFile qaUploadedFile) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().delete(qaUploadedFile); + } + + public void flush() { + this.getHibernateTemplate().flush(); + } + +} \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -33,124 +33,96 @@ import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - /** * * @author Ozgur Demirtas * */ -public class QaUsrRespDAO extends HibernateDaoSupport implements IQaUsrRespDAO -{ - private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT = "from qaUsrResp in class QaUsrResp where qaUsrResp.queUsrId=:queUsrId and qaUsrResp.qaQueContentId=:qaQueContentId"; +public class QaUsrRespDAO extends HibernateDaoSupport implements IQaUsrRespDAO { + private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT = "from qaUsrResp in class QaUsrResp where qaUsrResp.queUsrId=:queUsrId and qaUsrResp.qaQueContentId=:qaQueContentId"; - public QaQueUsr getUserById(long userId) - { - return (QaQueUsr)this.getHibernateTemplate().load(QaQueUsr.class,new Long(userId)); - + public QaQueUsr getUserById(long userId) { + return (QaQueUsr) this.getHibernateTemplate().load(QaQueUsr.class, new Long(userId)); + } - public void createUserResponse(QaUsrResp qaUsrResp) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(qaUsrResp); + public void createUserResponse(QaUsrResp qaUsrResp) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().save(qaUsrResp); } - public QaUsrResp retrieveQaUsrResp(long responseId) - { - return (QaUsrResp) this.getHibernateTemplate().get(QaUsrResp.class, new Long(responseId)); + public QaUsrResp retrieveQaUsrResp(long responseId) { + return (QaUsrResp) this.getHibernateTemplate().get(QaUsrResp.class, new Long(responseId)); } - public QaUsrResp getAttemptByUID(Long uid) - { - String query = "from QaUsrResp attempt where attempt.responseId=?"; - - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(query) - .setLong(0,uid.longValue()) - .list(); - - if(list != null && list.size() > 0){ - QaUsrResp attempt = (QaUsrResp) list.get(0); - return attempt; - } - return null; + public QaUsrResp getAttemptByUID(Long uid) { + String query = "from QaUsrResp attempt where attempt.responseId=?"; + + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(query).setLong(0, uid.longValue()).list(); + + if (list != null && list.size() > 0) { + QaUsrResp attempt = (QaUsrResp) list.get(0); + return attempt; } - - - - /** + return null; + } + + /** * @see org.lamsfoundation.lams.tool.qa.dao.interfaces.IQaUsrRespDAO#saveUserResponse(com.lamsinternational.tool.qa.domain.QaUsrResp) */ - public void saveUserResponse(QaUsrResp resp) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().save(resp); + public void saveUserResponse(QaUsrResp resp) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().save(resp); } /** * @see org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO#updateUserResponse(org.lamsfoundation.lams.tool.qa.QaUsrResp) */ - public void updateUserResponse(QaUsrResp resp) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().update(resp); + public void updateUserResponse(QaUsrResp resp) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().update(resp); } - - public void removeUserResponse(QaUsrResp resp) - { - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(resp); + + public void removeUserResponse(QaUsrResp resp) { + this.getSession().setFlushMode(FlushMode.AUTO); + this.getHibernateTemplate().delete(resp); } - public List getAttemptsForUserAndQuestionContent(final Long queUsrId, final Long qaQueContentId) - { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT) - .setLong("queUsrId", queUsrId.longValue()) - .setLong("qaQueContentId", qaQueContentId.longValue()) - .list(); - - return list; + public List getAttemptsForUserAndQuestionContent(final Long queUsrId, final Long qaQueContentId) { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT).setLong("queUsrId", + queUsrId.longValue()).setLong("qaQueContentId", qaQueContentId.longValue()).list(); + + return list; } - - - public void removeAttemptsForUserAndQuestionContent(final Long queUsrId, final Long qaQueContentId) - { - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT) - .setLong("queUsrId", queUsrId.longValue()) - .setLong("qaQueContentId", qaQueContentId.longValue()) - .list(); - - - if(list != null && list.size() > 0){ - Iterator listIterator=list.iterator(); - while (listIterator.hasNext()) - { - QaUsrResp qaUsrResp=(QaUsrResp)listIterator.next(); - this.getSession().setFlushMode(FlushMode.AUTO); - templ.delete(qaUsrResp); - templ.flush(); - } - } + + public void removeAttemptsForUserAndQuestionContent(final Long queUsrId, final Long qaQueContentId) { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT).setLong("queUsrId", + queUsrId.longValue()).setLong("qaQueContentId", qaQueContentId.longValue()).list(); + + if (list != null && list.size() > 0) { + Iterator listIterator = list.iterator(); + while (listIterator.hasNext()) { + QaUsrResp qaUsrResp = (QaUsrResp) listIterator.next(); + this.getSession().setFlushMode(FlushMode.AUTO); + templ.delete(qaUsrResp); + templ.flush(); + } + } } - - - public void removeUserResponseByQaQueId(Long qaQueId) - { - if ( qaQueId != null ) { - String query = "from resp in class org.lamsfoundation.lams.tool.qa.QaUsrResp" - + " where resp.qaQueContentId = ?"; - Object obj = getSession().createQuery(query) - .setLong(0,qaQueId.longValue()) - .uniqueResult(); - if ( obj != null ) { - this.getSession().setFlushMode(FlushMode.AUTO); - getHibernateTemplate().delete(obj); - } - } + + public void removeUserResponseByQaQueId(Long qaQueId) { + if (qaQueId != null) { + String query = "from resp in class org.lamsfoundation.lams.tool.qa.QaUsrResp" + + " where resp.qaQueContentId = ?"; + Object obj = getSession().createQuery(query).setLong(0, qaQueId.longValue()).uniqueResult(); + if (obj != null) { + this.getSession().setFlushMode(FlushMode.AUTO); + getHibernateTemplate().delete(obj); + } } + } } - - Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java =================================================================== diff -u -ra82189db31f6fb6dd4a25a50a688b2812e93ddce -raa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java (.../QaWizardDAO.java) (revision a82189db31f6fb6dd4a25a50a688b2812e93ddce) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java (.../QaWizardDAO.java) (revision aa22c03aa1f00c8f79e73f6d47c62fb2c0d00ad0) @@ -35,13 +35,12 @@ /** * - * @author lfoxton + * @author edited by lfoxton * */ public class QaWizardDAO extends BaseDAO implements IQaWizardDAO { private static final String QUERY_FIND_ALL_CATEGORIES = "from " + QaWizardCategory.class.getName(); - private static final String QUERY_DELETE_ALL_CATEGORIES = "from " + QaWizardCategory.class.getName(); private static final String QUERY_GET_CATEGORY = "from " + QaWizardCategory.class.getName() + " c where c.uid=?"; private static final String QUERY_GET_SKILL = "from " + QaWizardCognitiveSkill.class.getName() + " c where c.uid=?"; private static final String QUERY_GET_QUESTION = "from " + QaWizardQuestion.class.getName() + " q where q.uid=?";