Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java,v diff -u -r1.7 -r1.8 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java 5 Sep 2006 21:50:22 -0000 1.7 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java 6 Sep 2006 09:54:45 -0000 1.8 @@ -348,6 +348,10 @@ .append("questionListingMode: ", questionListingMode) .append("learnerProgress: ", learnerProgress) .append("reportViewOnly: ", reportViewOnly) + .append("reflection: ", reflection) + .append("reflectionSubject: ", reflectionSubject) + .append("notebookEntry: ", notebookEntry) + .append("notebookEntriesVisible: ", notebookEntriesVisible) .toString(); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v diff -u -r1.45 -r1.46 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 31 Aug 2006 10:37:51 -0000 1.45 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 6 Sep 2006 09:54:45 -0000 1.46 @@ -65,7 +65,17 @@ IMcService mcService=(IMcService)request.getSession().getAttribute(TOOL_SERVICE); return mcService; } + + public static String replaceNewLines(String text) + { + logger.debug("using text: " + text); + String newText = text.replaceAll("\n","
"); + logger.debug("newText: " + newText); + + return newText; + } + /** * * getGMTDateTime(HttpServletRequest request) 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.41 -r1.42 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 5 Sep 2006 21:50:23 -0000 1.41 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 6 Sep 2006 09:54:45 -0000 1.42 @@ -1355,7 +1355,8 @@ logger.debug("notebookEntry: " + notebookEntry); if (notebookEntry != null) { - mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); + String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry()); + mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); } 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.66 -r1.67 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 5 Sep 2006 21:50:23 -0000 1.66 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 6 Sep 2006 09:54:45 -0000 1.67 @@ -352,8 +352,11 @@ logger.debug("isRunOffline: " + isRunOffline); if (isRunOffline == true) { - McUtils.cleanUpSessionAbsolute(request); - logger.debug("warning to learner: the activity is offline."); + logger.debug("the activity is offline."); + logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO)); + + //McUtils.cleanUpSessionAbsolute(request); + logger.debug("fwding to :" + RUN_OFFLINE); return (mapping.findForward(RUN_OFFLINE)); } @@ -363,7 +366,7 @@ logger.debug("isDefineLater: " + isDefineLater); if (isDefineLater == true) { - McUtils.cleanUpSessionAbsolute(request); + //McUtils.cleanUpSessionAbsolute(request); logger.debug("fwding to :" + DEFINE_LATER); return (mapping.findForward(DEFINE_LATER)); } @@ -491,6 +494,7 @@ protected void commonContentSetup(HttpServletRequest request, McContent mcContent, IMcService mcService, McLearningForm mcLearningForm, String toolSessionID) { + logger.debug("dettingcommon content: "); Map mapQuestionsContent= new TreeMap(new McComparator()); List listQuestionAndCandidateAnswersDTO=LearningUtil.buildQuestionAndCandidateAnswersDTO(request, mcContent, mcService); @@ -520,7 +524,9 @@ logger.debug("notebookEntry: " + notebookEntry); if (notebookEntry != null) { - mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); + + String notebookEntryPresentable=McUtils.replaceNewLines(notebookEntry.getEntry()); + mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); }