Index: lams_tool_laqa/db/model/lams_tool_qa.clay =================================================================== diff -u -r792f3d848039cb49080fbaf49d9bc2b2d461943e -r48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f --- lams_tool_laqa/db/model/lams_tool_qa.clay (.../lams_tool_qa.clay) (revision 792f3d848039cb49080fbaf49d9bc2b2d461943e) +++ lams_tool_laqa/db/model/lams_tool_qa.clay (.../lams_tool_qa.clay) (revision 48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f) @@ -95,7 +95,7 @@ - + @@ -123,18 +123,16 @@ - + - - - + + - + - - - + + @@ -150,11 +148,11 @@ - + - + @@ -242,18 +240,16 @@ - + - - - + + - + - - - + + @@ -266,8 +262,8 @@ - + @@ -376,11 +372,10 @@ - + - - - + + Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== diff -u -r97996dd131849a892a31a75ce742e7df0804c322 -r48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 97996dd131849a892a31a75ce742e7df0804c322) +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f) @@ -1,28 +1,26 @@ --- $Id$ - -CREATE TABLE lams.tl_laqa11_content ( +CREATE TABLE tl_laqa11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , qa_content_id BIGINT(20) NOT NULL - , title VARCHAR(250) NOT NULL DEFAULT 'Questions and Answers' - , instructions VARCHAR(250) NOT NULL DEFAULT 'Please answer the following questions.' + , title TEXT + , instructions TEXT , creation_date VARCHAR(100) , update_date DATETIME , questions_sequenced TINYINT(1) NOT NULL DEFAULT 0 , username_visible TINYINT(1) NOT NULL DEFAULT 0 - , monitoring_report_title VARCHAR(100) DEFAULT 'Learner Results' + , monitoring_report_title VARCHAR(100) DEFAULT 'Combined Learner Results' , report_title VARCHAR(100) DEFAULT 'Report' , created_by BIGINT(20) NOT NULL DEFAULT 0 , 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(250) DEFAULT 'offline instructions' - , online_instructions VARCHAR(250) DEFAULT 'online instructions' + , offline_instructions TEXT + , online_instructions TEXT , end_learning_message VARCHAR(150) DEFAULT 'Thank you!' , content_inUse TINYINT(1) DEFAULT 0 , PRIMARY KEY (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_laqa11_session ( +CREATE TABLE tl_laqa11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , qa_session_id BIGINT(20) NOT NULL , session_start_date DATETIME @@ -33,10 +31,10 @@ , PRIMARY KEY (uid) , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (qa_content_id) - REFERENCES lams.tl_laqa11_content (uid) + REFERENCES tl_laqa11_content (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_laqa11_que_usr ( +CREATE TABLE tl_laqa11_que_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , que_usr_id BIGINT(20) NOT NULL , username VARCHAR(100) @@ -45,21 +43,21 @@ , PRIMARY KEY (uid) , INDEX (qa_session_id) , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (qa_session_id) - REFERENCES lams.tl_laqa11_session (uid) + REFERENCES tl_laqa11_session (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_laqa11_que_content ( +CREATE TABLE tl_laqa11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , question VARCHAR(255) + , question TEXT , display_order INT(5) , qa_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id) - REFERENCES lams.tl_laqa11_content (uid) + REFERENCES tl_laqa11_content (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_laqa11_usr_resp ( +CREATE TABLE tl_laqa11_usr_resp ( response_id BIGINT(20) NOT NULL AUTO_INCREMENT , hidden TINYINT(1) DEFAULT 0 , answer VARCHAR(255) @@ -70,13 +68,13 @@ , PRIMARY KEY (response_id) , INDEX (que_usr_id) , CONSTRAINT FK_tl_laqa11_usr_resp_3 FOREIGN KEY (que_usr_id) - REFERENCES lams.tl_laqa11_que_usr (uid) + REFERENCES tl_laqa11_que_usr (uid) , INDEX (qa_que_content_id) , CONSTRAINT FK_tl_laqa11_usr_resp_2 FOREIGN KEY (qa_que_content_id) - REFERENCES lams.tl_laqa11_que_content (uid) + REFERENCES tl_laqa11_que_content (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_laqa11_uploadedfile ( +CREATE TABLE tl_laqa11_uploadedfile ( submissionId BIGINT(20) NOT NULL AUTO_INCREMENT , uuid VARCHAR(255) NOT NULL , isOnline_File TINYINT(1) NOT NULL @@ -85,11 +83,13 @@ , PRIMARY KEY (submissionId) , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_uploadedfile_1 FOREIGN KEY (qa_content_id) - REFERENCES lams.tl_laqa11_content (uid) + REFERENCES tl_laqa11_content (uid) )TYPE=InnoDB; + -- data for content table INSERT INTO tl_laqa11_content (qa_content_id, creation_date) VALUES (${default_content_id}, NOW()); -- data for content questions table -INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the capital of Russia?',1,1); +INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the largest continent in the world?',1,1); + Index: lams_tool_laqa/db/sql/drop_lams_tool_qa.sql =================================================================== diff -u -r97996dd131849a892a31a75ce742e7df0804c322 -r48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f --- lams_tool_laqa/db/sql/drop_lams_tool_qa.sql (.../drop_lams_tool_qa.sql) (revision 97996dd131849a892a31a75ce742e7df0804c322) +++ lams_tool_laqa/db/sql/drop_lams_tool_qa.sql (.../drop_lams_tool_qa.sql) (revision 48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f) @@ -1,10 +1,15 @@ --- $Id$ SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS tl_laqa11_usr_resp; -DROP TABLE IF EXISTS tl_laqa11_que_usr; -DROP TABLE IF EXISTS tl_laqa11_que_content; -DROP TABLE IF EXISTS tl_laqa11_session; -DROP TABLE IF EXISTS tl_laqa11_uploadedFile; -DROP TABLE IF EXISTS tl_laqa11_content; -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +DROP TABLE tl_laqa11_uploadedfile; +DROP TABLE tl_laqa11_usr_resp; +DROP TABLE tl_laqa11_que_content; +DROP TABLE tl_laqa11_que_usr; +DROP TABLE tl_laqa11_session; +DROP TABLE tl_laqa11_content; +SET FOREIGN_KEY_CHECKS=1; + + + + + + Index: lams_tool_laqa/db/sql/insert_tool_qa_data.sql =================================================================== diff -u -r97996dd131849a892a31a75ce742e7df0804c322 -r48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f --- lams_tool_laqa/db/sql/insert_tool_qa_data.sql (.../insert_tool_qa_data.sql) (revision 97996dd131849a892a31a75ce742e7df0804c322) +++ lams_tool_laqa/db/sql/insert_tool_qa_data.sql (.../insert_tool_qa_data.sql) (revision 48cbfb560fbb7e9865f8f21b2787f1dba32d7a6f) @@ -3,20 +3,3 @@ -- test data for content table -- test data for content table -INSERT INTO tl_laqa11_content (qa_content_id, - creation_date - ) -VALUES (10, - NOW()); - - - --- test data for content questions table -INSERT INTO tl_laqa11_que_content (qa_que_content_id, - question, - display_order, - qa_content_id) VALUES (20,'What is the name of this activity?',1,10); - - - -