Index: lams_central/web/includes/javascript/portrait.js =================================================================== diff -u -r837bfa5d17a7bde922671274f95b5df5ab1ff63b -rd0b0ba33d9c8c8d96876b9de3263ac77643ba35a --- lams_central/web/includes/javascript/portrait.js (.../portrait.js) (revision 837bfa5d17a7bde922671274f95b5df5ab1ff63b) +++ lams_central/web/includes/javascript/portrait.js (.../portrait.js) (revision d0b0ba33d9c8c8d96876b9de3263ac77643ba35a) @@ -40,7 +40,7 @@ // the HTML which defines a portrait. Use addPortrait if you need to add a portrait to an existing DIV. function definePortrait( portraitId, userId, size, round, LAMS_URL, portraitLocationClasses ) { var isRound = round == null ? true : round; - if ( portraitId && portraitId > 0) { + if ( portraitId ) { var retValue = '
) doFind(FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID, new Object[] { sessionId }); } @Override public List getLeadersLastFinishedAssessmentResults(Long contentId) { - final String FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID = "SELECT r, BIN_TO_UUID(u.portraitUuid) FROM " + AssessmentResult.class.getName() + 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"; return (List) doFind(FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID, new Object[] { contentId }); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -rd0b0ba33d9c8c8d96876b9de3263ac77643ba35a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision d0b0ba33d9c8c8d96876b9de3263ac77643ba35a) @@ -3065,7 +3065,7 @@ for (Object[] assessmentResultsAndPortraitIter : assessmentResultsAndPortraits) { AssessmentResult assessmentResult = (AssessmentResult) assessmentResultsAndPortraitIter[0]; - String portraitUuid = (String) assessmentResultsAndPortraitIter[1]; + UUID portraitUuid = (UUID) assessmentResultsAndPortraitIter[1]; AssessmentUser user = assessmentResult.getUser(); //fill in question's and user answer's hashes @@ -3115,7 +3115,7 @@ && StringUtils.isBlank(user.getLastName()) ? user.getLoginName() : user.getFirstName() + " " + user.getLastName(); confidenceLevelDto.setUserName(userName); - confidenceLevelDto.setPortraitUuid(portraitUuid); + confidenceLevelDto.setPortraitUuid(portraitUuid == null ? null : portraitUuid.toString()); confidenceLevelDto.setLevel(questionResult.getConfidenceLevel()); confidenceLevelDto.setType(assessment.getConfidenceLevelsType()); confidenceLevelDto.setQbQuestionUid(qbQuestion.getUid()); @@ -3156,7 +3156,7 @@ for (Object[] assessmentResultsAndPortraitIter : assessmentResultsAndPortraits) { AssessmentResult assessmentResult = (AssessmentResult) assessmentResultsAndPortraitIter[0]; - String portraitUuid = (String) assessmentResultsAndPortraitIter[1]; + UUID portraitUuid = (UUID) assessmentResultsAndPortraitIter[1]; AssessmentUser user = assessmentResult.getUser(); //fill in question's and user answer's hashes @@ -3199,7 +3199,7 @@ && StringUtils.isBlank(user.getLastName()) ? user.getLoginName() : user.getFirstName() + " " + user.getLastName(); confidenceLevelDto.setUserName(userName); - confidenceLevelDto.setPortraitUuid(portraitUuid); + confidenceLevelDto.setPortraitUuid(portraitUuid == null ? null : portraitUuid.toString()); confidenceLevelDto.setLevel(questionResult.getConfidenceLevel()); confidenceLevelDto.setType(assessment.getConfidenceLevelsType()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java =================================================================== diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -rd0b0ba33d9c8c8d96876b9de3263ac77643ba35a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision d0b0ba33d9c8c8d96876b9de3263ac77643ba35a) @@ -85,7 +85,7 @@ @Override public List getFinalizedAttemptsBySessionId(final Long sessionId) { - final String LOAD_QUESTION_ATTEMPTS_BY_SESSION_ID = "SELECT attempt, BIN_TO_UUID(u.portraitUuid) FROM " + final String LOAD_QUESTION_ATTEMPTS_BY_SESSION_ID = "SELECT attempt, u.portraitUuid FROM " + McUsrAttempt.class.getName() + " AS attempt, " + User.class.getName() + " as u WHERE attempt.mcQueUsr.mcSession.mcSessionId=:sessionId" + " AND attempt.mcQueUsr.responseFinalised = true AND u.userId=attempt.mcQueUsr.queUsrId"; @@ -96,7 +96,7 @@ @Override public List getLeadersFinalizedAttemptsByContentId(final Long contentId) { - final String LOAD_QUESTION_ATTEMPTS_BY_SESSION_ID = "SELECT attempt, BIN_TO_UUID(u.portraitUuid) FROM " + final String LOAD_QUESTION_ATTEMPTS_BY_SESSION_ID = "SELECT attempt, u.portraitUuid FROM " + McUsrAttempt.class.getName() + " AS attempt, " + User.class.getName() + " as u WHERE attempt.mcQueUsr=attempt.mcQueUsr.mcSession.groupLeader " + " AND attempt.mcQueContent.mcContent.mcContentId=:contentId " Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -rd0b0ba33d9c8c8d96876b9de3263ac77643ba35a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision d0b0ba33d9c8c8d96876b9de3263ac77643ba35a) @@ -1649,15 +1649,15 @@ for (Object[] userAttemptAndPortraitIter : userAttemptsAndPortraits) { McUsrAttempt userAttempt = (McUsrAttempt) userAttemptAndPortraitIter[0]; - String portraitUuid = (String) userAttemptAndPortraitIter[1]; + UUID portraitUuid = (UUID) userAttemptAndPortraitIter[1]; McQueUsr user = userAttempt.getMcQueUsr(); //fill in question and option uids ConfidenceLevelDTO confidenceLevelDto = new ConfidenceLevelDTO(); confidenceLevelDto.setUserId(user.getQueUsrId().intValue()); String userName = StringUtils.isBlank(user.getFullname()) ? user.getUsername() : user.getFullname(); confidenceLevelDto.setUserName(userName); - confidenceLevelDto.setPortraitUuid(portraitUuid); + confidenceLevelDto.setPortraitUuid(portraitUuid == null ? null : portraitUuid.toString()); confidenceLevelDto.setLevel(userAttempt.getConfidenceLevel()); confidenceLevelDto.setType(ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_0_TO_100); QbQuestion qbQuestion = userAttempt.getMcQueContent().getQbQuestion();