Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r8f8e67f97a1cff593271235d58e1640d295bf1fb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision 8f8e67f97a1cff593271235d58e1640d295bf1fb)
@@ -49,20 +49,20 @@
 public class AssessmentResultDAOHibernate extends LAMSBaseDAO implements AssessmentResultDAO {
 
     private static final String FIND_LAST_BY_ASSESSMENT =
-	    "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.assessment.uid=:assessmentUid AND r.latest=1";
+	    "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.assessment.uid=:assessmentUid AND r.latest=true";
 
     private static final String FIND_LAST_BY_ASSESSMENT_AND_USER = "FROM " + AssessmentResult.class.getName()
-	    + " AS r WHERE r.user.userId =:userId AND r.assessment.uid=:assessmentUid AND r.latest=1";
+	    + " AS r WHERE r.user.userId =:userId AND r.assessment.uid=:assessmentUid AND r.latest=true";
 
     private static final String FIND_WHETHER_LAST_RESULT_FINISHED =
 	    "SELECT COUNT(*) > 0 FROM " + AssessmentResult.class.getName()
-		    + " AS r WHERE r.user.userId =:userId AND r.assessment.uid=:assessmentUid AND r.latest=1 AND r.finishDate != null";
+		    + " AS r WHERE r.user.userId =:userId AND r.assessment.uid=:assessmentUid AND r.latest=true AND r.finishDate != null";
 
     private static final String FIND_BY_ASSESSMENT_AND_USER_AND_FINISHED = "FROM " + AssessmentResult.class.getName()
 	    + " AS r WHERE r.user.userId = ? AND r.assessment.uid=? AND (r.finishDate != null) ORDER BY r.startDate ASC";
 
     private static final String FIND_LAST_FINISHED_BY_ASSESSMENT_AND_USER = "FROM " + AssessmentResult.class.getName()
-	    + " AS r WHERE r.user.userId = :userId AND r.assessment.uid=:assessmentUid AND (r.finishDate != null) AND r.latest=1";
+	    + " AS r WHERE r.user.userId = :userId AND r.assessment.uid=:assessmentUid AND (r.finishDate != null) AND r.latest=true";
 
     private static final String FIND_BY_SESSION_AND_USER =
 	    "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.user.userId = ? AND r.sessionId=?";
@@ -71,10 +71,10 @@
 	    + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null) ORDER BY r.startDate ASC";
 
     private static final String FIND_LAST_FINISHED_BY_SESSION_AND_USER = "FROM " + AssessmentResult.class.getName()
-	    + " AS r WHERE r.user.userId = :userId AND r.sessionId=:sessionId AND (r.finishDate != null) AND r.latest=1";
+	    + " AS r WHERE r.user.userId = :userId AND r.sessionId=:sessionId AND (r.finishDate != null) AND r.latest=true";
 
     private static final String FIND_LAST_FINISHED_RESULTS_BY_CONTENT_ID = "FROM " + AssessmentResult.class.getName()
-	    + " AS r WHERE r.assessment.contentId = :contentId AND (r.finishDate != null) AND r.latest = 1";
+	    + " AS r WHERE r.assessment.contentId = :contentId AND (r.finishDate != null) AND r.latest = true";
 
     private static final String FIND_ASSESSMENT_RESULT_COUNT_BY_ASSESSMENT_AND_USER =
 	    "select COUNT(*) FROM " + AssessmentResult.class.getName()
@@ -85,11 +85,11 @@
 		    + " AS r WHERE r.assessment.uid=:assessmentUid";
 
     private static final String LAST_ASSESSMENT_RESULT_GRADE = "select r.grade FROM " + AssessmentResult.class.getName()
-	    + " AS r WHERE r.user.userId=:userId AND r.assessment.uid=:assessmentUid AND (r.finishDate != null) AND r.latest=1";
+	    + " AS r WHERE r.user.userId=:userId AND r.assessment.uid=:assessmentUid AND (r.finishDate != null) AND r.latest=true";
 
     private static final String LAST_ASSESSMENT_RESULT_GRADES_BY_CONTENT_ID =
 	    "select r.user.userId, r.grade FROM " + AssessmentResult.class.getName()
-		    + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=1";
+		    + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=true";
 
     private static final String BEST_SCORE_BY_SESSION_AND_USER =
 	    "SELECT MAX(r.grade) FROM " + AssessmentResult.class.getName()
@@ -113,7 +113,7 @@
 
     private static final String FIND_LAST_ASSESSMENT_RESULT_TIME_TAKEN =
 	    "select UNIX_TIMESTAMP(r.finishDate) - UNIX_TIMESTAMP(r.startDate) FROM " + AssessmentResult.class.getName()
-		    + " AS r WHERE r.user.userId=? AND r.assessment.uid=? AND (r.finishDate != null) AND r.latest=1";
+		    + " AS r WHERE r.user.userId=? AND r.assessment.uid=? AND (r.finishDate != null) AND r.latest=true";
 
     private static final String FIND_BY_UID = "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.uid = ?";
 
@@ -139,7 +139,7 @@
 		    + "			ON oa.question_result_uid = qr.uid"
 		    + "			AND  ((qbq.type = 7 AND qr.mark > 0) OR (qbta.answer IS NOT NULL AND TRIM(qbta.answer) <> '')"
 		    + "                        OR oa.answer_boolean IS NULL OR oa.answer_boolean = 1 OR (qbq.type = 2 AND answer_int <> -1))"
-		    + "		WHERE ar.latest = 1"
+		    + "		WHERE ar.latest = true"
 		    + "         AND   (a.use_select_leader_tool_ouput = 0 OR s.group_leader_uid = ar.user_uid)"
 		    + "		AND   a.content_id = :toolContentId"
 		    + "		GROUP BY qr.uid, u.user_id) AS answered_questions GROUP BY user_id ORDER BY user_name";
@@ -152,7 +152,7 @@
 		    + "         JOIN      tl_laasse10_user              AS au   ON ar.user_uid = au.uid"
 		    + "         JOIN      lams_user              	AS u	USING (user_id)"
 		    + "         JOIN      tl_laasse10_session           AS s    USING (session_id)"
-		    + "	WHERE ar.latest = 1 AND ar.finish_date IS NOT NULL"
+		    + "	WHERE ar.latest = true AND ar.finish_date IS NOT NULL"
 		    + "		AND   a.content_id = :toolContentId"
 		    + "	ORDER BY user_name";
 
@@ -346,7 +346,7 @@
     public List<Object[]> getLastFinishedAssessmentResultsBySession(Long sessionId) {
 	final String FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID =
 		"SELECT r, u.portraitUuid FROM " + AssessmentResult.class.getName() + " AS r, " + User.class.getName()
-			+ " as u WHERE r.sessionId=? AND (r.finishDate != null) AND r.latest=1 AND u.userId=r.user.userId";
+			+ " as u WHERE r.sessionId=? AND (r.finishDate != null) AND r.latest=true AND u.userId=r.user.userId";
 
 	return doFind(FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID, new Object[] { sessionId });
     }
@@ -355,7 +355,7 @@
     public List<Object[]> getLeadersLastFinishedAssessmentResults(Long contentId) {
 	final String FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID =
 		"SELECT r, u.portraitUuid FROM " + AssessmentResult.class.getName() + " AS r, " + User.class.getName()
-			+ " as u WHERE r.user=r.user.session.groupLeader AND r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=1 AND u.userId=r.user.userId";
+			+ " as u WHERE r.user=r.user.session.groupLeader AND r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=true AND u.userId=r.user.userId";
 
 	return doFind(FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID, new Object[] { contentId });
     }
@@ -400,7 +400,7 @@
 		+ "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.latest=1 && assessment.content_id = :toolContentId AND optionAnswer.question_option_uid = :optionUid "
+		+ "WHERE result.latest=true && assessment.content_id = :toolContentId AND optionAnswer.question_option_uid = :optionUid "
 		+ "AND (optionAnswer.answer_boolean=1 OR qbToolAnswer.qb_option_uid = :optionUid)  ";
 
 	NativeQuery<Number> query = getSession().createNativeQuery(COUNT_ATTEMPTS_BY_OPTION_UID);