Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r2163a3c910ea266fc01ec2ac9d0ea7e069b5da30 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision 2163a3c910ea266fc01ec2ac9d0ea7e069b5da30) @@ -241,10 +241,9 @@ * Get Reflection list grouped by sessionID. * * @param contentId - * @param isEscapeText whether it's required to escape test for displaying in jqgrid * @return */ - List getReflectionList(Long contentId, boolean isEscapeText); + List getReflectionList(Long contentId); /** * Get user by UID Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -ra1ec18ad915ff2d73735b2fb00ef7f7a55ec0ed1 -r2163a3c910ea266fc01ec2ac9d0ea7e069b5da30 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision a1ec18ad915ff2d73735b2fb00ef7f7a55ec0ed1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 2163a3c910ea266fc01ec2ac9d0ea7e069b5da30) @@ -632,7 +632,7 @@ } @Override - public List getReflectionList(Long contentId, boolean isEscapeText) { + public List getReflectionList(Long contentId) { ArrayList reflections = new ArrayList(); // get all available leaders associated with this content as only leaders have reflections @@ -650,9 +650,7 @@ ReflectDTO reflectDTO = new ReflectDTO(user); reflectDTO.setGroupName(session.getSessionName()); String reflection = notebookEntry.getEntry(); - if (isEscapeText) { - reflection = StringEscapeUtils.escapeJavaScript(reflection); - } + reflection = StringEscapeUtils.escapeJavaScript(reflection); reflectDTO.setReflection(reflection); reflectDTO.setIsGroupLeader(session.isUserGroupLeader(leader.getUid())); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -ra1ec18ad915ff2d73735b2fb00ef7f7a55ec0ed1 -r2163a3c910ea266fc01ec2ac9d0ea7e069b5da30 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision a1ec18ad915ff2d73735b2fb00ef7f7a55ec0ed1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 2163a3c910ea266fc01ec2ac9d0ea7e069b5da30) @@ -455,7 +455,7 @@ // Create reflectList if reflection is enabled. if (isReflectOnActivity) { List reflections = LearningAction.service.getReflectionList(toolSession.getScratchie() - .getContentId(), false); + .getContentId()); // remove current session leader reflection Iterator refIterator = reflections.iterator(); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r2163a3c910ea266fc01ec2ac9d0ea7e069b5da30 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 2163a3c910ea266fc01ec2ac9d0ea7e069b5da30) @@ -134,7 +134,7 @@ // Create reflectList if reflection is enabled. if (scratchie.isReflectOnActivity()) { - List reflections = service.getReflectionList(contentId, true); + List reflections = service.getReflectionList(contentId); sessionMap.put(ScratchieConstants.ATTR_REFLECTIONS, reflections); } Index: lams_tool_scratchie/web/pages/learning/results.jsp =================================================================== diff -u -rb88cfcacfc98572e23f6040a7a4ed4060b58a1fc -r2163a3c910ea266fc01ec2ac9d0ea7e069b5da30 --- lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision b88cfcacfc98572e23f6040a7a4ed4060b58a1fc) +++ lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 2163a3c910ea266fc01ec2ac9d0ea7e069b5da30) @@ -1,23 +1,75 @@ <%@ include file="/common/taglibs.jsp"%> - <%-- param has higher level for request attribute --%> - - - - + +<%-- param has higher level for request attribute --%> + + + + + + + + - - - - - <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> + + + + + +