Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java,v diff -u -r1.6 -r1.6.10.1 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java 14 Nov 2008 04:05:26 -0000 1.6 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java 2 Nov 2010 18:18:46 -0000 1.6.10.1 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java,v diff -u -r1.5.10.2 -r1.5.10.3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java 7 Dec 2009 07:42:45 -0000 1.5.10.2 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java 2 Nov 2010 18:18:46 -0000 1.5.10.3 @@ -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,10 +154,6 @@ return row; } - public Integer getGroupRecordCount(Long sessionId) { - return (Integer) getHibernateTemplate().find(DacoAnswerDAOHibernate.FIND_TOTAL_RECORD_COUNT, sessionId).get(0); - } - public Integer getUserRecordCount(Long userId, Long sessionId) { return (Integer) getHibernateTemplate().findByNamedParam(DacoAnswerDAOHibernate.FIND_USER_RECORD_COUNT, new String[] { "userId", "sessionId" }, new Object[] { userId, sessionId }).get(0); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v diff -u -r1.9 -r1.9.10.1 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 14 Nov 2008 04:05:26 -0000 1.9 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 2 Nov 2010 18:18:46 -0000 1.9.10.1 @@ -390,7 +390,13 @@ } public Integer getGroupRecordCount(Long sessionId) { - return dacoAnswerDao.getGroupRecordCount(sessionId); + List users = dacoUserDao.getBySessionId(sessionId); + + Integer groupRecordCount = 0; + for (DacoUser user: users) { + groupRecordCount += dacoAnswerDao.getUserRecordCount(user.getUserId(), sessionId); + } + return groupRecordCount; } public Integer getGroupRecordCount(MonitoringSummarySessionDTO monitoringSummary) {