Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java =================================================================== diff -u -r955a2a0ed552a7c8e8ffd9894cac59233e56747e -r3a7e6ed4a8777745c7c873a638306011036b8a8c --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java (.../DacoAnswerDAO.java) (revision 955a2a0ed552a7c8e8ffd9894cac59233e56747e) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java (.../DacoAnswerDAO.java) (revision 3a7e6ed4a8777745c7c873a638306011036b8a8c) @@ -17,13 +17,11 @@ List getQuestionSummaries(Long userUid, List blankSummary); /** - * Gets the number of records in the group. + * Gets the number of records entered by user. * * @param sessionId * session ID of the group - * @return number of records in that group + * @return number of records for that user */ - Integer getGroupRecordCount(Long sessionId); - Integer getUserRecordCount(Long userId, Long sessionId); } \ No newline at end of file Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java =================================================================== diff -u -r92ac059e7b8ccd60e7a18d3f0e35e193d01617d1 -r3a7e6ed4a8777745c7c873a638306011036b8a8c --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java (.../DacoAnswerDAOHibernate.java) (revision 92ac059e7b8ccd60e7a18d3f0e35e193d01617d1) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java (.../DacoAnswerDAOHibernate.java) (revision 3a7e6ed4a8777745c7c873a638306011036b8a8c) @@ -39,9 +39,6 @@ private static final String FIND_ANSWER_COUNT = "SELECT COUNT(*) FROM " + DacoAnswer.class.getName() + " AS a WHERE a.question.uid=? AND a.answer IS NOT NULL"; - private static final String FIND_TOTAL_RECORD_COUNT = "SELECT COUNT (DISTINCT a.recordId) FROM " - + DacoAnswer.class.getName() + " AS a WHERE a.user.session.sessionId=?"; - private static final String FIND_USER_RECORD_COUNT = "SELECT COUNT (DISTINCT a.recordId) FROM " + DacoAnswer.class.getName() + " AS a WHERE a.user.userId=:userId AND a.user.session.sessionId=:sessionId"; @@ -157,11 +154,6 @@ return row; } - public Integer getGroupRecordCount(Long sessionId) { - return ((Number) getHibernateTemplate().find(DacoAnswerDAOHibernate.FIND_TOTAL_RECORD_COUNT, sessionId).get(0)) - .intValue(); - } - public Integer getUserRecordCount(Long userId, Long sessionId) { return ((Number) getHibernateTemplate().findByNamedParam(DacoAnswerDAOHibernate.FIND_USER_RECORD_COUNT, new String[] { "userId", "sessionId" }, new Object[] { userId, sessionId }).get(0)).intValue(); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml =================================================================== diff -u -r9aa7e24878b41bd6baffa35e83ef392e670811c3 -r3a7e6ed4a8777745c7c873a638306011036b8a8c --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml (.../DacoAnswer.hbm.xml) (revision 9aa7e24878b41bd6baffa35e83ef392e670811c3) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml (.../DacoAnswer.hbm.xml) (revision 3a7e6ed4a8777745c7c873a638306011036b8a8c) @@ -95,6 +95,14 @@ column="file_name" /> + +