Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -r419201d3ad6fa99804284edd03c21d0065217c6c -r76466ac35a7c584f60f7f9f40098d320a83dca7a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 419201d3ad6fa99804284edd03c21d0065217c6c) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 76466ac35a7c584f60f7f9f40098d320a83dca7a) @@ -302,10 +302,12 @@ 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 result.assessment_uid = assessment.uid " - + "JOIN tl_laasse10_question_result AS questionResult ON result.uid = questionResult.result_uid " - + "JOIN tl_laasse10_option_answer AS optionAnswer ON questionResult.uid = optionAnswer.question_result_uid AND optionAnswer.answer_boolean=1 AND optionAnswer.question_option_uid = :optionUid " - + "WHERE (result.finish_date IS NOT NULL) AND result.latest=1 && assessment.content_id = :toolContentId"; + + "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 (result.finish_date IS NOT NULL) AND 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); query.setParameter("toolContentId", toolContentId); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java =================================================================== diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r76466ac35a7c584f60f7f9f40098d320a83dca7a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision e8a7110708b15579af2c6b31ac52a6da427fef6d) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 76466ac35a7c584f60f7f9f40098d320a83dca7a) @@ -833,7 +833,7 @@ if (questionDto.isMultipleAnswersAllowed()) { String answer = request .getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + optionDto.getUid()); - answerBoolean = !StringUtils.isBlank(answer); + answerBoolean = StringUtils.isNotBlank(answer); } else { String optionUidSelectedStr = request .getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);