Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v diff -u -r1.9 -r1.10 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 14 Oct 2005 15:50:10 -0000 1.9 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 29 Oct 2005 16:08:08 -0000 1.10 @@ -163,6 +163,14 @@ length="1" /> + + + - + @@ -203,6 +203,19 @@ + + + + + + + + + + + + + @@ -216,7 +229,7 @@ - + Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/create_lams_tool_lamc.sql,v diff -u -r1.15 -r1.16 Binary files differ Index: lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/insert_lams_tool_lamc.sql,v diff -u -r1.5 -r1.6 Binary files differ Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.17 -r1.18 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 29 Oct 2005 14:33:59 -0000 1.17 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 29 Oct 2005 16:08:08 -0000 1.18 @@ -168,6 +168,8 @@ public static final String RICHTEXT_FEEDBACK_INCORRECT ="richTextFeedbackInCorrect"; public static final String RICHTEXT_OFFLINEINSTRUCTIONS ="richTextOfflineInstructions"; public static final String RICHTEXT_ONLINEINSTRUCTIONS ="richTextOnlineInstructions"; + public static final String RICHTEXT_REPORT_TITLE ="richTextReportTitle"; + public static final String RICHTEXT_END_LEARNING_MSG ="richTextEndLearningMsg"; public static final String RICHTEXT_TITLE ="richTextTitle"; public static final String RICHTEXT_INSTRUCTIONS ="richTextInstructions"; public static final String RICHTEXT_BLANK ="

 

"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McContent.java,v diff -u -r1.6 -r1.7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java 11 Oct 2005 11:35:27 -0000 1.6 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java 29 Oct 2005 16:08:08 -0000 1.7 @@ -91,6 +91,8 @@ /** nullable persistent field */ private boolean retries; + private boolean showReport; + /** nullable persistent field */ private Integer passMark; @@ -403,4 +405,16 @@ this.retries = retries; } + /** + * @return Returns the showReport. + */ + public boolean isShowReport() { + return showReport; + } + /** + * @param showReport The showReport to set. + */ + public void setShowReport(boolean showReport) { + this.showReport = showReport; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McResources.properties,v diff -u -r1.19 -r1.20 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties 29 Oct 2005 14:33:59 -0000 1.19 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties 29 Oct 2005 16:08:08 -0000 1.20 @@ -36,9 +36,8 @@ label.candidateAnswers =Candidate Answers label.isCorrect =Correct? -label.report.title =Report Title + label.monitoringReport.title =Monitoring Report Title -label.report.endLearningMessage =End of Activity Message label.question.only =Question label.question =Question: label.question1 =Question 1 @@ -48,8 +47,12 @@ radiobox.usernameVisible =Username Visible radiobox.questionsSequenced =Questions Sequenced radiobox.passmark =Pass Mark -radiobox.retries =Retries radiobox.showFeedback =Show Feedback +radiobox.sln =Show Learner's Report +radiobox.onepq =1 page per question +radiobox.retries =Allow Retries +label.report.title =Report Title +label.report.endLearningMessage =End of Activity Message label.offlineInstructions =Offline Instructions label.onlineInstructions =Online Instructions 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.7 -r1.8 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 28 Oct 2005 19:15:47 -0000 1.7 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 29 Oct 2005 16:08:08 -0000 1.8 @@ -236,13 +236,7 @@ String richTextInstructions=request.getParameter(RICHTEXT_INSTRUCTIONS); logger.debug("read parameter richTextInstructions: " + richTextInstructions); - String richTextFeedbackCorrect=request.getParameter(RICHTEXT_FEEDBACK_CORRECT); - logger.debug("read parameter richTextFeedbackCorrect: " + richTextFeedbackCorrect); - String richTextFeedbackInCorrect=request.getParameter(RICHTEXT_FEEDBACK_INCORRECT); - logger.debug("read parameter richTextFeedbackInCorrect: " + richTextFeedbackInCorrect); - - if ((richTextTitle != null) && (richTextTitle.length() > 0)) { request.getSession().setAttribute(RICHTEXT_TITLE,richTextTitle); @@ -253,6 +247,12 @@ request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,richTextInstructions); } + String richTextFeedbackCorrect=request.getParameter(RICHTEXT_FEEDBACK_CORRECT); + logger.debug("read parameter richTextFeedbackCorrect: " + richTextFeedbackCorrect); + + String richTextFeedbackInCorrect=request.getParameter(RICHTEXT_FEEDBACK_INCORRECT); + logger.debug("read parameter richTextFeedbackInCorrect: " + richTextFeedbackInCorrect); + if ((richTextFeedbackCorrect != null) && (richTextFeedbackCorrect.length() > 0)) { request.getSession().setAttribute(RICHTEXT_FEEDBACK_CORRECT,richTextFeedbackCorrect); @@ -262,8 +262,23 @@ { request.getSession().setAttribute(RICHTEXT_FEEDBACK_INCORRECT,richTextFeedbackInCorrect); } - + + String richTextReportTitle=request.getParameter(RICHTEXT_REPORT_TITLE); + logger.debug("read parameter richTextReportTitle: " + richTextReportTitle); + + String richTextEndLearningMessage=request.getParameter(RICHTEXT_END_LEARNING_MSG); + logger.debug("read parameter richTextEndLearningMessage: " + richTextEndLearningMessage); + + if ((richTextReportTitle != null) && (richTextReportTitle.length() > 0)) + { + request.getSession().setAttribute(RICHTEXT_REPORT_TITLE,richTextReportTitle); + } + + if ((richTextEndLearningMessage != null) && (richTextEndLearningMessage.length() > 0)) + { + request.getSession().setAttribute(RICHTEXT_END_LEARNING_MSG,richTextEndLearningMessage); + } } public static void addFileToContentRepository(HttpServletRequest request, McAuthoringForm mcAuthoringForm, boolean isOfflineFile) Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.28 -r1.29 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 29 Oct 2005 14:33:59 -0000 1.28 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 29 Oct 2005 16:08:09 -0000 1.29 @@ -438,7 +438,7 @@ logger.debug("richTextFeedbackCorrect: " + richTextFeedbackCorrect); if (richTextFeedbackCorrect == null) richTextFeedbackCorrect=""; request.getSession().setAttribute(RICHTEXT_FEEDBACK_CORRECT,richTextFeedbackCorrect); - + Map mapSelectedOptions= (Map) request.getSession().getAttribute(MAP_SELECTED_OPTIONS); mapSelectedOptions.clear(); @@ -776,6 +776,8 @@ boolean isUsernameVisible=false; boolean isRetries=false; boolean isShowFeedback=false; + boolean isSln=false; + String monitoringReportTitle=""; String reportTitle=""; String endLearningMessage=""; @@ -797,6 +799,10 @@ if (mcAuthoringForm.getRetries().equalsIgnoreCase(ON)) isRetries=true; + logger.debug("isSln" + mcAuthoringForm.getSln()); + if (mcAuthoringForm.getSln().equalsIgnoreCase(ON)) + isSln=true; + logger.debug("passmark: " + mcAuthoringForm.getPassmark()); if (mcAuthoringForm.getPassmark() != null) @@ -893,6 +899,13 @@ String richTextOnlineInstructions=(String) request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS); logger.debug("richTextOnlineInstructions: " + richTextOnlineInstructions); + String richTextReportTitle=(String)request.getSession().getAttribute(RICHTEXT_REPORT_TITLE); + logger.debug("richTextReportTitle: " + richTextReportTitle); + + String richTextEndLearningMessage=(String)request.getSession().getAttribute(RICHTEXT_END_LEARNING_MSG); + logger.debug("richTextEndLearningMessage: " + richTextEndLearningMessage); + + Map mapQuestionsContent=repopulateMap(request, "questionContent"); logger.debug("FINAL mapQuestionsContent after shrinking: " + mapQuestionsContent); logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size()); @@ -917,10 +930,11 @@ mcContent.setRetries(isRetries); mcContent.setPassMark(new Integer(passmark)); mcContent.setShowFeedback(isShowFeedback); + mcContent.setShowReport(isSln); mcContent.setEndLearningMessage(endLearningMessage); - mcContent.setReportTitle(reportTitle); + mcContent.setReportTitle(richTextReportTitle); mcContent.setMonitoringReportTitle(monitoringReportTitle); - mcContent.setEndLearningMessage(endLearningMessage); + mcContent.setEndLearningMessage(richTextEndLearningMessage); mcContent.setOfflineInstructions(richTextOfflineInstructions); mcContent.setOnlineInstructions(richTextOnlineInstructions); } @@ -994,6 +1008,7 @@ userAction="advancedTabDone"; request.setAttribute(USER_ACTION, userAction); logger.debug("userAction:" + userAction); + mcAuthoringForm.resetUserAction(); return (mapping.findForward(LOAD_QUESTIONS)); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v diff -u -r1.14 -r1.15 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 28 Oct 2005 19:15:47 -0000 1.14 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 29 Oct 2005 16:08:09 -0000 1.15 @@ -77,6 +77,8 @@ protected String synchInMonitor; protected String showFeedback; protected String retries; + protected String sln; + protected String passmark; @@ -175,6 +177,7 @@ this.questionsSequenced=null; this.showFeedback=null; this.retries=null; + this.sln=null; this.passmark=null; this.summaryMonitoring=null; @@ -187,11 +190,11 @@ public void resetRadioBoxes() { this.synchInMonitor =OPTION_OFF; - this.usernameVisible =OPTION_OFF; this.questionsSequenced =OPTION_OFF; - this.retries =OPTION_OFF; + this.sln =OPTION_OFF; this.showFeedback =OPTION_OFF; + this.usernameVisible =OPTION_OFF; } @@ -813,4 +816,16 @@ public void setDeletableOptionIndex(String deletableOptionIndex) { this.deletableOptionIndex = deletableOptionIndex; } + /** + * @return Returns the sln. + */ + public String getSln() { + return sln; + } + /** + * @param sln The sln to set. + */ + public void setSln(String sln) { + this.sln = sln; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v diff -u -r1.16 -r1.17 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 29 Oct 2005 14:33:59 -0000 1.16 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 29 Oct 2005 16:08:09 -0000 1.17 @@ -333,9 +333,10 @@ request.getSession().setAttribute(RETRIES, new Boolean(mcContent.isRetries())); request.getSession().setAttribute(PASSMARK, mcContent.getPassMark()); //Integer request.getSession().setAttribute(SHOW_FEEDBACK, new Boolean(mcContent.isShowFeedback())); - + request.getSession().setAttribute(RICHTEXT_REPORT_TITLE,mcContent.getReportTitle()); + request.getSession().setAttribute(RICHTEXT_END_LEARNING_MSG,mcContent.getEndLearningMessage()); - McUtils.setDefaultSessionAttributes(request, mcContent, mcAuthoringForm); + McUtils.setDefaultSessionAttributes(request, mcContent, mcAuthoringForm); logger.debug("PASSMARK:" + request.getSession().getAttribute(PASSMARK)); Index: lams_tool_lamc/web/AdvancedContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/AdvancedContent.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/web/AdvancedContent.jsp 28 Oct 2005 19:15:46 -0000 1.2 +++ lams_tool_lamc/web/AdvancedContent.jsp 29 Oct 2005 16:08:08 -0000 1.3 @@ -8,37 +8,22 @@
- - - - - - - - - - - + : + + - - - - - - + @@ -114,7 +80,10 @@ - +
- : + : - + - +
- : - - - - - - - - -
- : + : @@ -67,45 +52,26 @@
- : - - - - - - - - -
- : - - + + + +
- : - - -
: - - + + + +
+ +    + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/web/DELEETTHISeditOptionsContent.jsp'. Fisheye: No comparison available. Pass `N' to diff?