Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -r5c04387c57cc0a4e4b0772a20e517ddeb7272f76 -r02b91789ae056e5c483db117bfa3763022d5c8a7 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 5c04387c57cc0a4e4b0772a20e517ddeb7272f76) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 02b91789ae056e5c483db117bfa3763022d5c8a7) @@ -395,14 +395,13 @@ } @Override - public int countAttemptsPerOption(Long toolContentId, Long optionUid, boolean finishedAttemptsOnly) { + public int countAttemptsPerOption(Long toolContentId, Long optionUid) { String COUNT_ATTEMPTS_BY_OPTION_UID = "SELECT count(*) " + "FROM tl_laasse10_assessment_result AS result " + "JOIN tl_laasse10_assessment AS assessment ON assessment.uid = result.assessment_uid " + "JOIN tl_laasse10_question_result AS questionResult ON questionResult.result_uid = result.uid " + "JOIN lams_qb_tool_answer AS qbToolAnswer ON qbToolAnswer.answer_uid = questionResult.uid " + "JOIN tl_laasse10_option_answer AS optionAnswer ON questionResult.uid = optionAnswer.question_result_uid " - + "WHERE " + (finishedAttemptsOnly ? "(result.finish_date IS NOT NULL) AND " : "") - + "result.latest=1 && assessment.content_id = :toolContentId AND optionAnswer.question_option_uid = :optionUid " + + "WHERE result.latest=1 && assessment.content_id = :toolContentId AND optionAnswer.question_option_uid = :optionUid " + "AND (optionAnswer.answer_boolean=1 OR qbToolAnswer.qb_option_uid = :optionUid) "; NativeQuery query = getSession().createNativeQuery(COUNT_ATTEMPTS_BY_OPTION_UID);