Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v diff -u -r1.18 -r1.19 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java 24 Sep 2013 16:49:11 -0000 1.18 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java 6 Oct 2013 12:56:13 -0000 1.19 @@ -305,9 +305,10 @@ * 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); + List getReflectionList(Long contentId, boolean isEscapeText); /** * Get user by UID Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.27 -r1.28 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 24 Sep 2013 16:49:11 -0000 1.27 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 6 Oct 2013 12:56:13 -0000 1.28 @@ -874,7 +874,7 @@ } @Override - public List getReflectionList(Long contentId) { + public List getReflectionList(Long contentId, boolean isEscapeText) { ArrayList reflections = new ArrayList(); // get all available leaders associated with this content as only leaders have reflections @@ -887,8 +887,11 @@ ScratchieConstants.TOOL_SIGNATURE, leader.getUserId().intValue()); if ((notebookEntry != null) && StringUtils.isNotBlank(notebookEntry.getEntry())) { ReflectDTO reflectDTO = new ReflectDTO(notebookEntry.getUser()); - String reflection = StringEscapeUtils.escapeJavaScript(notebookEntry.getEntry()); reflectDTO.setGroupName(session.getSessionName()); + String reflection = notebookEntry.getEntry(); + if (isEscapeText) { + reflection = StringEscapeUtils.escapeJavaScript(reflection); + } reflectDTO.setReflection(reflection); reflectDTO.setIsGroupLeader(this.isUserGroupLeader(leader, session)); 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.20 -r1.21 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 24 Sep 2013 16:49:12 -0000 1.20 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 6 Oct 2013 12:56:13 -0000 1.21 @@ -365,7 +365,7 @@ // Create reflectList if reflection is enabled. boolean isReflectOnActivity = (Boolean) sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ON); if (isReflectOnActivity) { - List reflections = service.getReflectionList(toolSession.getScratchie().getContentId()); + List reflections = service.getReflectionList(toolSession.getScratchie().getContentId(), false); //remove current session leader reflection Iterator refIterator = reflections.iterator(); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v diff -u -r1.15 -r1.16 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 24 Sep 2013 16:49:12 -0000 1.15 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 6 Oct 2013 12:56:13 -0000 1.16 @@ -116,7 +116,7 @@ // Create reflectList if reflection is enabled. if (scratchie.isReflectOnActivity()) { - List reflections = service.getReflectionList(contentId); + List reflections = service.getReflectionList(contentId, true); sessionMap.put(ScratchieConstants.ATTR_REFLECTIONS, reflections); } Index: lams_tool_scratchie/web/pages/learning/results.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_scratchie/web/pages/learning/results.jsp 24 Sep 2013 16:49:12 -0000 1.6 +++ lams_tool_scratchie/web/pages/learning/results.jsp 6 Oct 2013 12:56:13 -0000 1.7 @@ -84,7 +84,7 @@
- ${reflectDTO.groupName}: ${reflectDTO.reflection} + ${reflectDTO.groupName}: