Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/model/lams_tool_mc.clay,v
diff -u -r1.30 -r1.31
--- lams_tool_lamc/db/model/lams_tool_mc.clay 19 Jun 2006 15:09:53 -0000 1.30
+++ lams_tool_lamc/db/model/lams_tool_mc.clay 9 Aug 2006 12:53:09 -0000 1.31
@@ -37,13 +37,13 @@
-
+
-
+
@@ -629,8 +629,8 @@
-
+
Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/create_lams_tool_mc.sql,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql 19 Jun 2006 15:09:53 -0000 1.11
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql 9 Aug 2006 12:53:09 -0000 1.12
@@ -1,8 +1,8 @@
CREATE TABLE tl_lamc11_content (
uid BIGINT(20) NOT NULL AUTO_INCREMENT
, content_id BIGINT(20) NOT NULL
- , title TEXT NOT NULL
- , instructions TEXT NOT NULL
+ , title TEXT
+ , instructions TEXT
, creation_date DATETIME
, update_date DATETIME
, questions_sequenced TINYINT(1) NOT NULL DEFAULT 0
@@ -115,7 +115,7 @@
)TYPE=InnoDB;
-INSERT INTO tl_lamc11_content(uid, content_id , title , instructions , creation_date , questions_sequenced , username_visible , created_by , monitoring_report_title , report_title , run_offline , define_later, synch_in_monitor, offline_instructions, online_instructions, end_learning_message, content_in_use, retries, show_feedback, show_report, pass_mark) VALUES (1, ${default_content_id} ,'MCQ Title','MCQ Instructions', NOW(), 0, 0,1,'Monitoring Report','Report', 0, 0, 0,'offline instructions','online instructions','Finished Activity...', 0, 0, 0, 0, 50);
+INSERT INTO tl_lamc11_content(uid, content_id , creation_date , questions_sequenced , username_visible , created_by , monitoring_report_title , report_title , run_offline , define_later, synch_in_monitor, offline_instructions, online_instructions, end_learning_message, content_in_use, retries, show_feedback, show_report, pass_mark) VALUES (1, ${default_content_id} , NOW(), 0, 0,1,'Monitoring Report','Report', 0, 0, 0,'offline instructions','online instructions','Finished Activity...', 0, 0, 0, 0, 50);
INSERT INTO tl_lamc11_que_content (uid,question, weight, disabled, display_order, mc_content_id, feedbackIncorrect, feedbackCorrect) VALUES (1, 'A Sample question?', 100, 0, 1,1, 'Your answer is incorrect', 'Correct');
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.113 -r1.114
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 21 Jul 2006 20:09:32 -0000 1.113
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 9 Aug 2006 12:53:09 -0000 1.114
@@ -2155,7 +2155,8 @@
String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS);
logger.debug("richTextInstructions: " + richTextInstructions);
-
+
+ /*
if ((richTextTitle == null) || (richTextTitle.length() == 0) || richTextTitle.equalsIgnoreCase(RICHTEXT_BLANK))
{
errors.add(Globals.ERROR_KEY,new ActionMessage("error.title"));
@@ -2167,10 +2168,11 @@
errors.add(Globals.ERROR_KEY, new ActionMessage("error.instructions"));
logger.debug("add instructions to ActionMessages: ");
}
+ */
if (errors.size() > 0)
{
- logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:");
+ //logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:");
mcAuthoringForm.setEditOptionsMode(new Integer(0).toString());
request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
logger.debug("setting EDIT_OPTIONS_MODE to 0");
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.35 -r1.36
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 30 Jul 2006 22:27:23 -0000 1.35
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 9 Aug 2006 12:53:09 -0000 1.36
@@ -1252,7 +1252,7 @@
logger.debug("mcLearningForm :" + mcLearningForm);
prepareViewAnswersData(mapping, mcLearningForm, request, response);
- logger.debug("post prepareViewAnswersData f");
+ logger.debug("post prepareViewAnswersData");
return (mapping.findForward(VIEW_ANSWERS));
}
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.77 -r1.78
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 21 Jul 2006 20:09:31 -0000 1.77
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 9 Aug 2006 12:53:09 -0000 1.78
@@ -652,8 +652,25 @@
mcAuthoringForm.resetRadioBoxes();
logger.debug("all radioboxes are reset");
- request.getSession().setAttribute(RICHTEXT_TITLE,mcContent.getTitle());
- request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,mcContent.getInstructions());
+ if (mcContent.getTitle() == null)
+ {
+ request.getSession().setAttribute(RICHTEXT_TITLE,"MCQ Title");
+ }
+ else
+ {
+ request.getSession().setAttribute(RICHTEXT_TITLE,mcContent.getTitle());
+ }
+
+ if (mcContent.getInstructions() == null)
+ {
+ request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,"MCQ Instructions");
+ }
+ else
+ {
+ request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS,mcContent.getInstructions());
+ }
+
+
request.getSession().setAttribute(DEFINE_LATER, new Boolean(mcContent.isDefineLater()));
request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,mcContent.getOfflineInstructions());
request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,mcContent.getOnlineInstructions());
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.23 -r1.24
--- lams_tool_lamc/web/learning/ViewAnswers.jsp 30 Jul 2006 22:27:24 -0000 1.23
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp 9 Aug 2006 12:53:09 -0000 1.24
@@ -167,7 +167,6 @@
-
@@ -202,7 +201,6 @@
-