Index: lams_tool_laqa/db/model/lams_tool_qa.clay =================================================================== diff -u -rb7c4250adc416462793208c4393c5befc2dc69c7 -rab01f4417489f903865c8629d5256d7eed0736e5 --- lams_tool_laqa/db/model/lams_tool_qa.clay (.../lams_tool_qa.clay) (revision b7c4250adc416462793208c4393c5befc2dc69c7) +++ lams_tool_laqa/db/model/lams_tool_qa.clay (.../lams_tool_qa.clay) (revision ab01f4417489f903865c8629d5256d7eed0736e5) @@ -75,7 +75,7 @@ - + @@ -90,14 +90,14 @@ - + - + @@ -209,40 +209,27 @@ - + - + - + - - - - - - - - - - - - - Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== diff -u -rb7c4250adc416462793208c4393c5befc2dc69c7 -rab01f4417489f903865c8629d5256d7eed0736e5 --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision b7c4250adc416462793208c4393c5befc2dc69c7) +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision ab01f4417489f903865c8629d5256d7eed0736e5) @@ -1,14 +1,7 @@ -DROP TABLE IF EXISTS lams.tl_laqa11_usr_resp; -DROP TABLE IF EXISTS lams.tl_laqa11_que_usr; -DROP TABLE IF EXISTS lams.tl_laqa11_que_content; -DROP TABLE IF EXISTS lams.tl_laqa11_session; -DROP TABLE IF EXISTS lams.tl_laqa11_content; - - CREATE TABLE lams.tl_laqa11_content ( qa_content_id BIGINT(20) NOT NULL - , title VARCHAR(100) DEFAULT 'Questions and Answers' - , instructions VARCHAR(255) DEFAULT 'Please, take a minute to answer the following questions.' + , title VARCHAR(100) NOT NULL DEFAULT 'Questions and Answers' + , instructions VARCHAR(255) NOT NULL DEFAULT 'Please, take a minute to answer the following questions.' , creation_date VARCHAR(100) , update_date DATETIME , questions_sequenced TINYINT(1) NOT NULL @@ -19,10 +12,9 @@ , run_offline TINYINT(1) DEFAULT 0 , define_later TINYINT(1) NOT NULL DEFAULT 0 , synch_in_monitor TINYINT(1) NOT NULL DEFAULT 0 - , offline_instructions VARCHAR(255) DEFAULT 'Please, take a minute to fill in offline instructions.' - , online_instructions VARCHAR(255) DEFAULT 'Please, take a minute to fill in online instructions.' - , end_learning_message VARCHAR(150) DEFAULT 'Thank you for taking this activity!' - , qa_session_id BIGINT(20) NOT NULL + , offline_instructions VARCHAR(255) DEFAULT 'offline instructions' + , online_instructions VARCHAR(255) DEFAULT 'online instructions' + , end_learning_message VARCHAR(150) DEFAULT 'Thank you!' , content_locked TINYINT(1) DEFAULT 0 , PRIMARY KEY (qa_content_id) )TYPE=InnoDB; @@ -65,8 +57,8 @@ response_id BIGINT(20) NOT NULL , hidden TINYINT(1) DEFAULT 0 , answer VARCHAR(255) - , attempt_time DATETIME , time_zone VARCHAR(255) + , attempt_time DATETIME , que_usr_id BIGINT(20) NOT NULL , qa_que_content_id BIGINT(20) NOT NULL , PRIMARY KEY (response_id) @@ -78,8 +70,6 @@ REFERENCES lams.tl_laqa11_que_usr (que_usr_id) )TYPE=InnoDB; - - -- test data for content table INSERT INTO tl_laqa11_content (qa_content_id, creation_date @@ -96,4 +86,3 @@ - Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -r27a3ba4f41698f83ce6320d5b855329b1addd5eb -rab01f4417489f903865c8629d5256d7eed0736e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision ab01f4417489f903865c8629d5256d7eed0736e5) @@ -158,7 +158,9 @@ request.getSession().setAttribute(TITLE,qaAuthoringForm.getTitle()); request.getSession().setAttribute(INSTRUCTIONS,qaAuthoringForm.getInstructions()); - request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,defaultQaContent.getOfflineInstructions()); + request.getSession().setAttribute(RICHTEXT_TITLE, defaultQaContent.getTitle()); + request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS, defaultQaContent.getInstructions()); + request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,defaultQaContent.getOfflineInstructions()); request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,defaultQaContent.getOnlineInstructions()); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== diff -u -r27a3ba4f41698f83ce6320d5b855329b1addd5eb -rab01f4417489f903865c8629d5256d7eed0736e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision ab01f4417489f903865c8629d5256d7eed0736e5) @@ -366,8 +366,8 @@ /** create a new qa content and leave the default content intact*/ QaContent qa = new QaContent(); qa.setQaContentId(new Long(toolContentId)); - qa.setTitle(qaAuthoringForm.getTitle()); - qa.setInstructions(qaAuthoringForm.getInstructions()); + qa.setTitle(richTextTitle); + qa.setInstructions(richTextInstructions); qa.setCreationDate(creationDate); /**preserve this from the db*/ qa.setUpdateDate(new Date(System.currentTimeMillis())); /**keep updating this one*/ qa.setCreatedBy(userId); /**make sure we are setting the userId from the User object above*/ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== diff -u -r27a3ba4f41698f83ce6320d5b855329b1addd5eb -rab01f4417489f903865c8629d5256d7eed0736e5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision ab01f4417489f903865c8629d5256d7eed0736e5) @@ -276,7 +276,8 @@ } logger.debug("user action is: " + userAction); - /** add a new question to Map */ + QaUtils.persistRichText(request); + /** add a new question to Map */ if (userAction.equalsIgnoreCase(ADD_NEW_QUESTION)) { request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); @@ -297,7 +298,6 @@ else if (userAction.equalsIgnoreCase(SUBMIT_TAB_DONE)) { logger.debug("user is done with this tab."); - QaUtils.persistRichText(request); qaAuthoringForm.resetUserAction(); return (mapping.findForward(LOAD_QUESTIONS)); }/**submit questions contained in the Map*/ @@ -387,7 +387,6 @@ else { logger.debug("Warning!: Uncatered-for user action: " + userAction); - QaUtils.persistRichText(request); } /**reset all user actions*/