Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v diff -u -r1.17 -r1.18 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java 8 Jan 2014 17:52:50 -0000 1.17 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java 13 Jan 2014 14:01:44 -0000 1.18 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v diff -u -r1.37 -r1.38 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 6 Jan 2014 22:26:42 -0000 1.37 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 13 Jan 2014 14:01:44 -0000 1.38 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/learning.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_scratchie/web/pages/learning/learning.jsp 17 Dec 2013 22:26:24 -0000 1.15 +++ lams_tool_scratchie/web/pages/learning/learning.jsp 13 Jan 2014 14:01:44 -0000 1.16 @@ -105,7 +105,7 @@