Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.124 -r1.125 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 11 Feb 2014 14:00:06 -0000 1.124 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 3 Apr 2014 03:39:00 -0000 1.125 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v diff -u -r1.80 -r1.81 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 8 Jan 2014 17:49:42 -0000 1.80 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 3 Apr 2014 03:39:00 -0000 1.81 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v diff -u -r1.87 -r1.88 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 29 Jan 2014 20:22:12 -0000 1.87 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 3 Apr 2014 03:39:00 -0000 1.88 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v diff -u -r1.56 -r1.57 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 17 Jan 2014 22:04:48 -0000 1.56 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 3 Apr 2014 03:39:00 -0000 1.57 @@ -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); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.103 -r1.104 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 28 Mar 2014 21:24:08 -0000 1.103 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 3 Apr 2014 03:29:41 -0000 1.104 @@ -765,8 +765,8 @@ Date postedDate = (notebookEntry.getLastModified() != null) ? notebookEntry.getLastModified() : notebookEntry.getCreateDate(); reflectionDTO.setDate(postedDate); - String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); - reflectionDTO.setEntry(notebookEntryPresentable); + // String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); + reflectionDTO.setEntry(notebookEntry.getEntry()); reflectionDTOs.add(reflectionDTO); } } @@ -791,8 +791,8 @@ Date postedDate = (notebookEntry.getLastModified() != null) ? notebookEntry .getLastModified() : notebookEntry.getCreateDate(); reflectionDTO.setDate(postedDate); - String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); - reflectionDTO.setEntry(notebookEntryPresentable); + // String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); + reflectionDTO.setEntry(notebookEntry.getEntry()); reflectionDTOs.add(reflectionDTO); } } @@ -1485,4 +1485,4 @@ public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getQaOutputFactory().getSupportedDefinitionClasses(definitionType); } -} \ No newline at end of file +} Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v diff -u -r1.54 -r1.55 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 31 Mar 2014 15:59:27 -0000 1.54 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 3 Apr 2014 03:29:41 -0000 1.55 @@ -142,8 +142,8 @@ qaMonitoredUserDTO.setSessionId(sessionId.toString()); qaMonitoredUserDTO.setResponse(response.getAnswer()); - String responsePresentable = QaUtils.replaceNewLines(response.getAnswer()); - qaMonitoredUserDTO.setResponsePresentable(responsePresentable); + //String responsePresentable = QaUtils.replaceNewLines(response.getAnswer()); + qaMonitoredUserDTO.setResponsePresentable(response.getAnswer()); qaMonitoredUserDTO.setQuestionUid(questionUid); qaMonitoredUserDTO.setVisible(new Boolean(response.isVisible()).toString()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.48 -r1.49 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 28 Mar 2014 21:24:08 -0000 1.48 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 3 Apr 2014 03:29:41 -0000 1.49 @@ -129,11 +129,11 @@ boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness")); String answerParamName = "answer" + questionIndex + (isTestHarness ? "__textarea" : ""); String answer = request.getParameter(answerParamName); - String answerPresentable = QaUtils.replaceNewLines(answer); + // String answerPresentable = QaUtils.replaceNewLines(answer); String questionIndexString = new Integer(questionIndex).toString(); mapAnswers.put(questionIndexString, answer); - mapAnswersPresentable.put(questionIndexString, answerPresentable); + mapAnswersPresentable.put(questionIndexString, answer); Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner(); QaQuestionDTO dto = questionContentMap.get(questionIndexString); @@ -817,8 +817,8 @@ CoreNotebookConstants.NOTEBOOK_TOOL, QaAppConstants.MY_SIGNATURE, new Integer(userID)); if (notebookEntry != null) { - String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); - qaLearningForm.setEntryText(notebookEntryPresentable); + // String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); + qaLearningForm.setEntryText(notebookEntry.getEntry()); } request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); @@ -901,7 +901,7 @@ GeneralLearnerFlowDTO generalLearnerFlowDTO = new GeneralLearnerFlowDTO(); generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle()); String reflectionSubject = qaContent.getReflectionSubject(); - reflectionSubject = QaUtils.replaceNewLines(reflectionSubject); + // reflectionSubject = QaUtils.replaceNewLines(reflectionSubject); generalLearnerFlowDTO.setReflectionSubject(reflectionSubject); // attempt getting notebookEntry Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.83 -r1.84 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 28 Mar 2014 21:24:08 -0000 1.83 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 3 Apr 2014 03:29:41 -0000 1.84 @@ -197,9 +197,9 @@ NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, MY_SIGNATURE, userId.intValue()); if (notebookEntry != null) { - String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); - qaLearningForm.setEntryText(notebookEntryPresentable); - generalLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); + //String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry()); + qaLearningForm.setEntryText(notebookEntry.getEntry()); + generalLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); } /* Index: lams_tool_laqa/web/learning/Notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Notebook.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_laqa/web/learning/Notebook.jsp 29 Mar 2014 20:02:54 -0000 1.18 +++ lams_tool_laqa/web/learning/Notebook.jsp 3 Apr 2014 03:29:41 -0000 1.19 @@ -45,13 +45,13 @@

- +

- +

-

- -

- -

+

+ + + + + + + +
+ +
+ +
+ Index: lams_tool_laqa/web/learning/mobile/Notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/Notebook.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/web/learning/mobile/Notebook.jsp 6 Jun 2013 14:40:53 -0000 1.4 +++ lams_tool_laqa/web/learning/mobile/Notebook.jsp 3 Apr 2014 03:29:41 -0000 1.5 @@ -41,7 +41,7 @@

- +

@@ -54,7 +54,7 @@

- +

Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp 8 Jan 2014 17:50:54 -0000 1.10 +++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp 3 Apr 2014 03:29:41 -0000 1.11 @@ -286,10 +286,10 @@

- +

-

+

Index: lams_tool_laqa/web/monitoring/Edit.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Edit.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_laqa/web/monitoring/Edit.jsp 28 Mar 2014 21:24:07 -0000 1.10 +++ lams_tool_laqa/web/monitoring/Edit.jsp 3 Apr 2014 03:29:41 -0000 1.11 @@ -4,7 +4,7 @@ <%@ include file="/common/messages.jsp"%> - + Index: lams_tool_laqa/web/monitoring/Reflections.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Reflections.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/web/monitoring/Reflections.jsp 1 Apr 2014 17:02:58 -0000 1.8 +++ lams_tool_laqa/web/monitoring/Reflections.jsp 3 Apr 2014 03:29:41 -0000 1.9 @@ -13,7 +13,7 @@
- + Index: lams_tool_laqa/web/monitoring/Stats.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Stats.jsp,v diff -u -r1.13 -r1.14 --- lams_tool_laqa/web/monitoring/Stats.jsp 28 Mar 2014 21:24:07 -0000 1.13 +++ lams_tool_laqa/web/monitoring/Stats.jsp 3 Apr 2014 03:29:41 -0000 1.14 @@ -1,21 +1,21 @@ <%@ include file="/common/taglibs.jsp"%> - +
- - -
+ - - + +
+ - - + +
\ No newline at end of file +