Index: lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r18ffef3eac77674c112b895ca5bb1963a399c340 --- lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java (.../ConfidenceLevelDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java (.../ConfidenceLevelDTO.java) (revision 18ffef3eac77674c112b895ca5bb1963a399c340) @@ -4,6 +4,8 @@ private Integer userId; + private String userName; + private Long portraitUuid; private int level; @@ -21,7 +23,17 @@ public void setUserId(Integer userId) { this.userId = userId; } + + /** + */ + public void setUserName(String userName) { + this.userName = userName; + } + public String getUserName() { + return this.userName; + } + /** */ public Long getPortraitUuid() { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r51d4ec0a2ce479984ec5daf54c9a29029309428f -r18ffef3eac77674c112b895ca5bb1963a399c340 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 51d4ec0a2ce479984ec5daf54c9a29029309428f) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 18ffef3eac77674c112b895ca5bb1963a399c340) @@ -2823,7 +2823,7 @@ AssessmentResult assessmentResult = (AssessmentResult) assessmentResultsAndPortraitIter[0]; Long portraitUuid = assessmentResultsAndPortraitIter[1] == null ? null : ((Number) assessmentResultsAndPortraitIter[1]).longValue(); - Long userId = assessmentResult.getUser().getUserId(); + AssessmentUser user = assessmentResult.getUser(); //fill in question's and user answer's hashes for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) { @@ -2866,7 +2866,11 @@ for (String answer : answers) { ConfidenceLevelDTO confidenceLevelDto = new ConfidenceLevelDTO(); - confidenceLevelDto.setUserId(userId.intValue()); + confidenceLevelDto.setUserId(user.getUserId().intValue()); + String userName = StringUtils.isBlank(user.getFirstName()) + && StringUtils.isBlank(user.getLastName()) ? user.getLoginName() + : user.getFirstName() + " " + user.getLastName(); + confidenceLevelDto.setUserName(userName); confidenceLevelDto.setPortraitUuid(portraitUuid); confidenceLevelDto.setLevel(questionResult.getConfidenceLevel()); confidenceLevelDto.setQuestion(question.getQuestion()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r6ec43132d9df310eebff50fac6fca9f095757bd7 -r18ffef3eac77674c112b895ca5bb1963a399c340 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 6ec43132d9df310eebff50fac6fca9f095757bd7) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 18ffef3eac77674c112b895ca5bb1963a399c340) @@ -1537,14 +1537,16 @@ McUsrAttempt userAttempt = (McUsrAttempt) userAttemptAndPortraitIter[0]; Long portraitUuid = userAttemptAndPortraitIter[1] == null ? null : ((Number) userAttemptAndPortraitIter[1]).longValue(); - Long userId = userAttempt.getMcQueUsr().getQueUsrId(); + McQueUsr user = userAttempt.getMcQueUsr(); //fill in question's and user answer's hashes McQueContent question = userAttempt.getMcQueContent(); String answer = userAttempt.getMcOptionsContent().getMcQueOptionText(); ConfidenceLevelDTO confidenceLevelDto = new ConfidenceLevelDTO(); - confidenceLevelDto.setUserId(userId.intValue()); + confidenceLevelDto.setUserId(user.getQueUsrId().intValue()); + String userName = StringUtils.isBlank(user.getFullname()) ? user.getUsername() : user.getFullname(); + confidenceLevelDto.setUserName(userName); confidenceLevelDto.setPortraitUuid(portraitUuid); confidenceLevelDto.setLevel(userAttempt.getConfidenceLevel()); confidenceLevelDto.setQuestion(question.getQuestion()); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r18ffef3eac77674c112b895ca5bb1963a399c340 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 18ffef3eac77674c112b895ca5bb1963a399c340) @@ -2145,7 +2145,6 @@ if ((session == null) || (session.getScratchie() == null)) { return; } - Scratchie scratchie = session.getScratchie(); // as long as leader aware feature is always ON - copy answers from leader to non-leader user Index: lams_tool_scratchie/web/pages/learning/learning.jsp =================================================================== diff -u -r588920f0bcb20d715a58bb2bbde3da5520b7e9b0 -r18ffef3eac77674c112b895ca5bb1963a399c340 --- lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 588920f0bcb20d715a58bb2bbde3da5520b7e9b0) +++ lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 18ffef3eac77674c112b895ca5bb1963a399c340) @@ -39,7 +39,14 @@ font-size: 41px; margin-right: 5px; margin-bottom: 23px; + margin-top: 35px; } + .confidence-level-username { + overflow: hidden; + margin-top: -35px; + font-size: 13px; + text-align: center; + } .confidence-level-percentage { font-size: 13px; margin-top: 43px; Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp =================================================================== diff -u -r588920f0bcb20d715a58bb2bbde3da5520b7e9b0 -r18ffef3eac77674c112b895ca5bb1963a399c340 --- lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 588920f0bcb20d715a58bb2bbde3da5520b7e9b0) +++ lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 18ffef3eac77674c112b895ca5bb1963a399c340) @@ -52,21 +52,27 @@
-
+
+
+ ${confidenceLevelDto.userName} +
+ - -
-
- + +
+
+ - +
+
+
${confidenceLevelDto.level}0%