Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r567af22fafd6a56534cc071f3650eda4495d05ef -r007cc263f66ed201eb1f7585dcfc5d8f85f9329f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 567af22fafd6a56534cc071f3650eda4495d05ef) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 007cc263f66ed201eb1f7585dcfc5d8f85f9329f) @@ -1973,8 +1973,8 @@ reflectionDTO.setSessionId(mcSession.getMcSessionId().toString()); reflectionDTO.setUserName(user.getFullname()); reflectionDTO.setReflectionUid(notebookEntry.getUid().toString()); - String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); - reflectionDTO.setEntry(notebookEntryPresentable); + // String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); + reflectionDTO.setEntry(notebookEntry.getEntry()); reflectionsContainerDTO.add(reflectionDTO); } } @@ -1996,8 +1996,8 @@ reflectionDTO.setSessionId(mcSession.getMcSessionId().toString()); reflectionDTO.setUserName(user.getFullname()); reflectionDTO.setReflectionUid(notebookEntry.getUid().toString()); - String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); - reflectionDTO.setEntry(notebookEntryPresentable); + // String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); + reflectionDTO.setEntry(notebookEntry.getEntry()); reflectionsContainerDTO.add(reflectionDTO); } } @@ -2092,4 +2092,4 @@ return getMcOutputFactory().getSupportedDefinitionClasses(definitionType); } -} \ No newline at end of file +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r007cc263f66ed201eb1f7585dcfc5d8f85f9329f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision 007cc263f66ed201eb1f7585dcfc5d8f85f9329f) @@ -356,8 +356,8 @@ mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString()); - String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); - mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); + //String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); + mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); mcGeneralLearnerFlowDTO.setLatestAttemptMark(mcQueUsr.getLastAttemptTotalMark()); @@ -417,8 +417,8 @@ mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString()); - String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); - mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); + // String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); + mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); @@ -505,15 +505,13 @@ mcGeneralLearnerFlowDTO.setAttemptMap(attemptMap); mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString()); - String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); - mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); + // String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); + mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, McAppConstants.MY_SIGNATURE, new Integer(mcQueUsr.getQueUsrId().intValue())); if (notebookEntry != null) { - String notebookEntryPresentable = notebookEntry.getEntry(); - notebookEntryPresentable = McUtils.replaceNewLines(notebookEntryPresentable); - mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); + mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); } mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); @@ -581,8 +579,8 @@ mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString()); - String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); - mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); + //String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); + mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); @@ -699,11 +697,8 @@ McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = new McGeneralLearnerFlowDTO(); mcGeneralLearnerFlowDTO.setActivityTitle(mcContent.getTitle()); - String reflectionSubject = mcContent.getReflectionSubject(); + mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); - reflectionSubject = McUtils.replaceNewLines(reflectionSubject); - mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); - String userID = ""; HttpSession ss = SessionManager.getSession(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== diff -u -rd66da54e1b79ff5493ac331ec290649184965a7e -r007cc263f66ed201eb1f7585dcfc5d8f85f9329f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision d66da54e1b79ff5493ac331ec290649184965a7e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 007cc263f66ed201eb1f7585dcfc5d8f85f9329f) @@ -185,16 +185,16 @@ Boolean displayAnswers = mcContent.isDisplayAnswers(); mcGeneralLearnerFlowDTO.setDisplayAnswers(displayAnswers.toString()); mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString()); - String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); - mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); + // String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); + mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); String userID = mcLearningForm.getUserID(); NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, McAppConstants.MY_SIGNATURE, new Integer(userID)); if (notebookEntry != null) { - String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); - mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); + // String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); + mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); } request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r007cc263f66ed201eb1f7585dcfc5d8f85f9329f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 007cc263f66ed201eb1f7585dcfc5d8f85f9329f) @@ -2473,8 +2473,8 @@ McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = new McGeneralLearnerFlowDTO(); if (notebookEntry != null) { - String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); - mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); + // String notebookEntryPresentable = McUtils.replaceNewLines(notebookEntry.getEntry()); + mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); mcGeneralLearnerFlowDTO.setUserName(userName); }