Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/model/lams_tool_qa.clay,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/db/model/lams_tool_qa.clay	29 Jun 2005 06:12:00 -0000	1.2
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	11 Jul 2005 02:08:04 -0000	1.3
@@ -75,7 +75,7 @@
 </table>
 <table name="tl_laqa11_content" alias="" remarks="">
 <table-description/>
-<table-figure-bounds x="96" y="408" width="215" height="258"/>
+<table-figure-bounds x="96" y="408" width="211" height="245"/>
 <column-list>
 <column name="qa_content_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
 <column-description/>
@@ -90,14 +90,14 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="title" alias="" remarks="" mandatory="false" column-size="100" decimal-digits="0" default-value="Questions and Answers" auto-increment="false">
+<column name="title" alias="" remarks="" mandatory="true" column-size="255" decimal-digits="0" default-value="Questions and Answers" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
 <variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
 </data-type>
 </column>
-<column name="instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="Please, take a minute to answer the following questions." auto-increment="false">
+<column name="instructions" alias="" remarks="" mandatory="true" column-size="255" decimal-digits="0" default-value="Please, take a minute to answer the following questions." auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
@@ -209,40 +209,27 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
-<column name="offline_instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="Please, take a minute to fill in offline instructions." auto-increment="false">
+<column name="offline_instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="offline instructions" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
 <variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
 </data-type>
 </column>
-<column name="online_instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="Please, take a minute to fill in online instructions." auto-increment="false">
+<column name="online_instructions" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="online instructions" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
 <variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
 </data-type>
 </column>
-<column name="end_learning_message" alias="" remarks="" mandatory="false" column-size="150" decimal-digits="0" default-value="Thank you for taking this activity!" auto-increment="false">
+<column name="end_learning_message" alias="" remarks="" mandatory="false" column-size="150" decimal-digits="0" default-value="Thank you!" auto-increment="false">
 <column-description/>
 <data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
 <variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
 <variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
 </data-type>
 </column>
-<column name="qa_session_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
-<column-description/>
-<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
-<variant type-name-pattern="BIGINT"/>
-<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
-<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
-<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
 <column name="content_locked" alias="" remarks="" mandatory="false" column-size="1" decimal-digits="0" default-value="0" auto-increment="false">
 <column-description/>
 <data-type name="TINYINT" jdbc-type="-6" selected-variant-pattern="TINYINT(%n)">
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	29 Jun 2005 06:12:01 -0000	1.5
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	11 Jul 2005 02:08:04 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	8 Jul 2005 03:59:25 -0000	1.8
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	11 Jul 2005 02:08:04 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	8 Jul 2005 03:59:25 -0000	1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	11 Jul 2005 02:08:04 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	8 Jul 2005 03:59:25 -0000	1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	11 Jul 2005 02:08:04 -0000	1.7
@@ -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*/