Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== diff -u -r4c469a5831a69444d5f18db63fdfda095da2e222 -r56714ef128cc85383b3fb3a8da95d45c7b6ecab9 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 4c469a5831a69444d5f18db63fdfda095da2e222) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 56714ef128cc85383b3fb3a8da95d45c7b6ecab9) @@ -157,6 +157,8 @@ public static final String ATTR_GROUP_LEADER = "groupLeader"; + public static final String ATTR_GROUP_LEADER_NAME = "groupLeaderName"; + public static final String ATTR_IS_USER_LEADER = "isUserLeader"; public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -rfe059e787d9e2d4343b0211e672ba96be7b14838 -r56714ef128cc85383b3fb3a8da95d45c7b6ecab9 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision fe059e787d9e2d4343b0211e672ba96be7b14838) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 56714ef128cc85383b3fb3a8da95d45c7b6ecab9) @@ -224,7 +224,8 @@ sessionMap.put(ScratchieConstants.ATTR_RESOURCE_INSTRUCTION, scratchie.getInstructions()); sessionMap.put(ScratchieConstants.ATTR_USER_ID, user.getUserId()); sessionMap.put(ScratchieConstants.ATTR_USER_UID, user.getUid()); - sessionMap.put(ScratchieConstants.ATTR_GROUP_LEADER, groupLeader); + String groupLeaderName = groupLeader.getFirstName() + " " + groupLeader.getLastName(); + sessionMap.put(ScratchieConstants.ATTR_GROUP_LEADER_NAME, groupLeaderName); boolean isUserLeader = toolSession.isUserGroupLeader(user.getUid()); sessionMap.put(ScratchieConstants.ATTR_IS_USER_LEADER, isUserLeader); boolean isUserFinished = (user != null) && user.isSessionFinished(); Index: lams_tool_scratchie/web/pages/learning/learning.jsp =================================================================== diff -u -rc01bd4b6b818ad0e3bd91a9743a300f2a36f2047 -r56714ef128cc85383b3fb3a8da95d45c7b6ecab9 --- lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision c01bd4b6b818ad0e3bd91a9743a300f2a36f2047) +++ lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 56714ef128cc85383b3fb3a8da95d45c7b6ecab9) @@ -105,7 +105,7 @@

- ${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName} + ${sessionMap.groupLeaderName}