Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38) +++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -18,8 +18,9 @@ , end_learning_message VARCHAR(150) NOT NULL DEFAULT 'Thank you!' , content_in_use TINYINT(1) NOT NULL DEFAULT 0 , retries TINYINT(1) NOT NULL DEFAULT 0 - , pass_mark INTEGER , show_feedback TINYINT(1) NOT NULL DEFAULT 0 + , pass_mark INTEGER + , show_report TINYINT(1) NOT NULL DEFAULT 0 , UNIQUE UQ_tl_lamc11_content_1 (content_id) , PRIMARY KEY (uid) )TYPE=InnoDB; Index: lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql =================================================================== diff -u -r2535250d78ca2298cbdc24c1bb1bb9a87d9a234c -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql (.../insert_lams_tool_lamc.sql) (revision 2535250d78ca2298cbdc24c1bb1bb9a87d9a234c) +++ lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql (.../insert_lams_tool_lamc.sql) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -19,6 +19,7 @@ , content_in_use , retries , show_feedback + , show_report ) VALUES ( null, @@ -39,6 +40,7 @@ 'End of the activity...', 0, 0, + 0, 0); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -r51e01b8366edffab6310663dbbc8588f3b0929b2 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 51e01b8366edffab6310663dbbc8588f3b0929b2) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r51e01b8366edffab6310663dbbc8588f3b0929b2 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision 51e01b8366edffab6310663dbbc8588f3b0929b2) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r51e01b8366edffab6310663dbbc8588f3b0929b2 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 51e01b8366edffab6310663dbbc8588f3b0929b2) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r51e01b8366edffab6310663dbbc8588f3b0929b2 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision 51e01b8366edffab6310663dbbc8588f3b0929b2) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -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 =================================================================== diff -u -r2dbeea64b0b9925ebfcc5b10ced841ad134a0f38 -r62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 --- lams_tool_lamc/web/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 2dbeea64b0b9925ebfcc5b10ced841ad134a0f38) +++ lams_tool_lamc/web/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3) @@ -8,37 +8,22 @@
- - - - - - - - - - - + : + + - - - - - - + @@ -114,7 +80,10 @@ - +
- : + : - + - +
- : - - - - - - - - -
- : + : @@ -67,45 +52,26 @@
- : - - - - - - - - -
- : - - + + + +
- : - - -
: - - + + + +
+ +    + Fisheye: Tag 62fed58c7feaf586a7f6ae9b6f2aa91fad04e1d3 refers to a dead (removed) revision in file `lams_tool_lamc/web/DELEETTHISeditOptionsContent.jsp'. Fisheye: No comparison available. Pass `N' to diff?