Index: lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql 16 Mar 2016 12:13:15 -0000 1.2.2.1 +++ lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql 27 Feb 2017 14:00:01 -0000 1.2.2.2 @@ -1,16 +1,14 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,help_text, +learning_activity_type_id, +learning_library_id,create_date_time, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null, +('Combined Chat and Scribe','Prepare Group Report', 'Learners to prepare group report, discussing report in chat', -6,null,null,0, -null,${learning_library_id},now(),0, -null,null,null,null, -null,null,null,'images/icon_groupreporting.svg', +6, +${learning_library_id},now(), +'images/icon_groupreporting.svg', 2,0,5, 'org.lamsfoundation.lams.library.chatscribe.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/chatscribe/toolActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/chatscribe/toolActivity1_insert.sql,v diff -u -r1.1.20.1 -r1.1.20.2 --- lams_build/librarypackages/chatscribe/toolActivity1_insert.sql 16 Mar 2016 12:13:15 -0000 1.1.20.1 +++ lams_build/librarypackages/chatscribe/toolActivity1_insert.sql 27 Feb 2017 14:00:01 -0000 1.1.20.2 @@ -1,16 +1,16 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,parent_activity_id,help_text, +learning_activity_type_id, +create_date_time, +tool_id, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Chat Tool','Chat Tool',null,null,${parent_activity_id},'Chat', -1,null,null,0, -null,null,now(),0, -null,null,${tool_id},null, -null,null,null,'tool/lachat11/images/icon_chat.svg', +('Chat Tool','Chat Tool',${parent_activity_id},'Chat', +1, +now(), +${tool_id}, +'tool/lachat11/images/icon_chat.svg', 2,0,2, 'org.lamsfoundation.lams.tool.chat.ApplicationResources'); Index: lams_build/librarypackages/chatscribe/toolActivity2_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/chatscribe/toolActivity2_insert.sql,v diff -u -r1.1.20.1 -r1.1.20.2 --- lams_build/librarypackages/chatscribe/toolActivity2_insert.sql 16 Mar 2016 12:13:15 -0000 1.1.20.1 +++ lams_build/librarypackages/chatscribe/toolActivity2_insert.sql 27 Feb 2017 14:00:01 -0000 1.1.20.2 @@ -1,16 +1,16 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,parent_activity_id,help_text, +learning_activity_type_id, +create_date_time, +tool_id, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Scribe Tool','Scribe Tool',null,null,${parent_activity_id},'Scribe', -1,null,null,0, -null,null,now(),0, -null,null,${tool_id},null, -null,null,null,'tool/lascrb11/images/icon_scribe.svg', +('Scribe Tool','Scribe Tool',${parent_activity_id},'Scribe', +1, +now(), +${tool_id}, +'tool/lascrb11/images/icon_scribe.svg', 2,0,2, 'org.lamsfoundation.lams.tool.scribe.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql 16 Mar 2016 12:12:59 -0000 1.3.2.1 +++ lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql 27 Feb 2017 14:00:01 -0000 1.3.2.2 @@ -1,16 +1,14 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,help_text, +learning_activity_type_id, +learning_library_id,create_date_time, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null, +('Combined Chat and Scribe','Prepare Group Report', 'Learners to prepare group report, discussing report in chat', -6,null,null,0, -null,${learning_library_id},now(),0, -null,null,null,null, -null,null,null,'images/icon_forum_and_scribe.svg', +6, +${learning_library_id},now(), +'images/icon_forum_and_scribe.svg', 2,0,5, 'org.lamsfoundation.lams.library.forumscribe.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/forumscribe/toolActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/forumscribe/toolActivity1_insert.sql,v diff -u -r1.1.20.1 -r1.1.20.2 --- lams_build/librarypackages/forumscribe/toolActivity1_insert.sql 16 Mar 2016 12:12:59 -0000 1.1.20.1 +++ lams_build/librarypackages/forumscribe/toolActivity1_insert.sql 27 Feb 2017 14:00:01 -0000 1.1.20.2 @@ -1,16 +1,16 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,parent_activity_id,help_text, +learning_activity_type_id, +create_date_time, +tool_id, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Forum/Message Board','Forum',null,null,${parent_activity_id},'Forum/Message Board', -1,null,null,0, -null,null,now(),0, -null,null,${tool_id},null, -null,null,null,'tool/lafrum11/images/icon_forum.svg', +('Forum/Message Board','Forum',${parent_activity_id},'Forum/Message Board', +1, +now(), +${tool_id}, +'tool/lafrum11/images/icon_forum.svg', 2,0,2, -'org.lamsfoundation.lams.tool.forum.ApplicationResources'); +'org.lamsfoundation.lams.tool.forum.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/forumscribe/toolActivity2_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/forumscribe/toolActivity2_insert.sql,v diff -u -r1.1.20.1 -r1.1.20.2 --- lams_build/librarypackages/forumscribe/toolActivity2_insert.sql 16 Mar 2016 12:12:59 -0000 1.1.20.1 +++ lams_build/librarypackages/forumscribe/toolActivity2_insert.sql 27 Feb 2017 14:00:01 -0000 1.1.20.2 @@ -1,16 +1,16 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,parent_activity_id,help_text, +learning_activity_type_id, +create_date_time, +tool_id, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Scribe Tool','Scribe Tool',null,null,${parent_activity_id},'Scribe', -1,null,null,0, -null,null,now(),0, -null,null,${tool_id},null, -null,null,null,'tool/lascrb11/images/icon_scribe.svg', +('Scribe Tool','Scribe Tool',${parent_activity_id},'Scribe', +1, +now(), +${tool_id}, +'tool/lascrb11/images/icon_scribe.svg', 2,0,2, 'org.lamsfoundation.lams.tool.scribe.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql 16 Mar 2016 12:12:59 -0000 1.3.2.1 +++ lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql 27 Feb 2017 14:00:01 -0000 1.3.2.2 @@ -1,16 +1,14 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,help_text, +learning_activity_type_id, +learning_library_id,create_date_time, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Combined Share Resources and Forum','Discuss Shared Resources',null,null,null, +('Combined Share Resources and Forum','Discuss Shared Resources', 'Learners to discuss items they have viewed via Share Resources.', -6,null,null,0, -null,${learning_library_id},now(),0, -null,null,null,null, -null,null,null,'images/icon_urlcontentmessageboard.svg', +6, +${learning_library_id},now(), +'images/icon_urlcontentmessageboard.svg', 2,0,5, 'org.lamsfoundation.lams.library.shareresourcesforum.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql,v diff -u -r1.2.20.1 -r1.2.20.2 --- lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql 16 Mar 2016 12:12:59 -0000 1.2.20.1 +++ lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql 27 Feb 2017 14:00:01 -0000 1.2.20.2 @@ -1,16 +1,16 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,parent_activity_id,help_text, +learning_activity_type_id, +create_date_time, +tool_id, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Share Resources','Share Resources',null,null,${parent_activity_id},'Share Resources', -1,null,null,0, -null,null,now(),0, -null,null,${tool_id},null, -null,null,null,'tool/larsrc11/images/icon_rsrc.svg', +('Share Resources','Share Resources',${parent_activity_id},'Share Resources', +1, +now(), +${tool_id}, +'tool/larsrc11/images/icon_rsrc.svg', 2,0,4, 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql,v diff -u -r1.2.20.1 -r1.2.20.2 --- lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql 16 Mar 2016 12:12:59 -0000 1.2.20.1 +++ lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql 27 Feb 2017 14:00:01 -0000 1.2.20.2 @@ -1,16 +1,16 @@ insert into lams_learning_activity -(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text, -learning_activity_type_id,grouping_id,order_id,define_later_flag, -learning_design_id,learning_library_id,create_date_time,run_offline_flag, -max_number_of_options,min_number_of_options,tool_id,tool_content_id, -gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, +(description,title,parent_activity_id,help_text, +learning_activity_type_id, +create_date_time, +tool_id, +library_activity_ui_image, grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values -(null,null,'Forum/Message Board','Forum',null,null,${parent_activity_id},'Forum/Message Board', -1,null,null,0, -null,null,now(),0, -null,null,${tool_id},null, -null,null,null,'tool/lafrum11/images/icon_forum.svg', +('Forum/Message Board','Forum',${parent_activity_id},'Forum/Message Board', +1, +now(), +${tool_id}, +'tool/lafrum11/images/icon_forum.svg', 2,0,2, 'org.lamsfoundation.lams.tool.forum.ApplicationResources'); \ No newline at end of file Index: lams_common/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/build.xml,v diff -u -r1.89.2.11 -r1.89.2.12 --- lams_common/build.xml 27 Apr 2016 13:22:30 -0000 1.89.2.11 +++ lams_common/build.xml 27 Feb 2017 14:00:09 -0000 1.89.2.12 @@ -34,19 +34,13 @@ - - - - - - Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_common/db/sql/create_integration_tables.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/db/sql/create_lams_11_db.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_db.sql,v diff -u -r1.13.18.1 -r1.13.18.2 --- lams_common/db/sql/create_lams_11_db.sql 11 May 2016 07:07:21 -0000 1.13.18.1 +++ lams_common/db/sql/create_lams_11_db.sql 27 Feb 2017 14:00:09 -0000 1.13.18.2 @@ -1,37 +1,8 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP DATABASE IF EXISTS @dbname@; -CREATE DATABASE @dbname@ DEFAULT CHARACTER SET utf8; +CREATE DATABASE @dbname@ DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; SET FOREIGN_KEY_CHECKS=1; ---USE mysql; - ---DELETE FROM user WHERE user=''; --- DELETE FROM user WHERE user IS NULL; - ---DELETE FROM db WHERE user=''; --- DELETE FROM db WHERE user IS NULL; - ---GRANT ALL PRIVILEGES ON *.* TO lams@localhost IDENTIFIED BY 'lamsdemo'; ---REVOKE PROCESS,SUPER ON *.* from lams@localhost; - ---The hostname below should be replaced with the actual host name ---GRANT ALL PRIVILEGES ON *.* TO lams@'hostname' IDENTIFIED BY 'lamsdemo'; ---REVOKE PROCESS,SUPER ON *.* from lams@'hostname'; - ---GRANT ALL PRIVILEGES ON *.* TO lams@'%' IDENTIFIED BY 'lamsdemo'; ---REVOKE PROCESS,SUPER ON *.* from lams@'%'; - ---FLUSH PRIVILEGES; - ---GRANT ALL PRIVILEGES ON lams.* TO lams@localhost IDENTIFIED BY 'lamsdemo' WITH GRANT OPTION; ---The hostname below should be replaced with the actual host name ---GRANT ALL PRIVILEGES ON lams.* TO lams@'hostname' IDENTIFIED BY 'lamsdemo' WITH GRANT OPTION; ---GRANT ALL PRIVILEGES ON lams.* TO lams@'%' IDENTIFIED BY 'lamsdemo' WITH GRANT OPTION; - ---FLUSH PRIVILEGES; - USE @dbname@; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v diff -u -r1.167.2.2 -r1.167.2.3 --- lams_common/db/sql/create_lams_11_tables.sql 31 Oct 2015 17:39:08 -0000 1.167.2.2 +++ lams_common/db/sql/create_lams_11_tables.sql 27 Feb 2017 14:00:08 -0000 1.167.2.3 @@ -1,21 +1,20 @@ - CREATE TABLE lams_gate_activity_level ( - gate_activity_level_id INT(11) NOT NULL DEFAULT 0 + gate_activity_level_id INT(11) NOT NULL , description VARCHAR(128) NOT NULL , PRIMARY KEY (gate_activity_level_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_grouping_type ( grouping_type_id INT(11) NOT NULL , description VARCHAR(128) NOT NULL , PRIMARY KEY (grouping_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_learning_activity_type ( - learning_activity_type_id INT(11) NOT NULL DEFAULT 0 + learning_activity_type_id INT(11) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (learning_activity_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_learning_library ( learning_library_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -24,42 +23,42 @@ , valid_flag TINYINT(1) NOT NULL DEFAULT 1 , create_date_time DATETIME NOT NULL , PRIMARY KEY (learning_library_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_organisation_type ( organisation_type_id INT(3) NOT NULL , name VARCHAR(64) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (organisation_type_id) -)ENGINE=InnoDB; -CREATE UNIQUE INDEX UQ_lams_organisation_type_name ON lams_organisation_type (name ASC); + , UNIQUE KEY UQ_lams_organisation_type_name (name) +); CREATE TABLE lams_role ( - role_id INT(6) NOT NULL DEFAULT 0 + role_id INT(6) NOT NULL , name VARCHAR(64) NOT NULL , description TEXT , create_date DATETIME NOT NULL , PRIMARY KEY (role_id) -)ENGINE=InnoDB; -CREATE INDEX gname ON lams_role (name ASC); + , KEY gname (name) +); CREATE TABLE lams_tool_session_state ( tool_session_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (tool_session_state_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_lesson_state ( lesson_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (lesson_state_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_tool_session_type ( tool_session_type_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (tool_session_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_license ( license_id BIGINT(20) NOT NULL @@ -69,72 +68,64 @@ , default_flag TINYINT(1) NOT NULL DEFAULT 0 , picture_url VARCHAR(256) , PRIMARY KEY (license_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_copy_type ( copy_type_id TINYINT(4) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (copy_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_activity_category ( activity_category_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (activity_category_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_cr_workspace ( workspace_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , name VARCHAR(255) NOT NULL , PRIMARY KEY (workspace_id) -)ENGINE=InnoDB; -ALTER TABLE lams_cr_workspace COMMENT='Content repository workspace'; +); CREATE TABLE lams_cr_credential ( credential_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , name VARCHAR(255) NOT NULL , password VARCHAR(255) NOT NULL , PRIMARY KEY (credential_id) -)ENGINE=InnoDB; -ALTER TABLE lams_cr_credential COMMENT='Records the identification properties for a tool.'; +); CREATE TABLE lams_workspace_folder_type ( lams_workspace_folder_type_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (lams_workspace_folder_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_grouping_support_type ( grouping_support_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (grouping_support_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_log_event_type ( log_event_type_id INT(5) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (log_event_type_id) -)ENGINE=InnoDB; +); -CREATE TABLE lams_wkspc_fld_content_type ( - content_type_id INT(3) NOT NULL AUTO_INCREMENT - , description VARCHAR(64) NOT NULL - , PRIMARY KEY (content_type_id) -)ENGINE=InnoDB; - CREATE TABLE lams_privilege ( privilege_id BIGINT(20) NOT NULL AUTO_INCREMENT , code VARCHAR(10) NOT NULL , description VARCHAR(255) , PRIMARY KEY (privilege_id) -)ENGINE=InnoDB; -CREATE UNIQUE INDEX IX_lams_privilege_code ON lams_privilege (code ASC); + , UNIQUE KEY IX_lams_privilege_code (code) +); CREATE TABLE lams_organisation_state ( organisation_state_id INT(3) NOT NULL , description VARCHAR(255) , PRIMARY KEY (organisation_state_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_supported_locale ( locale_id INTEGER NOT NULL AUTO_INCREMENT @@ -144,84 +135,53 @@ , direction VARCHAR(3) NOT NULL , fckeditor_code VARCHAR(10) , PRIMARY KEY (locale_id) -)ENGINE=InnoDB; -ALTER TABLE lams_supported_locale COMMENT='Describes the valid language/country combinations.'; -ALTER TABLE lams_supported_locale MODIFY COLUMN language_iso_code VARCHAR(2) NOT NULL - COMMENT 'ISO 639-1 Language Code (2 letter version) Java only supports 2 letter properly, not the 3 letter codes.'; -ALTER TABLE lams_supported_locale MODIFY COLUMN country_iso_code VARCHAR(2) - COMMENT 'ISO 3166 Country Code. Cannot use in unique key as allows null.'; +); CREATE TABLE lams_auth_method_type ( authentication_method_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (authentication_method_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_authentication_method ( authentication_method_id BIGINT(20) NOT NULL , authentication_method_type_id INT(3) NOT NULL DEFAULT 0 - , authentication_method_name VARCHAR(255) NOT NULL + , authentication_method_name VARCHAR(191) NOT NULL , UNIQUE UQ_lams_authentication_method_1 (authentication_method_name) , PRIMARY KEY (authentication_method_id) - , INDEX (authentication_method_type_id) + , KEY (authentication_method_type_id) , CONSTRAINT FK_lams_authorization_method_1 FOREIGN KEY (authentication_method_type_id) REFERENCES lams_auth_method_type (authentication_method_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; +); CREATE TABLE lams_workspace_folder ( workspace_folder_id BIGINT(20) NOT NULL AUTO_INCREMENT , parent_folder_id BIGINT(20) , name VARCHAR(255) NOT NULL , user_id BIGINT(20) NOT NULL + , organisation_id BIGINT(20) , create_date_time DATETIME NOT NULL , last_modified_date_time DATETIME , lams_workspace_folder_type_id INT(3) NOT NULL , PRIMARY KEY (workspace_folder_id) - , INDEX (parent_folder_id) - , CONSTRAINT FK_lams_workspace_folder_2 FOREIGN KEY (parent_folder_id) - REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (lams_workspace_folder_type_id) + , KEY (parent_folder_id) + , KEY (lams_workspace_folder_type_id) , CONSTRAINT FK_lams_workspace_folder_4 FOREIGN KEY (lams_workspace_folder_type_id) REFERENCES lams_workspace_folder_type (lams_workspace_folder_type_id) -)ENGINE=InnoDB; +); -CREATE TABLE lams_workspace ( - workspace_id BIGINT(20) NOT NULL AUTO_INCREMENT - , default_fld_id BIGINT(20) - , def_run_seq_fld_id BIGINT(20) - , name VARCHAR(255) - , PRIMARY KEY (workspace_id) - , INDEX (def_run_seq_fld_id) - , CONSTRAINT FK_lams_workspace_1 FOREIGN KEY (def_run_seq_fld_id) - REFERENCES lams_workspace_folder (workspace_folder_id) - , INDEX (default_fld_id) - , CONSTRAINT FK_lams_workspace_2 FOREIGN KEY (default_fld_id) - REFERENCES lams_workspace_folder (workspace_folder_id) -)ENGINE=InnoDB; +ALTER TABLE lams_workspace_folder ADD CONSTRAINT FK_lams_workspace_folder_2 FOREIGN KEY (parent_folder_id) + REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION; -CREATE TABLE lams_wkspc_wkspc_folder ( - id BIGINT(20) NOT NULL AUTO_INCREMENT - , workspace_id BIGINT(20) - , workspace_folder_id BIGINT(20) - , PRIMARY KEY (id) - , INDEX (workspace_id) - , CONSTRAINT FK_lams_ww_folder_1 FOREIGN KEY (workspace_id) - REFERENCES lams_workspace (workspace_id) - , INDEX (workspace_folder_id) - , CONSTRAINT FK_lams_ww_folder_2 FOREIGN KEY (workspace_folder_id) - REFERENCES lams_workspace_folder (workspace_folder_id) -)ENGINE=InnoDB; - CREATE TABLE lams_organisation ( organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT , name VARCHAR(250) NOT NULL , code VARCHAR(20) - , description VARCHAR(250) + , description TEXT , parent_organisation_id BIGINT(20) , organisation_type_id INT(3) NOT NULL DEFAULT 0 , create_date DATETIME NOT NULL , created_by BIGINT(20) NOT NULL - , workspace_id BIGINT(20) , organisation_state_id INT(3) NOT NULL , admin_add_new_users TINYINT(1) NOT NULL DEFAULT 0 , admin_browse_all_users TINYINT(1) NOT NULL DEFAULT 0 @@ -230,41 +190,43 @@ , enable_course_notifications TINYINT(1) NOT NULL DEFAULT 0 , enable_monitor_gradebook TINYINT(1) NOT NULL DEFAULT 0 , enable_learner_gradebook TINYINT(1) NOT NULL DEFAULT 0 + , enable_single_activity_lessons TINYINT(1) NOT NULL DEFAULT 1 + , enable_live_edit TINYINT(1) NOT NULL DEFAULT 1 , locale_id INTEGER , archived_date DATETIME , ordered_lesson_ids TEXT , PRIMARY KEY (organisation_id) - , INDEX (organisation_type_id) + , KEY (organisation_type_id) , CONSTRAINT FK_lams_organisation_1 FOREIGN KEY (organisation_type_id) REFERENCES lams_organisation_type (organisation_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (workspace_id) - , CONSTRAINT FK_lams_organisation_2 FOREIGN KEY (workspace_id) - REFERENCES lams_workspace (workspace_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (parent_organisation_id) - , CONSTRAINT FK_lams_organisation_3 FOREIGN KEY (parent_organisation_id) - REFERENCES lams_organisation (organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (organisation_state_id) + , KEY (parent_organisation_id) + , KEY (organisation_state_id) , CONSTRAINT FK_lams_organisation_4 FOREIGN KEY (organisation_state_id) REFERENCES lams_organisation_state (organisation_state_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (locale_id) + , KEY (locale_id) , CONSTRAINT FK_lams_organisation_5 FOREIGN KEY (locale_id) REFERENCES lams_supported_locale (locale_id) -)ENGINE=InnoDB; +); +ALTER TABLE lams_organisation ADD CONSTRAINT FK_lams_organisation_3 FOREIGN KEY (parent_organisation_id) + REFERENCES lams_organisation (organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION; + CREATE TABLE lams_theme ( theme_id BIGINT(20) NOT NULL AUTO_INCREMENT , name VARCHAR(100) NOT NULL , description VARCHAR(100) , image_directory VARCHAR(100) - , theme_type TINYINT(11) , PRIMARY KEY (theme_id) - , UNIQUE UQ_name (name) -)ENGINE=InnoDB; + , UNIQUE KEY UQ_name (name) +); CREATE TABLE lams_user ( user_id BIGINT(20) NOT NULL AUTO_INCREMENT - , login VARCHAR(255) NOT NULL - , password VARCHAR(50) NOT NULL + , login VARCHAR(191) NOT NULL + , password CHAR(64) NOT NULL + , salt CHAR(64) + , two_factor_auth_enabled TINYINT(1) DEFAULT 0 + , two_factor_auth_secret CHAR(64) , title VARCHAR(32) , first_name VARCHAR(128) , last_name VARCHAR(128) @@ -283,44 +245,38 @@ , disabled_flag TINYINT(1) NOT NULL DEFAULT 0 , create_date DATETIME NOT NULL , authentication_method_id BIGINT(20) NOT NULL DEFAULT 0 - , workspace_id BIGINT(20) - , flash_theme_id BIGINT(20) - , html_theme_id BIGINT(20) - , chat_id VARCHAR(255) + , workspace_folder_id BIGINT(20) + , theme_id BIGINT(20) , locale_id INTEGER , portrait_uuid BIGINT(20) - , change_password TINYINT DEFAULT 0 - , enable_flash TINYINT(1) DEFAULT 1 + , change_password TINYINT(1) DEFAULT 0 , lams_community_token VARCHAR(255) , lams_community_username VARCHAR(255) , timezone VARCHAR(255) , tutorials_disabled TINYINT(1) DEFAULT 0 , first_login TINYINT(1) DEFAULT 1 , modified_date DATETIME - , openid_url VARCHAR(255) UNIQUE + , last_visited_organisation_id BIGINT(20) + , failed_attempts TINYINT(4) + , lock_out_time DATETIME , PRIMARY KEY (user_id) - , INDEX (authentication_method_id) + , KEY (authentication_method_id) , CONSTRAINT FK_lams_user_1 FOREIGN KEY (authentication_method_id) REFERENCES lams_authentication_method (authentication_method_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (workspace_id) - , CONSTRAINT FK_lams_user_2 FOREIGN KEY (workspace_id) - REFERENCES lams_workspace (workspace_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (flash_theme_id) - , CONSTRAINT FK_lams_user_4 FOREIGN KEY (flash_theme_id) - REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (html_theme_id) - , CONSTRAINT FK_lams_user_5 FOREIGN KEY (html_theme_id) - REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (locale_id) + , KEY (workspace_folder_id) + , CONSTRAINT FK_lams_user_2 FOREIGN KEY (workspace_folder_id) + REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION + , KEY (theme_id) + , CONSTRAINT FK_lams_user_5 FOREIGN KEY (theme_id) + REFERENCES lams_theme (theme_id) ON DELETE NO ACTION ON UPDATE NO ACTION + , KEY (locale_id) , CONSTRAINT FK_lams_user_6 FOREIGN KEY (locale_id) REFERENCES lams_supported_locale (locale_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX idx_openid_url (openid_url) -)ENGINE=InnoDB; -ALTER TABLE lams_user MODIFY COLUMN chat_id VARCHAR(255) - COMMENT 'ID used for Jabber'; -CREATE UNIQUE INDEX UQ_lams_user_login ON lams_user (login ASC); -CREATE INDEX login ON lams_user (login ASC); -CREATE INDEX email ON lams_user (email ASC); + , CONSTRAINT FK_lams_user_7 FOREIGN KEY (last_visited_organisation_id) + REFERENCES lams_organisation (organisation_id) + , UNIQUE KEY UQ_lams_user_login (login) + , KEY email (email) +); CREATE TABLE lams_learning_design ( learning_design_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -330,47 +286,47 @@ , first_activity_id BIGINT(20) , floating_activity_id BIGINT(20) , max_id INT(11) - , valid_design_flag TINYINT(4) NOT NULL - , read_only_flag TINYINT(4) NOT NULL + , valid_design_flag TINYINT(1) NOT NULL + , read_only_flag TINYINT(1) NOT NULL , date_read_only DATETIME , user_id BIGINT(20) NOT NULL , original_user_id BIGINT(20) NOT NULL - , help_text TEXT - , online_instructions TEXT - , offline_instructions TEXT + , help_TEXT TEXT , copy_type_id TINYINT(4) NOT NULL , create_date_time DATETIME NOT NULL , version VARCHAR(56) , original_learning_design_id BIGINT(20) , workspace_folder_id BIGINT(20) , duration BIGINT(38) , license_id BIGINT(20) - , license_text TEXT + , license_TEXT TEXT , last_modified_date_time DATETIME , content_folder_id VARCHAR(32) - , edit_override_lock TINYINT DEFAULT 0 + , edit_override_lock TINYINT(1) DEFAULT 0 , edit_override_user_id BIGINT(20) , design_version INTEGER DEFAULT 1 + , removed TINYINT(1) NOT NULL DEFAULT 0 + , design_type VARCHAR(255) , PRIMARY KEY (learning_design_id) - , INDEX (user_id) + , KEY (user_id) , CONSTRAINT FK_lams_learning_design_3 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) - , INDEX (workspace_folder_id) + , KEY (workspace_folder_id) , CONSTRAINT FK_lams_learning_design_4 FOREIGN KEY (workspace_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) - , INDEX (license_id) + , KEY (license_id) , CONSTRAINT FK_lams_learning_design_5 FOREIGN KEY (license_id) REFERENCES lams_license (license_id) - , INDEX (copy_type_id) + , KEY (copy_type_id) , CONSTRAINT FK_lams_learning_design_6 FOREIGN KEY (copy_type_id) REFERENCES lams_copy_type (copy_type_id) - , INDEX (edit_override_user_id) + , KEY (edit_override_user_id) , CONSTRAINT FK_lams_learning_design_7 FOREIGN KEY (edit_override_user_id) REFERENCES lams_user (user_id) -)ENGINE=InnoDB; -CREATE INDEX idx_design_parent_id ON lams_learning_design (original_learning_design_id ASC); -CREATE INDEX idx_design_first_act ON lams_learning_design (first_activity_id ASC); -CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC); + , KEY idx_design_parent_id (original_learning_design_id) + , KEY idx_design_first_act(first_activity_id) + , KEY idx_design_floating_act (floating_activity_id) +); CREATE TABLE lams_grouping ( grouping_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -380,13 +336,13 @@ , learners_per_group INT(11) , staff_group_id BIGINT(20) DEFAULT 0 , max_number_of_groups INT(3) - , equal_number_of_learners_per_group TINYINT DEFAULT 0 - , view_students_before_selection TINYINT DEFAULT 0 + , equal_number_of_learners_per_group TINYINT(1) DEFAULT 0 + , view_students_before_selection TINYINT(1) DEFAULT 0 , PRIMARY KEY (grouping_id) - , INDEX (grouping_type_id) + , KEY (grouping_type_id) , CONSTRAINT FK_lams_learning_grouping_1 FOREIGN KEY (grouping_type_id) REFERENCES lams_grouping_type (grouping_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; +); CREATE TABLE lams_group ( group_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -395,10 +351,10 @@ , order_id INT(6) NOT NULL DEFAULT 1 , group_ui_id INT(11) , PRIMARY KEY (group_id) - , INDEX (grouping_id) + , KEY (grouping_id) , CONSTRAINT FK_lams_learning_group_1 FOREIGN KEY (grouping_id) REFERENCES lams_grouping (grouping_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; +); CREATE TABLE lams_system_tool ( system_tool_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -408,29 +364,22 @@ , learner_url TEXT , learner_preview_url TEXT , learner_progress_url TEXT - , export_pfolio_learner_url TEXT - , export_pfolio_class_url TEXT , monitor_url TEXT , contribute_url TEXT , help_url TEXT , create_date_time DATETIME NOT NULL , admin_url TEXT , pedagogical_planner_url TEXT - , UNIQUE UQ_systool_activity_type (learning_activity_type_id) , PRIMARY KEY (system_tool_id) - , INDEX (learning_activity_type_id) + , UNIQUE KEY UQ_systool_activity_type (learning_activity_type_id) , CONSTRAINT FK_lams_system_tool FOREIGN KEY (learning_activity_type_id) REFERENCES lams_learning_activity_type (learning_activity_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; -ALTER TABLE lams_system_tool MODIFY COLUMN learner_preview_url TEXT - COMMENT 'Learner screen for preview a learning design. '; -ALTER TABLE lams_system_tool MODIFY COLUMN learner_progress_url TEXT - COMMENT 'Teacher''s view of a learner''s screen.'; - +); + CREATE TABLE lams_tool ( tool_id BIGINT(20) NOT NULL AUTO_INCREMENT , tool_signature VARCHAR(64) NOT NULL - , service_name VARCHAR(255) NOT NULL + , service_name VARCHAR(191) NOT NULL , tool_display_name VARCHAR(255) NOT NULL , description TEXT , tool_identifier VARCHAR(64) NOT NULL @@ -445,40 +394,32 @@ , learner_progress_url TEXT , author_url TEXT NOT NULL , define_later_url TEXT - , export_pfolio_learner_url TEXT - , export_pfolio_class_url TEXT , monitor_url TEXT - , contribute_url TEXT - , moderation_url TEXT , pedagogical_planner_url TEXT , help_url TEXT , create_date_time DATETIME NOT NULL , language_file VARCHAR(255) , modified_date_time DATETIME , admin_url TEXT , supports_outputs TINYINT(1) DEFAULT 0 - , ext_lms_id VARCHAR(255) DEFAULT NULL - , UNIQUE UQ_lams_tool_sig (tool_signature) - , UNIQUE UQ_lams_tool_class_name (service_name) - , PRIMARY KEY (tool_id) - , INDEX (learning_library_id) + , ext_lms_id VARCHAR(255) + , PRIMARY KEY (tool_id) + , UNIQUE KEY UQ_lams_tool_sig (tool_signature) + , UNIQUE KEY UQ_lams_tool_class_name (service_name) + , KEY (learning_library_id) , CONSTRAINT FK_lams_tool_1 FOREIGN KEY (learning_library_id) REFERENCES lams_learning_library (learning_library_id) - , INDEX (grouping_support_type_id) + , KEY (grouping_support_type_id) , CONSTRAINT FK_lams_tool_2 FOREIGN KEY (grouping_support_type_id) REFERENCES lams_grouping_support_type (grouping_support_type_id) -)ENGINE=InnoDB; -ALTER TABLE lams_tool MODIFY COLUMN learner_preview_url TEXT - COMMENT 'Learner screen for preview a learning design. '; -ALTER TABLE lams_tool MODIFY COLUMN learner_progress_url TEXT - COMMENT 'Teacher''s view of a learner''s screen.'; +); CREATE TABLE lams_learning_activity ( activity_id BIGINT(20) NOT NULL AUTO_INCREMENT , activity_ui_id INT(11) , description TEXT , title VARCHAR(255) - , help_text TEXT + , help_TEXT TEXT , xcoord INT(11) , ycoord INT(11) , parent_activity_id BIGINT(20) @@ -489,11 +430,9 @@ , grouping_id BIGINT(20) , grouping_ui_id INT(11) , order_id INT(11) - , define_later_flag TINYINT(4) NOT NULL DEFAULT 0 , learning_design_id BIGINT(20) , learning_library_id BIGINT(20) , create_date_time DATETIME NOT NULL - , run_offline_flag TINYINT(1) NOT NULL , max_number_of_options INT(5) , min_number_of_options INT(5) , options_instructions TEXT @@ -504,62 +443,62 @@ , gate_open_flag TINYINT(1) , gate_start_time_offset BIGINT(38) , gate_end_time_offset BIGINT(38) - , gate_start_date_time DATETIME - , gate_end_date_time DATETIME + , gate_activity_completion_based TINYINT(1) , library_activity_ui_image VARCHAR(255) , create_grouping_id BIGINT(20) , create_grouping_ui_id INT(11) , library_activity_id BIGINT(20) , language_file VARCHAR(255) , system_tool_id BIGINT(20) - , read_only TINYINT DEFAULT 0 - , initialised TINYINT DEFAULT 0 + , read_only TINYINT(1) DEFAULT 0 + , initialised TINYINT(1) DEFAULT 0 , default_activity_id BIGINT(20) , start_xcoord INT(11) , start_ycoord INT(11) , end_xcoord INT(11) , end_ycoord INT(11) - , stop_after_activity TINYINT NOT NULL DEFAULT 0 + , stop_after_activity TINYINT(1) NOT NULL DEFAULT 0 , transition_to_id BIGINT(20) , transition_from_id BIGINT(20) , PRIMARY KEY (activity_id) - , INDEX (learning_library_id) + , KEY lams_learning_activity_tool_content_id (tool_content_id) + , KEY (learning_library_id) , CONSTRAINT FK_lams_learning_activity_7 FOREIGN KEY (learning_library_id) REFERENCES lams_learning_library (learning_library_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (learning_design_id) + , KEY (learning_design_id) , CONSTRAINT FK_lams_learning_activity_6 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (parent_activity_id) + , KEY (parent_activity_id) , CONSTRAINT FK_learning_activity_2 FOREIGN KEY (parent_activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (learning_activity_type_id) + , KEY (learning_activity_type_id) , CONSTRAINT FK_learning_activity_3 FOREIGN KEY (learning_activity_type_id) REFERENCES lams_learning_activity_type (learning_activity_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (grouping_id) + , KEY (grouping_id) , CONSTRAINT FK_learning_activity_6 FOREIGN KEY (grouping_id) REFERENCES lams_grouping (grouping_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (tool_id) + , KEY (tool_id) , CONSTRAINT FK_lams_learning_activity_8 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) - , INDEX (gate_activity_level_id) + , KEY (gate_activity_level_id) , CONSTRAINT FK_lams_learning_activity_10 FOREIGN KEY (gate_activity_level_id) REFERENCES lams_gate_activity_level (gate_activity_level_id) - , INDEX (create_grouping_id) + , KEY (create_grouping_id) , CONSTRAINT FK_lams_learning_activity_9 FOREIGN KEY (create_grouping_id) REFERENCES lams_grouping (grouping_id) - , INDEX (library_activity_id) + , KEY (library_activity_id) , CONSTRAINT FK_lams_learning_activity_11 FOREIGN KEY (library_activity_id) REFERENCES lams_learning_activity (activity_id) - , INDEX (activity_category_id) + , KEY (activity_category_id) , CONSTRAINT FK_lams_learning_activity_12 FOREIGN KEY (activity_category_id) REFERENCES lams_activity_category (activity_category_id) - , INDEX (grouping_support_type_id) + , KEY (grouping_support_type_id) , CONSTRAINT FK_lams_learning_activity_13 FOREIGN KEY (grouping_support_type_id) REFERENCES lams_grouping_support_type (grouping_support_type_id) - , INDEX (system_tool_id) + , KEY (system_tool_id) , CONSTRAINT FK_lams_learning_activity_14 FOREIGN KEY (system_tool_id) REFERENCES lams_system_tool (system_tool_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_planner_activity_metadata ( activity_id BIGINT(20) NOT NULL @@ -569,19 +508,18 @@ , editing_advice VARCHAR(255) , CONSTRAINT FK_lams_planner_metadata_primary FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE lams_input_activity ( activity_id BIGINT(20) NOT NULL , input_activity_id BIGINT(20) NOT NULL - , UNIQUE UQ_lams_input_activity_1 (activity_id, input_activity_id) - , INDEX (activity_id) + , UNIQUE KEY UQ_lams_input_activity_1 (activity_id, input_activity_id) + , KEY (activity_id) , CONSTRAINT FK_lams_input_activity_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (activity_id) , CONSTRAINT FK_lams_input_activity_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_branch_condition ( condition_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -594,18 +532,18 @@ , end_value VARCHAR(255) , exact_match_value VARCHAR(255) , PRIMARY KEY (condition_id) -)ENGINE=InnoDB; +); -CREATE TABLE lams_text_search_condition ( +CREATE TABLE lams_TEXT_search_condition ( condition_id BIGINT(20) NOT NULL - , text_search_all_words TEXT - , text_search_phrase TEXT - , text_search_any_words TEXT - , text_search_excluded_words TEXT + , TEXT_search_all_words TEXT + , TEXT_search_phrase TEXT + , TEXT_search_any_words TEXT + , TEXT_search_excluded_words TEXT , PRIMARY KEY (condition_id) , CONSTRAINT TextSearchConditionInheritance FOREIGN KEY (condition_id) REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE lams_branch_activity_entry ( entry_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -614,21 +552,21 @@ , sequence_activity_id BIGINT(20) , branch_activity_id BIGINT(20) NOT NULL , condition_id BIGINT(20) - , open_gate TINYINT + , open_gate TINYINT(1) , PRIMARY KEY (entry_id) - , INDEX (group_id) + , KEY (group_id) , CONSTRAINT FK_lams_group_activity_1 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) - , INDEX (sequence_activity_id) + , KEY (sequence_activity_id) , CONSTRAINT FK_lams_branch_map_sequence FOREIGN KEY (sequence_activity_id) REFERENCES lams_learning_activity (activity_id) - , INDEX (branch_activity_id) + , KEY (branch_activity_id) , CONSTRAINT FK_lams_branch_map_branch FOREIGN KEY (branch_activity_id) REFERENCES lams_learning_activity (activity_id) - , INDEX (condition_id) + , KEY (condition_id) , CONSTRAINT FK_lams_branch_activity_entry_4 FOREIGN KEY (condition_id) REFERENCES lams_branch_condition (condition_id) -)ENGINE=InnoDB; +); @@ -643,50 +581,53 @@ , class_grouping_id BIGINT(20) , lesson_state_id INT(3) NOT NULL , start_date_time DATETIME - , scheduled_number_days_to_lesson_finish INT(3) DEFAULT NULL + , scheduled_number_days_to_lesson_finish INT(3) , schedule_start_date_time DATETIME , end_date_time DATETIME , schedule_end_date_time DATETIME , previous_state_id INT(3) - , learner_exportport_avail TINYINT(1) DEFAULT 1 , learner_presence_avail TINYINT(1) DEFAULT 0 , learner_im_avail TINYINT(1) DEFAULT 0 , live_edit_enabled TINYINT(1) DEFAULT 0 , enable_lesson_notifications TINYINT(1) DEFAULT 0 - , locked_for_edit TINYINT DEFAULT 0 - , marks_released TINYINT DEFAULT 0 + , locked_for_edit TINYINT(1) DEFAULT 0 + , marks_released TINYINT(1) DEFAULT 0 , version INTEGER DEFAULT 1 + , enable_lesson_INTro TINYINT(1) DEFAULT 0 + , display_design_image TINYINT(1) DEFAULT 0 + , force_restart TINYINT(1) DEFAULT 0 + , allow_restart TINYINT(1) DEFAULT 0 , PRIMARY KEY (lesson_id) - , INDEX (learning_design_id) + , KEY (learning_design_id) , CONSTRAINT FK_lams_lesson_1_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) - , INDEX (user_id) + , KEY (user_id) , CONSTRAINT FK_lams_lesson_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) - , INDEX (organisation_id) + , KEY (organisation_id) , CONSTRAINT FK_lams_lesson_3 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id) - , INDEX (lesson_state_id) + , KEY (lesson_state_id) , CONSTRAINT FK_lams_lesson_4 FOREIGN KEY (lesson_state_id) REFERENCES lams_lesson_state (lesson_state_id) - , INDEX (class_grouping_id) + , KEY (class_grouping_id) , CONSTRAINT FK_lams_lesson_5 FOREIGN KEY (class_grouping_id) REFERENCES lams_grouping (grouping_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_user_organisation ( user_organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT , organisation_id BIGINT(20) NOT NULL , user_id BIGINT(20) NOT NULL , PRIMARY KEY (user_organisation_id) - , INDEX (organisation_id) + , KEY (organisation_id) , CONSTRAINT FK_lams_user_organisation_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (user_id) + , KEY (user_id) , CONSTRAINT FK_lams_user_organisation_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; +); CREATE TABLE lams_learner_progress ( learner_progress_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -701,23 +642,23 @@ , previous_activity_id BIGINT(20) , requires_restart_flag TINYINT(1) NOT NULL , PRIMARY KEY (learner_progress_id) - , INDEX (user_id) + , UNIQUE KEY IX_lams_learner_progress_1 (user_id,lesson_id) + , KEY (user_id) , CONSTRAINT FK_lams_learner_progress_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) - , INDEX (lesson_id) + , KEY (lesson_id) , CONSTRAINT FK_lams_learner_progress_2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) - , INDEX (current_activity_id) + , KEY (current_activity_id) , CONSTRAINT FK_lams_learner_progress_3 FOREIGN KEY (current_activity_id) REFERENCES lams_learning_activity (activity_id) - , INDEX (next_activity_id) + , KEY (next_activity_id) , CONSTRAINT FK_lams_learner_progress_4 FOREIGN KEY (next_activity_id) REFERENCES lams_learning_activity (activity_id) - , INDEX (previous_activity_id) + , KEY (previous_activity_id) , CONSTRAINT FK_lams_learner_progress_5 FOREIGN KEY (previous_activity_id) REFERENCES lams_learning_activity (activity_id) -)ENGINE=InnoDB; -CREATE UNIQUE INDEX IX_lams_learner_progress_1 ON lams_learner_progress (user_id ASC, lesson_id ASC); +); CREATE TABLE lams_cr_node ( node_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT @@ -728,11 +669,10 @@ , next_version_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 1 , parent_nv_id BIGINT(20) UNSIGNED , PRIMARY KEY (node_id) - , INDEX (workspace_id) + , KEY (workspace_id) , CONSTRAINT FK_lams_cr_node_1 FOREIGN KEY (workspace_id) REFERENCES lams_cr_workspace (workspace_id) -)ENGINE=InnoDB; -ALTER TABLE lams_cr_node COMMENT='The main table containing the node definition'; +); CREATE TABLE lams_cr_node_version ( nv_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT @@ -741,25 +681,24 @@ , created_date_time DATETIME NOT NULL , user_id BIGINT(20) NOT NULL , PRIMARY KEY (nv_id) - , INDEX (node_id) + , KEY (node_id) , CONSTRAINT FK_lams_cr_node_version_2 FOREIGN KEY (node_id) REFERENCES lams_cr_node (node_id) -)ENGINE=InnoDB; -ALTER TABLE lams_cr_node_version COMMENT='Represents a version of a node'; +); CREATE TABLE lams_user_organisation_role ( user_organisation_role_id BIGINT(20) NOT NULL AUTO_INCREMENT , user_organisation_id BIGINT(20) NOT NULL , role_id INT(6) NOT NULL , PRIMARY KEY (user_organisation_role_id) - , INDEX (role_id) + , KEY (role_id) , CONSTRAINT FK_lams_user_organisation_role_2 FOREIGN KEY (role_id) REFERENCES lams_role (role_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (user_organisation_id) + , KEY (user_organisation_id) , CONSTRAINT FK_lams_user_organisation_role_3 FOREIGN KEY (user_organisation_id) REFERENCES lams_user_organisation (user_organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; +); CREATE TABLE lams_tool_session ( tool_session_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -772,99 +711,97 @@ , group_id BIGINT(20) , user_id BIGINT(20) , unique_key VARCHAR(128) NOT NULL - , UNIQUE UQ_lams_tool_session_1 (unique_key) , PRIMARY KEY (tool_session_id) - , INDEX (tool_session_state_id) + , UNIQUE UQ_lams_tool_session_1 (unique_key) + , KEY (tool_session_state_id) , CONSTRAINT FK_lams_tool_session_4 FOREIGN KEY (tool_session_state_id) REFERENCES lams_tool_session_state (tool_session_state_id) - , INDEX (user_id) + , KEY (user_id) , CONSTRAINT FK_lams_tool_session_5 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) - , INDEX (tool_session_type_id) + , KEY (tool_session_type_id) , CONSTRAINT FK_lams_tool_session_7 FOREIGN KEY (tool_session_type_id) REFERENCES lams_tool_session_type (tool_session_type_id) - , INDEX (activity_id) + , KEY (activity_id) , CONSTRAINT FK_lams_tool_session_8 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) - , INDEX (group_id) + , KEY (group_id) , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_progress_completed ( learner_progress_id BIGINT(20) NOT NULL , activity_id BIGINT(20) NOT NULL , completed_date_time DATETIME , start_date_time DATETIME , PRIMARY KEY (learner_progress_id, activity_id) - , INDEX (learner_progress_id) + , KEY (learner_progress_id) , CONSTRAINT FK_lams_progress_completed_1 FOREIGN KEY (learner_progress_id) - REFERENCES lams_learner_progress (learner_progress_id) - , INDEX (activity_id) + REFERENCES lams_learner_progress (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE + , KEY (activity_id) , CONSTRAINT FK_lams_progress_completed_2 FOREIGN KEY (activity_id) - REFERENCES lams_learning_activity (activity_id) -)ENGINE=InnoDB; + REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE lams_progress_attempted ( learner_progress_id BIGINT(20) NOT NULL , activity_id BIGINT(20) NOT NULL , start_date_time DATETIME , PRIMARY KEY (learner_progress_id, activity_id) - , INDEX (learner_progress_id) + , KEY (learner_progress_id) , CONSTRAINT FK_lams_progress_current_1 FOREIGN KEY (learner_progress_id) - REFERENCES lams_learner_progress (learner_progress_id) - , INDEX (activity_id) + REFERENCES lams_learner_progress (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE + , KEY (activity_id) , CONSTRAINT FK_lams_progress_current_2 FOREIGN KEY (activity_id) - REFERENCES lams_learning_activity (activity_id) + REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE )ENGINE=InnoDB; CREATE TABLE lams_user_group ( user_id BIGINT(20) NOT NULL , group_id BIGINT(20) NOT NULL , scheduled_lesson_end_date DATETIME , PRIMARY KEY (user_id, group_id) - , INDEX (user_id) + , KEY (user_id) , CONSTRAINT FK_lams_user_group_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) - , INDEX (group_id) + , KEY (group_id) , CONSTRAINT FK_lams_user_group_2 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_tool_content ( tool_content_id BIGINT(20) NOT NULL AUTO_INCREMENT , tool_id BIGINT(20) NOT NULL , PRIMARY KEY (tool_content_id) - , INDEX (tool_id) + , KEY (tool_id) , CONSTRAINT FK_lams_tool_content_1 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) -)ENGINE=InnoDB; +); -CREATE TABLE lams_activity_learners ( - user_id BIGINT(20) NOT NULL DEFAULT 0 - , activity_id BIGINT(20) NOT NULL DEFAULT 0 - , allowed_to_pass TINYINT NOT NULL DEFAULT 0 - , INDEX (user_id) +CREATE TABLE lams_gate_allowed_learners ( + user_id BIGINT(20) NOT NULL + , activity_id BIGINT(20) NOT NULL + , KEY (user_id) , CONSTRAINT FK_TABLE_32_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) - , INDEX (activity_id) + , KEY (activity_id) , CONSTRAINT FK_TABLE_32_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_cr_workspace_credential ( wc_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , workspace_id BIGINT(20) UNSIGNED NOT NULL , credential_id BIGINT(20) UNSIGNED NOT NULL , PRIMARY KEY (wc_id) - , INDEX (workspace_id) + , KEY (workspace_id) , CONSTRAINT FK_lams_cr_workspace_credential_1 FOREIGN KEY (workspace_id) REFERENCES lams_cr_workspace (workspace_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (credential_id) + , KEY (credential_id) , CONSTRAINT FK_lams_cr_workspace_credential_2 FOREIGN KEY (credential_id) REFERENCES lams_cr_credential (credential_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; -ALTER TABLE lams_cr_workspace_credential COMMENT='Maps tools access to workspaces'; +); CREATE TABLE lams_cr_node_version_property ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT @@ -873,10 +810,10 @@ , value VARCHAR(255) NOT NULL , type TINYINT NOT NULL , PRIMARY KEY (id) - , INDEX (nv_id) + , KEY (nv_id) , CONSTRAINT FK_lams_cr_node_version_property_1 FOREIGN KEY (nv_id) REFERENCES lams_cr_node_version (nv_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_log_event ( id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -887,10 +824,10 @@ , lesson_id BIGINT(20) , activity_id BIGINT(20) , PRIMARY KEY (id) - , INDEX (occurred_date_time) + , KEY (occurred_date_time) , CONSTRAINT FK_lams_event_log_1 FOREIGN KEY (log_event_type_id) REFERENCES lams_log_event_type (log_event_type_id) - , INDEX (user_id) + , KEY (user_id) , CONSTRAINT FK_lams_event_log_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) , CONSTRAINT FK_lams_event_log_3 FOREIGN KEY (learning_design_id) @@ -899,7 +836,7 @@ REFERENCES lams_lesson (lesson_id) , CONSTRAINT FK_lams_event_log_5 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_workspace_folder_content ( folder_content_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -912,16 +849,14 @@ , uuid BIGINT(20) , version_id BIGINT(20) , mime_type VARCHAR(10) NOT NULL - , UNIQUE unique_content_name (name, workspace_folder_id, mime_type) - , UNIQUE unique_node_version (workspace_folder_id, uuid, version_id) , PRIMARY KEY (folder_content_id) - , INDEX (workspace_folder_id) + , UNIQUE KEY unique_content_name (name, workspace_folder_id, mime_type) + , UNIQUE KEY unique_node_version (workspace_folder_id, uuid, version_id) + , KEY (content_type_id) + , KEY (workspace_folder_id) , CONSTRAINT FK_lams_workspace_folder_content_1 FOREIGN KEY (workspace_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) - , INDEX (content_type_id) - , CONSTRAINT FK_lams_workspace_folder_content_2 FOREIGN KEY (content_type_id) - REFERENCES lams_wkspc_fld_content_type (content_type_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_learning_transition ( transition_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -936,16 +871,16 @@ , from_ui_id INT(11) , transition_type TINYINT NOT NULL DEFAULT 0 , PRIMARY KEY (transition_id) - , INDEX (from_activity_id) + , KEY (from_activity_id) , CONSTRAINT FK_learning_transition_3 FOREIGN KEY (from_activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (to_activity_id) + , KEY (to_activity_id) , CONSTRAINT FK_learning_transition_2 FOREIGN KEY (to_activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE NO ACTION ON UPDATE NO ACTION - , INDEX (learning_design_id) + , KEY (learning_design_id) , CONSTRAINT lddefn_transition_ibfk_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)ENGINE=InnoDB; +); ALTER TABLE lams_learning_activity ADD CONSTRAINT FK_lams_learning_activity_15 FOREIGN KEY (transition_to_id) REFERENCES lams_learning_transition (transition_id) @@ -957,120 +892,101 @@ , role_id INT(6) NOT NULL , privilege_id BIGINT(20) NOT NULL , PRIMARY KEY (rp_id) - , INDEX (privilege_id) + , KEY (privilege_id) , CONSTRAINT FK_lams_role_privilege_1 FOREIGN KEY (privilege_id) REFERENCES lams_privilege (privilege_id) - , INDEX (role_id) + , KEY (role_id) , CONSTRAINT FK_lams_role_privilege_2 FOREIGN KEY (role_id) REFERENCES lams_role (role_id) -)ENGINE=InnoDB; +); -CREATE TABLE lams_tool_import_support ( - id BIGINT(20) NOT NULL AUTO_INCREMENT - , installed_tool_signature VARCHAR(15) NOT NULL - , supports_tool_signature VARCHAR(50) NOT NULL - , PRIMARY KEY (id) -)ENGINE=InnoDB; - CREATE TABLE lams_configuration ( config_key VARCHAR(30) NOT NULL , config_value VARCHAR(255) , description_key VARCHAR(255) , header_name VARCHAR(50) , format VARCHAR(30) - , required TINYINT NOT NULL DEFAULT 0 + , required TINYINT(1) NOT NULL DEFAULT 0 , PRIMARY KEY (config_key) -)ENGINE=InnoDB; +); CREATE TABLE lams_timezone ( id BIGINT(20) NOT NULL AUTO_INCREMENT , timezone_id VARCHAR(255) NOT NULL - , server_timezone TINYINT DEFAULT 0 + , server_timezone TINYINT(1) DEFAULT 0 , PRIMARY KEY (id) -)ENGINE=InnoDB; +); -CREATE TABLE lams_user_organisation_collapsed ( - user_organisation_id BIGINT(20) NOT NULL - , collapsed TINYINT(1) NOT NULL DEFAULT 1 - , PRIMARY KEY (user_organisation_id) - , CONSTRAINT FK_lams_user_organisation_collapsed_1 FOREIGN KEY (user_organisation_id) - REFERENCES lams_user_organisation (user_organisation_id) -)ENGINE=InnoDB; - CREATE TABLE lams_password_request ( request_id BIGINT(20) NOT NULL AUTO_INCREMENT , user_id BIGINT(20) NOT NULL , request_key VARCHAR(32) NOT NULL , request_date DATETIME NOT NULL , PRIMARY KEY (request_id) -)ENGINE=InnoDB; -CREATE UNIQUE INDEX IX_lams_psswd_rqst_key ON lams_password_request (request_key ASC); + , UNIQUE KEY IX_lams_psswd_rqst_key (request_key) +); -CREATE TABLE lams_events ( - uid BIGINT NOT NULL UNIQUE auto_increment +CREATE TABLE lams_notification_event ( + uid BIGINT NOT NULL AUTO_INCREMENT , scope VARCHAR(128) NOT NULL , name VARCHAR(128) NOT NULL , event_session_id BIGINT - , triggered TINYINT - , default_subject VARCHAR(255) - , default_message TEXT , subject VARCHAR(255) , message TEXT , fail_time DATETIME - , INDEX (scope,name,event_session_id) + , html_format TINYINT(1) DEFAULT 0 + , KEY (scope,name,event_session_id) , PRIMARY KEY (uid) -)ENGINE=InnoDB; +); -CREATE TABLE lams_event_subscriptions ( - uid BIGINT NOT NULL UNIQUE auto_increment +CREATE TABLE lams_notification_subscription ( + uid BIGINT NOT NULL AUTO_INCREMENT , user_id BIGINT , event_uid BIGINT , delivery_method_id TINYINT UNSIGNED - , periodicity BIGINT - , last_operation_time DATETIME , last_operation_message TEXT , PRIMARY KEY (uid) , CONSTRAINT EventSubscriptionsToUsers FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE - , INDEX (event_uid) + , KEY (event_uid) , CONSTRAINT EventSubscriptionsToEvent FOREIGN KEY (event_uid) - REFERENCES lams_events (uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; + REFERENCES lams_notification_event (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE lams_competence ( - competence_id BIGINT NOT NULL UNIQUE auto_increment + competence_id BIGINT NOT NULL UNIQUE AUTO_INCREMENT , learning_design_id BIGINT , description TEXT - , title VARCHAR(255) + , title VARCHAR(191) , UNIQUE KEY (learning_design_id, title) , PRIMARY KEY (competence_id) , CONSTRAINT LearningDesignCompetenceMap FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design(learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE lams_competence_mapping ( - competence_mapping_id BIGINT NOT NULL UNIQUE auto_increment + competence_mapping_id BIGINT NOT NULL UNIQUE AUTO_INCREMENT , competence_id BIGINT , activity_id BIGINT , PRIMARY KEY (competence_mapping_id) - , INDEX (activity_id) - , UNIQUE KEY (competence_id, activity_id) + , UNIQUE KEY (competence_id, activity_id) + , KEY (activity_id) , CONSTRAINT FK_lams_competence_mapping_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_competence_mapping_2 FOREIGN KEY (competence_id) REFERENCES lams_competence (competence_id) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE patches ( system_name VARCHAR(30) NOT NULL , patch_level INTEGER(11) NOT NULL , patch_date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , patch_in_progress CHAR(1) NOT NULL DEFAULT 'F' , PRIMARY KEY(system_name, patch_level) -)ENGINE=InnoDB; +); CREATE TABLE lams_registration ( - uid BIGINT NOT NULL auto_increment + uid BIGINT NOT NULL AUTO_INCREMENT , site_name VARCHAR(255) NOT NULL , organisation VARCHAR(255) NOT NULL , name VARCHAR(255) NOT NULL @@ -1081,122 +997,507 @@ , server_key VARCHAR(255) NOT NULL , server_id VARCHAR(255) NOT NULL , PRIMARY KEY (uid) -)ENGINE=InnoDB; +); CREATE TABLE lams_planner_nodes ( - uid BIGINT(20) NOT NULL auto_increment, - parent_uid BIGINT(20), - order_id TINYINT UNSIGNED NOT NULL, - locked TINYINT(1) NOT NULL DEFAULT 0, - content_folder_id VARCHAR(32), - title VARCHAR(255) NOT NULL, - brief_desc TEXT, - full_desc TEXT, - ld_id BIGINT(20), - user_id BIGINT(20), - permissions INTEGER, - PRIMARY KEY (uid), - UNIQUE KEY (parent_uid, order_id), - CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid) - REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT FK_lams_planner_node_user FOREIGN KEY (user_id) + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , parent_uid BIGINT(20) + , order_id TINYINT UNSIGNED NOT NULL + , locked TINYINT(1) NOT NULL DEFAULT 0 + , content_folder_id VARCHAR(32) + , title VARCHAR(255) NOT NULL + , brief_desc TEXT + , full_desc TEXT + , ld_id BIGINT(20) + , user_id BIGINT(20) + , permissions INTEGER + , PRIMARY KEY (uid) + , UNIQUE KEY (parent_uid, order_id) + , CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid) + REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE + , CONSTRAINT FK_lams_planner_node_user FOREIGN KEY (user_id) REFERENCES lams_user(user_id) ON DELETE SET NULL ON UPDATE SET NULL -)ENGINE=InnoDB; +); CREATE TABLE lams_activity_evaluation ( - activity_evaluation_id BIGINT(20) NOT NULL auto_increment + activity_evaluation_id BIGINT(20) NOT NULL AUTO_INCREMENT , activity_id BIGINT(20) NOT NULL , tool_output_definition VARCHAR(255) NOT NULL - , INDEX (activity_id) + , KEY (activity_id) , CONSTRAINT FK_lams_activity_evaluation_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (activity_evaluation_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_gradebook_user_activity ( - uid BIGINT(20) NOT NULL auto_increment + uid BIGINT(20) NOT NULL AUTO_INCREMENT , activity_id BIGINT(20) NOT NULL , user_id BIGINT (20) NOT NULL , mark DOUBLE PRECISION , feedback TEXT , marked_in_gradebook TINYINT(1) NOT NULL DEFAULT 0 - , INDEX (activity_id, user_id) + , update_date DATETIME + , PRIMARY KEY (uid) + , KEY (activity_id, user_id) , CONSTRAINT FK_lams_gradebook_user_activity_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_gradebook_user_activity_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (uid) -)ENGINE=InnoDB; +); + CREATE TABLE lams_gradebook_user_lesson ( - uid BIGINT(20) NOT NULL auto_increment + uid BIGINT(20) NOT NULL AUTO_INCREMENT , lesson_id BIGINT(20) NOT NULL , user_id BIGINT (20) NOT NULL , mark DOUBLE PRECISION , feedback TEXT - , INDEX (lesson_id, user_id) + , PRIMARY KEY (uid) + , KEY (lesson_id, user_id) , CONSTRAINT FK_lams_gradebook_user_lesson_1 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) , CONSTRAINT FK_lams_gradebook_user_lesson_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (uid) -)ENGINE=InnoDB; +); CREATE TABLE lams_data_flow ( - data_flow_object_id BIGINT(20) NOT NULL auto_increment + data_flow_object_id BIGINT(20) NOT NULL AUTO_INCREMENT , transition_id BIGINT(20) NOT NULL , order_id INT(11) , name VARCHAR(255) NOT NULL , display_name VARCHAR(255) , tool_assigment_id INT(11) + , PRIMARY KEY (data_flow_object_id) , CONSTRAINT FK_lams_learning_transition_1 FOREIGN KEY (transition_id) REFERENCES lams_learning_transition (transition_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (data_flow_object_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_user_disabled_tutorials ( user_id BIGINT(20) NOT NULL , page_str CHAR(5) NOT NULL + , PRIMARY KEY (user_id,page_str) , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (user_id,page_str) -)ENGINE=InnoDB; +); CREATE TABLE lams_planner_recent_learning_designs ( user_id BIGINT(20) NOT NULL , learning_design_id BIGINT(20) NOT NULL , last_modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP + , PRIMARY KEY (user_id,learning_design_id) , CONSTRAINT FK_lams_planner_recent_learning_designs_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_planner_recent_learning_designs_2 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (user_id,learning_design_id) -)ENGINE=InnoDB; +); CREATE TABLE lams_planner_node_role ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , node_uid BIGINT(20) NOT NULL , user_id BIGINT(20) NOT NULL , role_id INT(6) NOT NULL , PRIMARY KEY (uid) -)ENGINE=InnoDB; + , CONSTRAINT FK_planner_node_role_user FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE NO ACTION + , CONSTRAINT FK_planner_node_role_node FOREIGN KEY (node_uid) + REFERENCES lams_planner_nodes (uid) ON DELETE CASCADE ON UPDATE NO ACTION + , CONSTRAINT FK_planner_node_role_role FOREIGN KEY (role_id) + REFERENCES lams_role (role_id) ON DELETE CASCADE ON UPDATE NO ACTION +); -ALTER TABLE lams_planner_node_role ADD CONSTRAINT FK_planner_node_role_user FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE NO ACTION; -ALTER TABLE lams_planner_node_role ADD CONSTRAINT FK_planner_node_role_node FOREIGN KEY (node_uid) REFERENCES lams_planner_nodes (uid) ON DELETE CASCADE ON UPDATE NO ACTION; -ALTER TABLE lams_planner_node_role ADD CONSTRAINT FK_planner_node_role_role FOREIGN KEY (role_id) REFERENCES lams_role (role_id) ON DELETE CASCADE ON UPDATE NO ACTION; - -CREATE TABLE lams_openid_config ( - config_key VARCHAR(20) NOT NULL UNIQUE - , config_value VARCHAR(255) NOT NULL - , PRIMARY KEY (config_key) -)ENGINE=InnoDB; - CREATE TABLE lams_lesson_dependency ( lesson_id BIGINT(20) , preceding_lesson_id BIGINT(20) + , PRIMARY KEY (lesson_id,preceding_lesson_id) , CONSTRAINT FK_lams_lesson_dependency_1 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_lesson_dependency_2 FOREIGN KEY (preceding_lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE - , PRIMARY KEY (lesson_id,preceding_lesson_id) -)ENGINE=InnoDB; +); + + +CREATE TABLE lams_notebook_entry ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , external_id BIGINT(20) + , external_id_type INT(11) + , external_signature VARCHAR(255) + , user_id INT(11) + , title VARCHAR(255) + , entry TEXT + , create_date DATETIME + , last_modified DATETIME + , PRIMARY KEY (uid) + , KEY ext_sig_user (external_id,external_id_type,external_signature,user_id) + , KEY idx_create_date (create_date) +); + + +CREATE TABLE lams_presence_chat_msgs ( + uid BIGINT NOT NULL AUTO_INCREMENT + , lesson_id BIGINT(20) + , from_user VARCHAR(191) + , to_user VARCHAR(191) + , date_sent DATETIME + , message VARCHAR(1023) + , PRIMARY KEY (uid) + , KEY FK_lams_presence_chat_msgs_lesson (lesson_id) + , KEY idx_lams_presence_chat_msgs_from (from_user) + , KEY idx_lams_presence_chat_msgs_to (to_user) + , CONSTRAINT FK_lams_presence_chat_msgs_lesson FOREIGN KEY (lesson_id) + REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE +); + + +CREATE TABLE lams_ext_server_type ( + server_type_id INT(11) NOT NULL + , description VARCHAR(255) NOT NULL + , PRIMARY KEY (server_type_id) +); + +CREATE TABLE lams_ext_server_org_map ( + sid INT(11) NOT NULL AUTO_INCREMENT + , serverid VARCHAR(191) NOT NULL + , serverkey TEXT NOT NULL + , servername VARCHAR(255) NOT NULL + , serverdesc TEXT + , prefix VARCHAR(11) NOT NULL + , userinfo_url TEXT NOT NULL + , server_url VARCHAR(255) + , timeout_url TEXT NOT NULL + , lesson_finish_url TEXT + , disabled BIT(1) NOT NULL + , time_to_live_login_request INT(11) DEFAULT 80 + , time_to_live_login_request_enabled tinyINT(1) NOT NULL DEFAULT 0 + , ext_groups_url TEXT + , server_type_id INT(11) NOT NULL DEFAULT 1 + , lti_consumer_monitor_roles TEXT + , PRIMARY KEY (sid) + , UNIQUE KEY serverid (serverid) + , UNIQUE KEY prefix (prefix) + , KEY FK_lams_ext_server_type (server_type_id) + , CONSTRAINT FK_lams_ext_server_type FOREIGN KEY (server_type_id) + REFERENCES lams_ext_server_type (server_type_id) +); + +CREATE TABLE lams_ext_course_class_map ( + sid INT(11) NOT NULL AUTO_INCREMENT + , courseid VARCHAR(255) NOT NULL + , classid BIGINT(20) NOT NULL + , ext_server_org_map_id INT(11) NOT NULL + , PRIMARY KEY (sid) + , KEY classid (classid) + , KEY ext_server_org_map_id (ext_server_org_map_id) + , CONSTRAINT lams_ext_course_class_map_fk FOREIGN KEY (classid) + REFERENCES lams_organisation (organisation_id) + , CONSTRAINT lams_ext_course_class_map_fk1 FOREIGN KEY (ext_server_org_map_id) + REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE +); + + +CREATE TABLE lams_ext_user_userid_map ( + sid INT(11) NOT NULL AUTO_INCREMENT + , external_username VARCHAR(250) NOT NULL + , user_id BIGINT(20) NOT NULL + , ext_server_org_map_id INT(11) NOT NULL + , tc_gradebook_id TEXT + , PRIMARY KEY (sid) + , KEY user_id (user_id) + , KEY ext_server_org_map_id (ext_server_org_map_id) + , CONSTRAINT lams_ext_user_userid_map_fk FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE + , CONSTRAINT lams_ext_user_userid_map_fk1 FOREIGN KEY (ext_server_org_map_id) + REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_ext_server_tool_map ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , tool_id BIGINT(20) NOT NULL + , ext_server_org_map_id INT(11) NOT NULL + , PRIMARY KEY (uid) + , UNIQUE KEY unique_adapter_map (ext_server_org_map_id,tool_id) + , KEY lams_ext_server_tool_map_fk2 (tool_id) + , CONSTRAINT lams_ext_server_tool_map_fk1 FOREIGN KEY (ext_server_org_map_id) + REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE + , CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) + REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_ext_server_lesson_map ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , lesson_id BIGINT(20) NOT NULL + , ext_server_org_map_id INT(11) NOT NULL + , resource_link_id VARCHAR(255) + , PRIMARY KEY (uid) + , UNIQUE KEY lesson_id (lesson_id) + , KEY lams_ext_server_lesson_map_fk1 (ext_server_org_map_id) + , CONSTRAINT lams_ext_server_lesson_map_fk1 FOREIGN KEY (ext_server_org_map_id) + REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE + , CONSTRAINT lams_ext_server_lesson_map_fk2 FOREIGN KEY (lesson_id) + REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_signup_organisation ( + signup_organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT, + organisation_id BIGINT(20) NOT NULL, + add_to_lessons TINYINT(1) DEFAULT 1, + add_as_staff TINYINT(1) DEFAULT 0, + add_with_author TINYINT(1) DEFAULT 0, + add_with_monitor TINYINT(1) DEFAULT 0, + course_key VARCHAR(255), + blurb TEXT, + create_date DATETIME, + disabled TINYINT(1) DEFAULT 0, + conTEXT VARCHAR(191) NOT NULL, + login_tab_active TINYINT(1) DEFAULT 0, + PRIMARY KEY (signup_organisation_id), + UNIQUE KEY conTEXT (conTEXT), + KEY organisation_id (organisation_id) +); + +CREATE TABLE lams_presence_user ( + nickname VARCHAR(191) NOT NULL, + lesson_id BIGINT(20) NOT NULL, + last_presence DATETIME, + PRIMARY KEY (nickname,lesson_id), + KEY FK_lams_presence_user_lesson (lesson_id), + CONSTRAINT FK_lams_presence_user_lesson FOREIGN KEY (lesson_id) + REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_organisation_grouping ( + grouping_id BIGINT(20) NOT NULL AUTO_INCREMENT, + organisation_id BIGINT(20) NOT NULL, + name VARCHAR(255), + PRIMARY KEY (grouping_id), + KEY FK_lams_organisation_grouping_1 (organisation_id), + CONSTRAINT FK_lams_organisation_grouping_1 FOREIGN KEY (organisation_id) + REFERENCES lams_organisation (organisation_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_organisation_group ( + group_id BIGINT(20) NOT NULL AUTO_INCREMENT, + grouping_id BIGINT(20) NOT NULL, + name VARCHAR(255), + PRIMARY KEY (group_id), + KEY FK_lams_organisation_group_1 (grouping_id), + CONSTRAINT FK_lams_organisation_group_1 FOREIGN KEY (grouping_id) + REFERENCES lams_organisation_grouping (grouping_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_user_organisation_group ( + group_id BIGINT(20) NOT NULL, + user_id BIGINT(20) NOT NULL, + PRIMARY KEY (group_id,user_id), + KEY FK_lams_user_organisation_group_2 (user_id), + CONSTRAINT FK_lams_user_organisation_group_1 FOREIGN KEY (group_id) + REFERENCES lams_organisation_group (group_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_user_organisation_group_2 FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_learning_design_annotation ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT, + learning_design_id BIGINT(20) NOT NULL, + ui_id INT(11), + title VARCHAR(1024), + xcoord INT(11), + ycoord INT(11), + end_xcoord INT(11), + end_ycoord INT(11), + color char(7), + PRIMARY KEY (uid), + KEY FK_lams_learning_design_annotation_1 (learning_design_id), + CONSTRAINT FK_lams_learning_design_annotation_1 FOREIGN KEY (learning_design_id) + REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_learning_design_access ( + learning_design_id BIGINT(20) NOT NULL, + user_id BIGINT(20) NOT NULL, + access_date DATETIME, + PRIMARY KEY (learning_design_id,user_id), + KEY FK_lams_learning_design_access_2 (user_id), + CONSTRAINT FK_lams_learning_design_access_1 FOREIGN KEY (learning_design_id) + REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_learning_design_access_2 FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_learning_library_group ( + group_id INT(11) NOT NULL AUTO_INCREMENT, + name VARCHAR(64) NOT NULL, + PRIMARY KEY (group_id) +); + +CREATE TABLE lams_learning_library_to_group ( + group_id INT(11) NOT NULL, + learning_library_id BIGINT(20) NOT NULL, + PRIMARY KEY (group_id,learning_library_id) +); + +CREATE TABLE lams_rating_criteria_type ( + rating_criteria_type_id INT(11) NOT NULL, + description VARCHAR(255) NOT NULL, + PRIMARY KEY (rating_criteria_type_id) +); + +CREATE TABLE lams_rating_criteria ( + rating_criteria_id BIGINT(20) NOT NULL AUTO_INCREMENT, + title VARCHAR(255), + rating_criteria_type_id INT(11) NOT NULL DEFAULT 0, + comments_enabled TINYINT(1) NOT NULL DEFAULT 0, + comments_min_words_limit INT(11) DEFAULT 0, + order_id INT(11) NOT NULL, + tool_content_id BIGINT(20), + item_id BIGINT(20), + lesson_id BIGINT(20), + rating_style BIGINT(20) NOT NULL DEFAULT 1, + max_rating BIGINT(20) NOT NULL DEFAULT '5', + minimum_rates INT(11) DEFAULT 0, + maximum_rates INT(11) DEFAULT 0, + PRIMARY KEY (rating_criteria_id), + KEY rating_criteria_type_id (rating_criteria_type_id), + KEY tool_content_id (tool_content_id), + KEY lesson_id (lesson_id), + CONSTRAINT FK_lams_rating_criteria_1 FOREIGN KEY (rating_criteria_type_id) + REFERENCES lams_rating_criteria_type (rating_criteria_type_id), + CONSTRAINT FK_lams_rating_criteria_2 FOREIGN KEY (tool_content_id) + REFERENCES lams_tool_content (tool_content_id) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT FK_lams_rating_criteria_3 FOREIGN KEY (lesson_id) + REFERENCES lams_lesson (lesson_id) ON DELETE NO ACTION ON UPDATE NO ACTION +); + +CREATE TABLE lams_comment_session ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT, + external_id BIGINT(20), + external_id_type INT(1), + external_signature VARCHAR(40), + PRIMARY KEY (uid), + UNIQUE KEY comment_ext_sig_user (external_id,external_id_type,external_signature) +); + +CREATE TABLE lams_comment ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT, + session_id BIGINT(20) NOT NULL, + body TEXT, + create_by BIGINT(20), + create_date DATETIME, + update_date DATETIME, + update_by BIGINT(20), + last_modified DATETIME, + last_reply_date DATETIME, + reply_number INT(11), + hide_flag SMALLINT(6), + parent_uid BIGINT(20), + root_comment_uid BIGINT(20), + comment_level SMALLINT(6), + thread_comment_uid BIGINT(20), + sticky SMALLINT(6) DEFAULT 0, + monitor SMALLINT(6) DEFAULT 0, + PRIMARY KEY (uid), + KEY FK_comment_session (session_id), + KEY FK_comment_create (create_by), + KEY FK_comment_modify (update_by), + KEY FK_comment_parent (parent_uid), + KEY FK_comment_root (root_comment_uid), + KEY FK_comment_thread (thread_comment_uid), + KEY IX_comment_level_sticky (comment_level,sticky), + CONSTRAINT FK_comment_create FOREIGN KEY (create_by) + REFERENCES lams_user (user_id), + CONSTRAINT FK_comment_modify FOREIGN KEY (update_by) + REFERENCES lams_user (user_id), + CONSTRAINT FK_comment_parent FOREIGN KEY (parent_uid) + REFERENCES lams_comment (uid), + CONSTRAINT FK_comment_root FOREIGN KEY (root_comment_uid) + REFERENCES lams_comment (uid), + CONSTRAINT FK_comment_session FOREIGN KEY (session_id) + REFERENCES lams_comment_session (uid), + CONSTRAINT FK_comment_thread FOREIGN KEY (thread_comment_uid) + REFERENCES lams_comment (uid) +); + +CREATE TABLE lams_comment_likes ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT, + comment_uid BIGINT(20) NOT NULL, + user_id BIGINT(20) NOT NULL, + vote TINYINT(1), + PRIMARY KEY (uid), + UNIQUE KEY comment_like_unique (comment_uid,user_id), + KEY FK_commentlike_comment (comment_uid), + KEY FK_commentlike_user (user_id), + CONSTRAINT FK_commentlike_comment FOREIGN KEY (comment_uid) + REFERENCES lams_comment (uid), + CONSTRAINT FK_commentlike_user FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) +); + +CREATE TABLE lams_learner_progress_archive ( + learner_progress_id BIGINT(20) NOT NULL AUTO_INCREMENT, + user_id BIGINT(20) NOT NULL, + lesson_id BIGINT(20) NOT NULL, + attempt_id TINYINT(4) NOT NULL DEFAULT 1, + lesson_completed_flag TINYINT(1) NOT NULL DEFAULT 0, + start_date_time DATETIME NOT NULL, + finish_date_time DATETIME, + current_activity_id BIGINT(20), + PRIMARY KEY (learner_progress_id), + UNIQUE KEY IX_lams_learner_progress_archive_1 (user_id,lesson_id,attempt_id), + KEY FK_lams_learner_progress_archive_2 (lesson_id), + KEY FK_lams_learner_progress_archive_3 (current_activity_id), + CONSTRAINT FK_lams_learner_progress_archive_1 FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_learner_progress_archive_2 FOREIGN KEY (lesson_id) + REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_learner_progress_archive_3 FOREIGN KEY (current_activity_id) + REFERENCES lams_learning_activity (activity_id) ON DELETE SET NULL ON UPDATE CASCADE +); + +CREATE TABLE lams_progress_attempted_archive ( + learner_progress_id BIGINT(20) NOT NULL, + activity_id BIGINT(20) NOT NULL, + start_date_time DATETIME, + PRIMARY KEY (learner_progress_id,activity_id), + KEY FK_lams_progress_current_archive_2 (activity_id), + CONSTRAINT FK_lams_progress_current_archive_1 FOREIGN KEY (learner_progress_id) + REFERENCES lams_learner_progress_archive (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_progress_current_archive_2 FOREIGN KEY (activity_id) + REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_progress_completed_archive ( + learner_progress_id BIGINT(20) NOT NULL, + activity_id BIGINT(20) NOT NULL, + completed_date_time DATETIME, + start_date_time DATETIME, + PRIMARY KEY (learner_progress_id,activity_id), + KEY FK_lams_progress_completed_archive_2 (activity_id), + CONSTRAINT FK_lams_progress_completed_archive_1 FOREIGN KEY (learner_progress_id) + REFERENCES lams_learner_progress_archive (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_progress_completed_archive_2 FOREIGN KEY (activity_id) + REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE lams_learning_command ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT, + lesson_id BIGINT(20), + user_name VARCHAR(191), + create_date DATETIME NOT NULL, + command_TEXT TEXT, + PRIMARY KEY (uid), + KEY idx_lesson_id (lesson_id), + KEY idx_user_name (user_name), + KEY idx_create_date (create_date) +); + +CREATE TABLE lams_favorite_organisation ( + favorite_organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT, + organisation_id BIGINT(20) NOT NULL, + user_id BIGINT(20) NOT NULL, + PRIMARY KEY (favorite_organisation_id), + KEY organisation_id (organisation_id), + KEY user_id (user_id), + CONSTRAINT FK_lams_favorite_organisation_1 FOREIGN KEY (organisation_id) + REFERENCES lams_organisation (organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT FK_lams_favorite_organisation_2 FOREIGN KEY (user_id) + REFERENCES lams_user (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION +); \ No newline at end of file Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_common/db/sql/create_notebook_tables.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_common/db/sql/create_presence_chat_tables.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.31.2.4 refers to a dead (removed) revision in file `lams_common/db/sql/drop_lams_11_tables.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v diff -u -r1.71.2.3 -r1.71.2.4 --- lams_common/db/sql/insert_lams_unix_config_data.sql 3 Jan 2017 21:40:20 -0000 1.71.2.3 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 27 Feb 2017 14:00:08 -0000 1.71.2.4 @@ -17,9 +17,6 @@ values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.system', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -41,28 +38,25 @@ values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs,.php,.jsp,.asp,.aspx,.pl,.do,.py,.tcl,.cgi,.shtml,.stm,.cfm,.adp', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('UserInactiveTimeout','1800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1); +values ('UserInactiveTimeout','10800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('CleanupPreviewOlderThanDays','7', 'config.cleanup.preview.older.than.days', 'config.header.system', 'LONG', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AuthoringClientVersion','3.0.0.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); +values ('AuthoringClientVersion','3.0.0.201701010000', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('MonitorClientVersion','3.0.0.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); +values ('MonitorClientVersion','3.0.0.201701010000', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LearnerClientVersion','3.0.0.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); +values ('LearnerClientVersion','3.0.0.201701010000', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('ServerVersionNumber','3.0.0.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1); +values ('ServerVersionNumber','3.0.0.201701010000', 'config.server.version.number', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1); @@ -77,21 +71,9 @@ values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppDomain','localhost', 'config.xmpp.domain', 'config.header.chat', 'STRING', 0); +values ('DefaultTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppConference','localhost', 'config.xmpp.conference', 'config.header.chat', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppAdmin','admin', 'config.xmpp.admin', 'config.header.chat', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppPassword','wildfire', 'config.xmpp.password', 'config.header.chat', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('DefaultHTMLTheme','defaultHTML', 'config.default.theme', 'config.header.look.feel', 'STRING', 1); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('AllowDirectLessonLaunch','false', 'config.allow.direct.lesson.launch', 'config.header.features', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -131,12 +113,6 @@ values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('TruststorePath','', 'config.ldap.truststore.path', 'config.header.system', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('TruststorePassword','', 'config.ldap.truststore.password', 'config.header.system', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPLoginAttr','uid', 'admin.user.login', 'config.header.ldap.attributes', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -218,9 +194,6 @@ values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -233,16 +206,16 @@ values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AuthoringScreenSize','1024x768', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('AuthoringScreenSize','1280x720', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('MonitorScreenSize','1024x768', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('MonitorScreenSize','1280x720', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LearnerScreenSize','1024x768', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('LearnerScreenSize','1280x720', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AdminScreenSize','1024x768', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('AdminScreenSize','1280x720', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 0); @@ -279,4 +252,51 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('KalturaKDPUiConfId','6308762', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); -update lams_configuration set config_value = 'false' where config_key = 'LDAPEncryptPasswordFromBrowser'; + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ConfigCacheRefresInterval', 0, 'config.cache.refresh', 'config.header.system', 'LONG', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ErrorStackTrace','true', 'config.stacktrace.error', 'config.header.system', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('FailedAttempts','3', 'config.failed.attempts', 'config.header.password.policy', 'LONG', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LockOutTime','5', 'config.lock.out.time', 'config.header.password.policy', 'LONG', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerCollapsProgressPanel','true', 'config.learner.collapsible.progress.panel', 'config.header.features', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyMinChars','8', 'config.password.minimum.characters', 'config.header.password.policy', 'LONG', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyUppercase','true', 'config.password.uppercase', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyLowercase','true', 'config.password.lowercase', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyNumerics','true', 'config.password.numerics', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicySymbols','false', 'config.password.symbols', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ShowTimezoneWarning','true', 'config.show.timezone.warning', 'config.header.features', 'BOOLEAN', 1); + +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('SiteName','LAMS', 'config.site.name', 'config.header.system', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SuffixImportedLD','false', 'config.authoring.suffix', 'config.header.features', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationUsername','true', 'config.user.validation.username', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationFirstLastName','true', 'config.user.validation.first.last.name', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationEmail','true', 'config.user.validation.emails', 'config.header.user.validation', 'BOOLEAN', 0); \ No newline at end of file Index: lams_common/db/sql/insert_lams_users.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_users.sql,v diff -u -r1.6.2.4 -r1.6.2.5 --- lams_common/db/sql/insert_lams_users.sql 25 Nov 2016 00:48:13 -0000 1.6.2.4 +++ lams_common/db/sql/insert_lams_users.sql 27 Feb 2017 14:00:08 -0000 1.6.2.5 @@ -3,178 +3,138 @@ SET FOREIGN_KEY_CHECKS=0; -- themes and styles -INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (1, "default", "Default Flash style", null, 2); -INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (2, "defaultHTML", "Default HTML style", "css", 1); +INSERT INTO lams_theme (theme_id, name, description, image_directory) VALUES (1, "defaultHTML", "Default HTML style", "css"); --- new high contrast theme LDEV-2419 -INSERT INTO lams_theme (theme_id, name, description, image_directory, theme_type) VALUES (3, "highContrast", "High Contrast HTML style", "css", 1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(1,null,'ROOT',1,1,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(2,1,'Developers Playpen',1,2,'20041223','20041223',1); -insert into lams_workspace (workspace_id, name, default_fld_id) values(1,'ROOT',1); -insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(2,'Developers Playpen',2,22); -insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(3,'MATH111',3,23); -insert into lams_workspace (workspace_id, name, default_fld_id) values(4,'Mary Morgan',4); -insert into lams_workspace (workspace_id, name, default_fld_id) values(5,'One Test',5); -insert into lams_workspace (workspace_id, name, default_fld_id) values(6,'Two Test',6); -insert into lams_workspace (workspace_id, name, default_fld_id) values(7,'Three Test',7); -insert into lams_workspace (workspace_id, name, default_fld_id) values(8,'Four Test',8); -insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(50,'Moodle Test',40,41); -insert into lams_workspace (workspace_id, name, default_fld_id) values(51,'System Administrator',45); -insert into lams_workspace (workspace_id, name, default_fld_id) values(52,'Public Folder',46); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(22,2,'Lesson Sequence Folder',1,2,'20041223','20041223',2); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(1,null,'ROOT',1,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(3,1,'MATH111',1,4,'20041223','20041223',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(2,1,'Developers Playpen',1,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(23,3,'Lesson Sequence Folder',1,4,'20041223','20041223',2); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(22,2,'Lesson Sequence Folder',1,'20041223','20041223',2); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(4,null,'Mary Morgan',4,NULL,'20041223','20041223',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(3,1,'MATH111',1,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(5,null,'One Test',5,NULL,'20041223','20041223',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(23,3,'Lesson Sequence Folder',1,'20041223','20041223',2); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(6,null,'Two Test',6,NULL,'20041223','20041223',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(4,null,'Mary Morgan',4,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(7,null,'Three Test',7,NULL,'20041223','20041223',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(5,null,'One Test',5,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(8,null,'Four Test',8,NULL,'20041223','20041223',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(6,null,'Two Test',6,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(40,1,'Moodle Test',1,7,'20041223','20041223',2); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(7,null,'Three Test',7,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(41,40,'Lesson Sequence Folder',1,7,'20041223','20041223',2); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(8,null,'Four Test',8,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(45,null,'System Administrator',1,NULL,'20061101','20061101',1); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(40,1,'Moodle Test',1,'20041223','20041223',2); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,organisation_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(46,1,'Public Folder',1,NULL,'20041223','20041223',3); -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(41,40,'Lesson Sequence Folder',1,'20041223','20041223',2); - -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(45,null,'System Administrator',1,'20061101','20061101',1); - -insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) -values(46,1,'Public Folder',1,'20041223','20041223',3); - -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (1, 1,1); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (2, 2,2); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (3, 2,22); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (4, 3,3); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (5, 3,23); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (6, 4,4); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (7, 5,5); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (8, 6,6); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (9, 7,7); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (10, 8,8); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (11, 50,40); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (12, 51,45); -insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (13, 52,46); - -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id) - VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,1,1,1); -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id, enable_course_notifications, enable_monitor_gradebook, enable_learner_gradebook) - VALUES (2, 'Playpen', 'PP101', 'Developers Playpen',1,2,NOW(),1,2,1,1,1,1,1); -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id) - VALUES (3, 'Everybody', null, 'All People In Course',2,3,NOW(),1,null,1,1); -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id, enable_course_notifications, enable_monitor_gradebook, enable_learner_gradebook) - VALUES (4, 'Mathematics 1', 'MATH111', 'Mathematics 1',1,2,NOW(),1,3,2,1,1,1,1); -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id) - VALUES (5, 'Tutorial Group A', 'TUTA', 'Tutorial Group A',4,3,NOW(),1,null,2,1); -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id) - VALUES (6, 'Tutorial Group B', 'TUTB', 'Tutorial Group B',4,3,NOW(),1,null,2,1); -INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id) - VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,2,NOW(),1,50,1,2); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id) + VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,1,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id, enable_course_notifications, enable_monitor_gradebook, enable_learner_gradebook) + VALUES (2, 'Playpen', 'PP101', 'Developers Playpen',1,2,NOW(),1,2,1,1,1,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id) + VALUES (3, 'Everybody', null, 'All People In Course',2,3,NOW(),1,1,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id, enable_course_notifications, enable_monitor_gradebook, enable_learner_gradebook) + VALUES (4, 'Mathematics 1', 'MATH111', 'Mathematics 1',1,2,NOW(),1,2,1,1,1,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id) + VALUES (5, 'Tutorial Group A', 'TUTA', 'Tutorial Group A',4,3,NOW(),1,2,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id) + VALUES (6, 'Tutorial Group B', 'TUTB', 'Tutorial Group B',4,3,NOW(),1,2,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, locale_id, organisation_state_id) + VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,2,NOW(),1,1,2); -- users INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone,fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) VALUES(1, 'sysadmin',SHA1('sysadmin'),'The','System','Administrator',null,null,null, 'Sydney','NSW','Australia',null,null,null,null,'sysadmin@x.x', -0,NOW(),1,51, -1,1,2,'Etc/GMT'); +0,NOW(),1,45, +1,1,'Etc/GMT'); INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone,fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) VALUES(2, 'test',SHA1('test'),'Dr','Testing','LDAP',null,null,null, 'Sydney','NSW','Australia',null,null,null,null,'test@xx.xx.xx', 0,NOW(),3,null, -3,1,2,'Etc/GMT'); +3,1,'Etc/GMT'); -INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, -city,state,country,day_phone,evening_phone,mobile_phone,fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id, timezone) -VALUES(3, 'lamskh01',SHA1('dummy'),'Mr','Jacky','Fang',null,null,null, -'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au', -0,NOW(),2,null, -1,1,2,'Etc/GMT'); - insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) values (4,'mmm',SHA1('mmm'),'Ms','Mary','Morgan','99','First Ave',null, 'Parramatta','NSW','Australia','0295099999','0298939999','0499999999', '0299999999','mmmmmmm@xx.os', -0,'20041223',1,4,1,1,2,'Etc/GMT'); +0,'20041223',1,4,1,1,'Etc/GMT'); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) values (5,'test1',SHA1('test1'),'Dr','One','Test','1','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test1@xx.os', -0,'20041223',1,5,1,1,2,'Etc/GMT'); +0,'20041223',1,5,1,1,'Etc/GMT'); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) values (6,'test2',SHA1('test2'),'Dr','Two','Test','2','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test2@xx.os', -0,'20041223',1,6,1,1,2,'Etc/GMT'); +0,'20041223',1,6,1,1,'Etc/GMT'); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) values (7,'test3',SHA1('test3'),'Dr','Three','Test','3','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test3@xx.os', -0,'20041223',1,7,1,1,2,'Etc/GMT'); +0,'20041223',1,7,1,1,'Etc/GMT'); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, -disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id, timezone) +disabled_flag,create_date,authentication_method_id,workspace_folder_id, +locale_id, theme_id, timezone) values (8,'test4',SHA1('test4'),'Dr','Four','Test','4','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test4@xx.os', -0,'20041223',1,8,1,1,2,'Etc/GMT'); +0,'20041223',1,8,1,1,'Etc/GMT'); --- sysadmin only belongs to root and public INSERT INTO lams_user_organisation (user_organisation_id, organisation_id, user_id) VALUES (1, 1, 1); Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v diff -u -r1.64.2.3 -r1.64.2.4 --- lams_common/db/sql/insert_lams_windows_config_data.sql 3 Jan 2017 21:40:20 -0000 1.64.2.3 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 27 Feb 2017 14:00:09 -0000 1.64.2.4 @@ -14,7 +14,7 @@ values ('EARDir','@ear.directory@', 'config.ear.dir', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); +values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.system', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); @@ -38,28 +38,25 @@ values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs,.php,.jsp,.asp,.aspx,.pl,.do,.py,.tcl,.cgi,.shtml,.stm,.cfm,.adp', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('UserInactiveTimeout','1800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1); +values ('UserInactiveTimeout','10800', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('CleanupPreviewOlderThanDays','7', 'config.cleanup.preview.older.than.days', 'config.header.system', 'LONG', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AuthoringClientVersion','3.0.0.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); +values ('AuthoringClientVersion','3.0.0.201701010000', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('MonitorClientVersion','3.0.0.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); +values ('MonitorClientVersion','3.0.0.201701010000', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LearnerClientVersion','3.0.0.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); +values ('LearnerClientVersion','3.0.0.201701010000', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('ServerVersionNumber','3.0.0.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1); +values ('ServerVersionNumber','3.0.0.201701010000', 'config.server.version.number', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1); @@ -74,21 +71,9 @@ values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppDomain','shaun.melcoe.mq.edu.au', 'config.xmpp.domain', 'config.header.chat', 'STRING', 0); +values ('DefaultTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppConference','conference.shaun.melcoe.mq.edu.au', 'config.xmpp.conference', 'config.header.chat', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppAdmin','admin', 'config.xmpp.admin', 'config.header.chat', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('XmppPassword','wildfire', 'config.xmpp.password', 'config.header.chat', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('DefaultHTMLTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('AllowDirectLessonLaunch','false', 'config.allow.direct.lesson.launch', 'config.header.features', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -103,9 +88,6 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('DisplayPrintButton','false', 'config.display.print.button', 'config.header.features', 'BOOLEAN', 1); -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.features', 'BOOLEAN', 1); - insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1); @@ -119,7 +101,7 @@ values ('LDAPSearchFilter','(cn={0})', 'config.ldap.search.filter', 'config.header.ldap', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LDAPBaseDN',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.base.dn', 'config.header.ldap', 'STRING', 0); +values ('LDAPBaseDN','ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.base.dn', 'config.header.ldap', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPBindUserDN','', 'config.ldap.bind.user.dn', 'config.header.ldap', 'STRING', 0); @@ -131,12 +113,6 @@ values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('TruststorePath','', 'config.ldap.truststore.path', 'config.header.system', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('TruststorePassword','', 'config.ldap.truststore.password', 'config.header.system', 'STRING', 0); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPLoginAttr','uid', 'admin.user.login', 'config.header.ldap.attributes', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -218,9 +194,6 @@ values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1); - -insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) @@ -233,16 +206,16 @@ values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AuthoringScreenSize','1024x768', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('AuthoringScreenSize','1280x720', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('MonitorScreenSize','1024x768', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('MonitorScreenSize','1280x720', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LearnerScreenSize','1024x768', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('LearnerScreenSize','1280x720', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AdminScreenSize','1024x768', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); +values ('AdminScreenSize','1280x720', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 0); @@ -279,3 +252,51 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('KalturaKDPUiConfId','6308762', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ConfigCacheRefresInterval', 0, 'config.cache.refresh', 'config.header.system', 'LONG', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ErrorStackTrace','true', 'config.stacktrace.error', 'config.header.system', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('FailedAttempts','3', 'config.failed.attempts', 'config.header.password.policy', 'LONG', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LockOutTime','5', 'config.lock.out.time', 'config.header.password.policy', 'LONG', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerCollapsProgressPanel','true', 'config.learner.collapsible.progress.panel', 'config.header.features', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyMinChars','8', 'config.password.minimum.characters', 'config.header.password.policy', 'LONG', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyUppercase','true', 'config.password.uppercase', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyLowercase','true', 'config.password.lowercase', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicyNumerics','true', 'config.password.numerics', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('PasswordPolicySymbols','false', 'config.password.symbols', 'config.header.password.policy', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ShowTimezoneWarning','true', 'config.show.timezone.warning', 'config.header.features', 'BOOLEAN', 1); + +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('SiteName','LAMS', 'config.site.name', 'config.header.system', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SuffixImportedLD','false', 'config.authoring.suffix', 'config.header.features', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationUsername','true', 'config.user.validation.username', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationFirstLastName','true', 'config.user.validation.first.last.name', 'config.header.user.validation', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('UserValidationEmail','true', 'config.user.validation.emails', 'config.header.user.validation', 'BOOLEAN', 0); \ No newline at end of file Index: lams_common/db/sql/insert_types_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v diff -u -r1.104.2.4 -r1.104.2.5 --- lams_common/db/sql/insert_types_data.sql 24 Nov 2016 23:32:17 -0000 1.104.2.4 +++ lams_common/db/sql/insert_types_data.sql 27 Feb 2017 14:00:09 -0000 1.104.2.5 @@ -1,4 +1,3 @@ - INSERT INTO lams_privilege VALUES (1,'Z','do anything'); INSERT INTO lams_privilege VALUES (2,'A','add/remove/modify classes within the course'); INSERT INTO lams_privilege VALUES (3,'B','create running instances of sequences and assign those to a class'); @@ -20,30 +19,28 @@ INSERT INTO lams_role VALUES (4, 'MONITOR', 'Member of Staff', NOW()); INSERT INTO lams_role VALUES (5, 'LEARNER', 'Student', NOW()); INSERT INTO lams_role VALUES (6, 'GROUP ADMIN', 'Group Administrator', NOW()); -INSERT INTO lams_role VALUES (7, 'AUTHOR ADMIN', 'Author Administrator', NOW()); -INSERT INTO lams_role_privilege VALUES (1,1,1); -INSERT INTO lams_role_privilege VALUES (2,2,2); -INSERT INTO lams_role_privilege VALUES (3,2,3); -INSERT INTO lams_role_privilege VALUES (4,2,4); -INSERT INTO lams_role_privilege VALUES (5,2,5); -INSERT INTO lams_role_privilege VALUES (6,2,8); -INSERT INTO lams_role_privilege VALUES (7,2,9); -INSERT INTO lams_role_privilege VALUES (8,2,10); -INSERT INTO lams_role_privilege VALUES (9,2,12); -INSERT INTO lams_role_privilege VALUES (10,2,13); -INSERT INTO lams_role_privilege VALUES (11,3,8); -INSERT INTO lams_role_privilege VALUES (12,3,9); -INSERT INTO lams_role_privilege VALUES (13,4,3); -INSERT INTO lams_role_privilege VALUES (14,4,4); -INSERT INTO lams_role_privilege VALUES (15,4,5); -INSERT INTO lams_role_privilege VALUES (16,5,6); -INSERT INTO lams_role_privilege VALUES (17,5,7); -INSERT INTO lams_role_privilege VALUES (18,6,2); -INSERT INTO lams_role_privilege VALUES (19,6,10); -INSERT INTO lams_role_privilege VALUES (20,6,12); -INSERT INTO lams_role_privilege VALUES (21,6,13); -INSERT INTO lams_role_privilege VALUES (22,7,14); +INSERT INTO lams_role_privilege VALUES (NULL,1,1); +INSERT INTO lams_role_privilege VALUES (NULL,2,2); +INSERT INTO lams_role_privilege VALUES (NULL,2,3); +INSERT INTO lams_role_privilege VALUES (NULL,2,4); +INSERT INTO lams_role_privilege VALUES (NULL,2,5); +INSERT INTO lams_role_privilege VALUES (NULL,2,8); +INSERT INTO lams_role_privilege VALUES (NULL,2,9); +INSERT INTO lams_role_privilege VALUES (NULL,2,10); +INSERT INTO lams_role_privilege VALUES (NULL,2,12); +INSERT INTO lams_role_privilege VALUES (NULL,2,13); +INSERT INTO lams_role_privilege VALUES (NULL,3,8); +INSERT INTO lams_role_privilege VALUES (NULL,3,9); +INSERT INTO lams_role_privilege VALUES (NULL,4,3); +INSERT INTO lams_role_privilege VALUES (NULL,4,4); +INSERT INTO lams_role_privilege VALUES (NULL,4,5); +INSERT INTO lams_role_privilege VALUES (NULL,5,6); +INSERT INTO lams_role_privilege VALUES (NULL,5,7); +INSERT INTO lams_role_privilege VALUES (NULL,6,2); +INSERT INTO lams_role_privilege VALUES (NULL,6,10); +INSERT INTO lams_role_privilege VALUES (NULL,6,12); +INSERT INTO lams_role_privilege VALUES (NULL,6,13); INSERT INTO lams_auth_method_type VALUES(1, 'LAMS'); @@ -67,7 +64,6 @@ INSERT INTO lams_tool_session_type VALUES (1, 'NON_GROUPED'); INSERT INTO lams_tool_session_type VALUES (2, 'GROUPED'); - INSERT INTO lams_learning_activity_type VALUES (1, 'TOOL'); INSERT INTO lams_learning_activity_type VALUES (2, 'GROUPING'); INSERT INTO lams_learning_activity_type VALUES (3, 'GATE_SYNCH'); @@ -91,7 +87,6 @@ INSERT INTO lams_tool_session_state VALUES (1, 'STARTED'); INSERT INTO lams_tool_session_state VALUES (2, 'ENDED'); - INSERT INTO lams_lesson_state VALUES (1, 'CREATED'); INSERT INTO lams_lesson_state VALUES (2, 'NOT_STARTED'); INSERT INTO lams_lesson_state VALUES (3, 'STARTED'); @@ -116,7 +111,6 @@ INSERT into lams_workspace_folder_type VALUES (3, 'PUBLIC SEQUENCES'); INSERT INTO lams_authentication_method VALUES (1, 1, 'LAMS-Database'); -INSERT INTO lams_authentication_method VALUES (2, 2, 'Oxford-WebAuth'); INSERT INTO lams_authentication_method VALUES (3, 3, 'MQ-LDAP'); INSERT INTO lams_activity_category VALUES (1 ,'SYSTEM'); @@ -137,9 +131,6 @@ INSERT INTO lams_log_event_type VALUES (5, 'TYPE_LEARNER_ACTIVITY_START'); INSERT INTO lams_log_event_type VALUES (6, 'TYPE_LEARNER_ACTIVITY_FINISH'); -INSERT INTO lams_wkspc_fld_content_type VALUES (1,'FILE'); -INSERT INTO lams_wkspc_fld_content_type VALUES (2,'PACKAGE'); - INSERT INTO lams_system_tool (system_tool_id, learning_activity_type_id, tool_display_name, description, learner_url, learner_preview_url, learner_progress_url, monitor_url, contribute_url, create_date_time,pedagogical_planner_url) VALUES (1, 2, 'Grouping', 'All types of grouping including random and chosen.', @@ -182,7 +173,7 @@ VALUES (6, 10, 'Monitor Chosen Branching', 'Select between multiple sequence activities, with the branch chosen in monitoring.', 'learning/branching.do?method=performBranching', 'learning/branching.do?method=performBranching', 'monitoring/complexProgress.do', 'monitoring/chosenBranching.do?method=assignBranch', - 'monitoring/chosenBranching.do?method=assignBranch', now()); + 'monitoring/grouping.do?method=startGrouping', now()); INSERT INTO lams_system_tool (system_tool_id, learning_activity_type_id, tool_display_name, description, learner_url, learner_preview_url, learner_progress_url, monitor_url, contribute_url, create_date_time) @@ -312,30 +303,19 @@ INSERT INTO lams_timezone (timezone_id) VALUES ('Etc/GMT-11'); INSERT INTO lams_timezone (timezone_id) VALUES ('Etc/GMT-12'); --- which current tool supports the old 1.0.x tools? -INSERT INTO lams_tool_import_support VALUES (1, 'lafrum11', 'messageboard'); -INSERT INTO lams_tool_import_support VALUES (2, 'lamc11', 'simpleassessment'); -INSERT INTO lams_tool_import_support VALUES (3, 'lanb11', 'noticeboard'); -INSERT INTO lams_tool_import_support VALUES (4, 'lanb11', 'htmlnb'); -INSERT INTO lams_tool_import_support VALUES (5, 'laqa11', 'qa'); -INSERT INTO lams_tool_import_support VALUES (6, 'lasbmt11', 'reportsubmission'); -INSERT INTO lams_tool_import_support VALUES (7, 'lachat11', 'chat'); -INSERT INTO lams_tool_import_support VALUES (8, 'larsrc11', 'urlcontent'); -INSERT INTO lams_tool_import_support VALUES (11, 'lavote11', 'ranking'); -INSERT INTO lams_tool_import_support VALUES (12, 'lantbk11', 'journal'); -INSERT INTO lams_tool_import_support VALUES (13, 'lascrb11', 'groupreporting'); -INSERT INTO lams_tool_import_support VALUES (14, 'lasurv11', 'survey'); +INSERT INTO lams_ext_server_type VALUES (1, 'INTEGRATED SERVER'); +INSERT INTO lams_ext_server_type VALUES (2, 'LTI TOOL CONSUMER'); - -- external server mapping to a lams organisation INSERT INTO lams_ext_server_org_map VALUES - (1,'moodle','moodle','moodle','moodle','mdl','http://localhost/moodle/mod/lamstwo/userinfo.php?ts=%timestamp%&un=%username%&hs=%hash%', '', 'http://dummy', '', true,7); + (1,'moodle','moodle','moodle','moodle','mdl','http://localhost/moodle/mod/lamstwo/userinfo.php?ts=%timestamp%&un=%username%&hs=%hash%', '', + 'http://dummy', '', true,80,0,NULL,1,NULL); - --- set default configs for SIF openid -INSERT INTO lams_openid_config(config_key, config_value) values ("enabled", "false"); -INSERT INTO lams_openid_config(config_key, config_value) values ("portalURL", ""); -INSERT INTO lams_openid_config(config_key, config_value) values ("trustedIDPs", ""); - +-- LDEV-3450 Implement peer review feature +INSERT INTO lams_rating_criteria_type VALUES (1, 'TOOL_ACTIVITY'); +INSERT INTO lams_rating_criteria_type VALUES (2, 'AUTHORED_ITEM'); +INSERT INTO lams_rating_criteria_type VALUES (3, 'LEARNER_ITEM'); +INSERT INTO lams_rating_criteria_type VALUES (4, 'LESSON'); + -- initialise db version -INSERT INTO patches VALUES ('lams', 02040006, NOW(), 'F'); +INSERT INTO patches VALUES ('lams', 3000001, NOW(), 'F'); \ No newline at end of file Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040085.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000001.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000002.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/build.properties,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_assessment/build.properties 30 Jul 2012 18:49:56 -0000 1.8 +++ lams_tool_assessment/build.properties 27 Feb 2017 14:00:21 -0000 1.8.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.3 +min.server.version.number=3.0 signature=laasse10 -tool.version=20110413 +tool.version=20170101 tool.hide=false tool.short.name=assessment \ No newline at end of file Index: lams_tool_assessment/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/activity_insert.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_assessment/db/sql/activity_insert.sql 16 Mar 2016 12:13:16 -0000 1.3.2.1 +++ lams_tool_assessment/db/sql/activity_insert.sql 27 Feb 2017 14:00:21 -0000 1.3.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Assessment' , 'Assessment' -, 'Assessment' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 3 -, NULL -, NULL -, NULL -, NULL , 'tool/laasse10/images/icon_assessment.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.assessment.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v diff -u -r1.23 -r1.23.2.1 --- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 22 Mar 2012 08:59:51 -0000 1.23 +++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 27 Feb 2017 14:00:21 -0000 1.23.2.1 @@ -1,56 +1,67 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laasse10_attachment; -drop table if exists tl_laasse10_assessment; -drop table if exists tl_laasse10_assessment_question; -drop table if exists tl_laasse10_question_option; -drop table if exists tl_laasse10_assessment_overall_feedback; -drop table if exists tl_laasse10_assessment_unit; -drop table if exists tl_laasse10_assessment_result; -drop table if exists tl_laasse10_question_result; -drop table if exists tl_laasse10_option_answer; -drop table if exists tl_laasse10_session; -drop table if exists tl_laasse10_user; -drop table if exists tl_laasse10_question_reference; -create table tl_laasse10_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - assessment_uid bigint, - primary key (uid) -)ENGINE=InnoDB; create table tl_laasse10_assessment ( - uid bigint not null auto_increment, + uid bigint(20) not null auto_increment, create_date datetime, update_date datetime, submission_deadline datetime, create_by bigint, title varchar(255), - run_offline tinyint, time_limit integer DEFAULT 0, attempts_allowed integer DEFAULT 1, passing_mark integer DEFAULT 0, instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - allow_question_feedback tinyint, - allow_overall_feedback tinyint, - allow_right_answers tinyint, - allow_wrong_answers tinyint, - allow_grades_after_attempt tinyint, - allow_history_responses tinyint, - display_summary tinyint, + content_id bigint, + allow_question_feedback tinyint(1), + allow_overall_feedback tinyint(1), + allow_right_answers tinyint(1), + allow_wrong_answers tinyint(1), + allow_grades_after_attempt tinyint(1), + allow_history_responses tinyint(1), + display_summary tinyint(1), questions_per_page integer DEFAULT 0, - shuffled tinyint, - attempt_completion_notify tinyint DEFAULT 0, - primary key (uid) -)ENGINE=InnoDB; + shuffled tinyint(1), + attempt_completion_notify tinyint(1) DEFAULT 0, + reflect_on_activity bit(1) DEFAULT 0, + reflect_instructions mediumtext, + numbered tinyint(1) DEFAULT 1, + use_select_leader_tool_ouput tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_laasse10_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status integer, + assessment_uid bigint, + session_id bigint, + session_name varchar(250), + group_leader_uid bigint(20), + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_1720029621_24AA78C530E79035 FOREIGN KEY (assessment_uid) + REFERENCES tl_laasse10_assessment (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_laasse10_user ( + uid bigint not null auto_increment, + user_id bigint, + last_name varchar(255), + first_name varchar(255), + login_name varchar(255), + session_finished smallint, + session_uid bigint, + assessment_uid bigint, + primary key (uid), + UNIQUE KEY user_id (user_id,session_uid), + CONSTRAINT FK_NEW_1720029621_30113BFC309ED320 FOREIGN KEY (assessment_uid) + REFERENCES tl_laasse10_assessment (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1720029621_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_laasse10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_assessment_question ( uid bigint not null auto_increment, question_type smallint, @@ -65,27 +76,44 @@ feedback_on_correct text, feedback_on_partially_correct text, feedback_on_incorrect text, - shuffle tinyint, - case_sensitive tinyint, - correct_answer tinyint DEFAULT 0, - allow_rich_editor tinyint DEFAULT 0, + shuffle tinyint(1), + case_sensitive tinyint(1), + correct_answer tinyint(1) DEFAULT 0, + allow_rich_editor tinyint(1) DEFAULT 0, create_date datetime, create_by bigint, assessment_uid bigint, session_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + answer_required tinyint(1) NOT NULL DEFAULT 0, + max_words_limit int(11) DEFAULT 0, + min_words_limit int(11) DEFAULT 0, + incorrect_answer_nullifies_mark tinyint(1) NOT NULL DEFAULT 0, + hedging_justification_enabled tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (uid), + CONSTRAINT FK_NEW_1720029621_F52D1F9330E79035 FOREIGN KEY (assessment_uid) + REFERENCES tl_laasse10_assessment (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1720029621_F52D1F93758092FB FOREIGN KEY (create_by) + REFERENCES tl_laasse10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1720029621_F52D1F93EC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_laasse10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_question_reference ( uid bigint not null auto_increment, question_uid bigint, question_type smallint, title varchar(255), sequence_id integer, default_grade integer DEFAULT 1, - random_question tinyint DEFAULT 0, + random_question tinyint(1) DEFAULT 0, assessment_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_tl_laasse10_question_reference_1 FOREIGN KEY (question_uid) + REFERENCES tl_laasse10_assessment_question (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_laasse10_question_reference_2 FOREIGN KEY (assessment_uid) + REFERENCES tl_laasse10_assessment (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_question_option ( uid bigint not null unique auto_increment, question_uid bigint, @@ -96,24 +124,33 @@ accepted_error float, grade float, feedback text, - primary key (uid) -)ENGINE=InnoDB; + correct tinyint(1) NOT NULL DEFAULT 0, + primary key (uid), + CONSTRAINT FK_tl_laasse10_question_option_1 FOREIGN KEY (question_uid) + REFERENCES tl_laasse10_assessment_question (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_assessment_overall_feedback ( uid bigint not null unique auto_increment, assessment_uid bigint, sequence_id integer, grade_boundary integer, feedback text, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_tl_laasse10_assessment_overall_feedback_1 FOREIGN KEY (assessment_uid) + REFERENCES tl_laasse10_assessment (uid) ON DELETE CASCADE ON UPDATE CASCADE +); create table tl_laasse10_assessment_unit ( uid bigint not null unique auto_increment, question_uid bigint, sequence_id integer, multiplier float, unit varchar(255), - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_tl_laasse10_assessment_unit_1 FOREIGN KEY (question_uid) + REFERENCES tl_laasse10_assessment_question (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_assessment_result ( uid bigint not null auto_increment, assessment_uid bigint, @@ -123,72 +160,55 @@ session_id bigint, maximum_grade integer, grade float, - primary key (uid) -)ENGINE=InnoDB; + latest tinyint(1) DEFAULT 0, + time_limit_launched_date datetime, + primary key (uid), + CONSTRAINT FK_tl_laasse10_assessment_result_2 FOREIGN KEY (user_uid) + REFERENCES tl_laasse10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_laasse10_assessment_result_3 FOREIGN KEY (assessment_uid) + REFERENCES tl_laasse10_assessment (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_question_result ( uid bigint not null auto_increment, assessment_question_uid bigint, result_uid bigint, answer_string text, answer_float float, - answer_boolean boolean, + answer_boolean tinyint(1), submitted_option_uid bigint, mark float, penalty float, - finish_date datetime DEFAULT NULL, - primary key (uid) -)ENGINE=InnoDB; + finish_date datetime, + max_mark float, + primary key (uid), + CONSTRAINT FK_NEW_1720029621_693580A438BF8DFE FOREIGN KEY (assessment_question_uid) + REFERENCES tl_laasse10_assessment_question (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_laasse10_question_result_1 FOREIGN KEY (result_uid) + REFERENCES tl_laasse10_assessment_result (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laasse10_option_answer ( uid bigint not null unique auto_increment, question_result_uid bigint, question_option_uid bigint, - answer_boolean boolean, + answer_boolean tinyint(1), answer_int integer, - primary key (uid) -)ENGINE=InnoDB; -create table tl_laasse10_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, - assessment_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; -create table tl_laasse10_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - session_uid bigint, - assessment_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -alter table tl_laasse10_attachment add index FK_NEW_1720029621_1E7009430E79035 (assessment_uid), add constraint FK_NEW_1720029621_1E7009430E79035 foreign key (assessment_uid) references tl_laasse10_assessment (uid); -alter table tl_laasse10_assessment add index FK_NEW_1720029621_89093BF758092FB (create_by), add constraint FK_NEW_1720029621_89093BF758092FB foreign key (create_by) references tl_laasse10_user (uid); -alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F93758092FB (create_by), add constraint FK_NEW_1720029621_F52D1F93758092FB foreign key (create_by) references tl_laasse10_user (uid); -alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F9330E79035 (assessment_uid), add constraint FK_NEW_1720029621_F52D1F9330E79035 foreign key (assessment_uid) references tl_laasse10_assessment (uid); -alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_1720029621_F52D1F93EC0D3147 foreign key (session_uid) references tl_laasse10_session (uid); -alter table tl_laasse10_question_reference add index FK_tl_laasse10_question_reference_1 (question_uid), add constraint FK_tl_laasse10_question_reference_1 foreign key (question_uid) references tl_laasse10_assessment_question (uid); -alter table tl_laasse10_question_reference add index FK_tl_laasse10_question_reference_2 (assessment_uid), add constraint FK_tl_laasse10_question_reference_2 foreign key (assessment_uid) references tl_laasse10_assessment (uid); -alter table tl_laasse10_question_option add index FK_tl_laasse10_question_option_1 (question_uid), add constraint FK_tl_laasse10_question_option_1 foreign key (question_uid) references tl_laasse10_assessment_question (uid); -alter table tl_laasse10_assessment_overall_feedback add index FK_tl_laasse10_assessment_overall_feedback_1 (assessment_uid), add constraint FK_tl_laasse10_assessment_overall_feedback_1 foreign key (assessment_uid) references tl_laasse10_assessment (uid); -alter table tl_laasse10_assessment_unit add index FK_tl_laasse10_assessment_unit_1 (question_uid), add constraint FK_tl_laasse10_assessment_unit_1 foreign key (question_uid) references tl_laasse10_assessment_question (uid); -alter table tl_laasse10_assessment_result add index FK_tl_laasse10_assessment_result_2 (user_uid), add constraint FK_tl_laasse10_assessment_result_2 foreign key (user_uid) references tl_laasse10_user (uid); -alter table tl_laasse10_assessment_result add index FK_tl_laasse10_assessment_result_3 (assessment_uid), add constraint FK_tl_laasse10_assessment_result_3 foreign key (assessment_uid) references tl_laasse10_assessment (uid); -alter table tl_laasse10_question_result add index FK_NEW_1720029621_693580A438BF8DFE (assessment_question_uid), add constraint FK_NEW_1720029621_693580A438BF8DFE foreign key (assessment_question_uid) references tl_laasse10_assessment_question (uid); -alter table tl_laasse10_question_result add index FK_tl_laasse10_question_result_1 (result_uid), add constraint FK_tl_laasse10_question_result_1 foreign key (result_uid) references tl_laasse10_assessment_result (uid); -alter table tl_laasse10_option_answer add index FK_tl_laasse10_option_answer_1 (question_result_uid), add constraint FK_tl_laasse10_option_answer_1 foreign key (question_result_uid) references tl_laasse10_question_result (uid); -alter table tl_laasse10_session add index FK_NEW_1720029621_24AA78C530E79035 (assessment_uid), add constraint FK_NEW_1720029621_24AA78C530E79035 foreign key (assessment_uid) references tl_laasse10_assessment (uid); -alter table tl_laasse10_user add index FK_NEW_1720029621_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_1720029621_30113BFCEC0D3147 foreign key (session_uid) references tl_laasse10_session (uid); -alter table tl_laasse10_user add index FK_NEW_1720029621_30113BFC309ED320 (assessment_uid), add constraint FK_NEW_1720029621_30113BFC309ED320 foreign key (assessment_uid) references tl_laasse10_assessment (uid); + primary key (uid), + CONSTRAINT FK_tl_laasse10_option_answer_1 FOREIGN KEY (question_result_uid) + REFERENCES tl_laasse10_question_result (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -INSERT INTO `tl_laasse10_assessment` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, - `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_question_feedback`, - `allow_overall_feedback`, `allow_right_answers`, `allow_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `display_summary`, `shuffled`) VALUES - (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0,0,0); -SET FOREIGN_KEY_CHECKS=1; +ALTER TABLE tl_laasse10_assessment ADD CONSTRAINT FK_NEW_1720029621_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_laasse10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; +ALTER TABLE tl_laasse10_session ADD CONSTRAINT tl_laasse10_session FOREIGN KEY (group_leader_uid) + REFERENCES tl_laasse10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE; + + +INSERT INTO tl_laasse10_assessment (uid, title, instructions, content_id, allow_question_feedback, + allow_overall_feedback, allow_right_answers, allow_wrong_answers, + allow_grades_after_attempt, allow_history_responses, display_summary, shuffled) VALUES + (1,'Assessment','Instructions ',${default_content_id},0,0,0,0,0,0,0,0); + +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_assessment/db/sql/drop_lams_tool_assessment.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/drop_lams_tool_assessment.sql,v diff -u -r1.1 -r1.1.10.1 --- lams_tool_assessment/db/sql/drop_lams_tool_assessment.sql 29 Jan 2009 05:59:05 -0000 1.1 +++ lams_tool_assessment/db/sql/drop_lams_tool_assessment.sql 27 Feb 2017 14:00:21 -0000 1.1.10.1 @@ -1,13 +1,13 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laasse10_attachment; drop table if exists tl_laasse10_assessment; +drop table if exists tl_laasse10_assessment_overall_feedback; drop table if exists tl_laasse10_assessment_question; -drop table if exists tl_laasse10_question_log; +drop table if exists tl_laasse10_assessment_result; +drop table if exists tl_laasse10_assessment_unit; +drop table if exists tl_laasse10_option_answer; +drop table if exists tl_laasse10_question_option; +drop table if exists tl_laasse10_question_reference; +drop table if exists tl_laasse10_question_result; drop table if exists tl_laasse10_session; drop table if exists tl_laasse10_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_assessment/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.10.1 --- lams_tool_assessment/db/sql/library_insert.sql 29 Jan 2009 05:59:05 -0000 1.1 +++ lams_tool_assessment/db/sql/library_insert.sql 27 Feb 2017 14:00:21 -0000 1.1.10.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, Fisheye: Tag 1.1.10.1 refers to a dead (removed) revision in file `lams_tool_assessment/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/tool_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_assessment/db/sql/tool_insert.sql 24 Feb 2016 12:35:16 -0000 1.5.2.1 +++ lams_tool_assessment/db/sql/tool_insert.sql 27 Feb 2017 14:00:21 -0000 1.5.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -35,8 +29,6 @@ 'Assessment', 'assessment', '@tool_version@', -NULL, -NULL, 0, 2, 1, Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/build.properties,v diff -u -r1.4.2.1 -r1.4.2.2 --- lams_tool_bbb/build.properties 8 Sep 2015 07:15:06 -0000 1.4.2.1 +++ lams_tool_bbb/build.properties 27 Feb 2017 14:00:22 -0000 1.4.2.2 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.2 +min.server.version.number=3.0 signature=labbb10 -tool.version=20110511 +tool.version=20170101 tool.hide=true tool.short.name=bbb \ No newline at end of file Index: lams_tool_bbb/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/db/sql/activity_insert.sql,v diff -u -r1.4.2.2 -r1.4.2.3 --- lams_tool_bbb/db/sql/activity_insert.sql 11 May 2016 07:14:49 -0000 1.4.2.2 +++ lams_tool_bbb/db/sql/activity_insert.sql 27 Feb 2017 14:00:22 -0000 1.4.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'A web conferencig tool using Big Blue Button.' + 'A web conferencig tool using Big Blue Button.' , 'Web Conferencing' , 'Web Conferencing help' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/labbb10/images/icon_bbb.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.bbb.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_bbb/db/sql/create_lams_tool_bbb.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/db/sql/create_lams_tool_bbb.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_bbb/db/sql/create_lams_tool_bbb.sql 11 May 2016 07:14:49 -0000 1.2.2.1 +++ lams_tool_bbb/db/sql/create_lams_tool_bbb.sql 27 Feb 2017 14:00:22 -0000 1.2.2.2 @@ -1,39 +1,64 @@ - - SET FOREIGN_KEY_CHECKS=0; --- generated sql -drop table if exists tl_labbb10_attachment; -drop table if exists tl_labbb10_config; -drop table if exists tl_labbb10_bbb; -drop table if exists tl_labbb10_session; -drop table if exists tl_labbb10_user; -create table tl_labbb10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, bbb_uid bigint, primary key (uid)); -create table tl_labbb10_config (uid bigint not null auto_increment, config_key varchar(255), config_value varchar(255), primary key (uid)); -create table tl_labbb10_bbb (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid)); -create table tl_labbb10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), bbb_uid bigint, meeting_created bit, meeting_key varchar(255), attendee_password varchar(20), moderator_password varchar(20), primary key (uid)); -create table tl_labbb10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, bbb_session_uid bigint, notebook_entry_uid bigint, primary key (uid)); --- end generated sql --- set engine to innodb for all tables -alter table tl_labbb10_attachment engine=innodb; -alter table tl_labbb10_bbb engine=innodb; -alter table tl_labbb10_config engine=innodb; -alter table tl_labbb10_session engine=innodb; -alter table tl_labbb10_user engine=innodb; +CREATE TABLE tl_labbb10_bbb ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + reflect_on_activity bit(1), + reflect_instructions mediumtext, + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + PRIMARY KEY (uid) +); --- generated sql -alter table tl_labbb10_attachment add index fk_labbb10_bbb_attachment_to_bbb (bbb_uid), add constraint fk_labbb10_bbb_attachment_to_bbb foreign key (bbb_uid) references tl_labbb10_bbb (uid); -alter table tl_labbb10_session add index fk_labbb10_bbb_session_to_bbb (bbb_uid), add constraint fk_labbb10_bbb_session_to_bbb foreign key (bbb_uid) references tl_labbb10_bbb (uid); -alter table tl_labbb10_user add index fk_labbb10_bbb_user_to_bbb_session (bbb_session_uid), add constraint fk_labbb10_bbb_user_to_bbb_session foreign key (bbb_session_uid) references tl_labbb10_session (uid); --- end generated sql +CREATE TABLE tl_labbb10_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + bbb_uid bigint(20), + meeting_created bit(1), + meeting_key varchar(255), + attendee_password varchar(20), + moderator_password varchar(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT fk_labbb10_bbb_session_to_bbb FOREIGN KEY (bbb_uid) + REFERENCES tl_labbb10_bbb (uid) ON DELETE CASCADE ON UPDATE CASCADE +); +CREATE TABLE tl_labbb10_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + bbb_session_uid bigint(20), + notebook_entry_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT fk_labbb10_bbb_user_to_bbb_session + FOREIGN KEY (bbb_session_uid) REFERENCES tl_labbb10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_labbb10_config ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + config_key varchar(255), + config_value varchar(255), + PRIMARY KEY (uid) +); + INSERT INTO tl_labbb10_bbb ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, @@ -42,13 +67,10 @@ VALUES( "Web Conference", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, - 0, 0 ); @@ -57,4 +79,4 @@ INSERT INTO tl_labbb10_config (config_key, config_value) VALUES ("security_salt", "12309usadoiaksdjblquge12312"); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_bbb/db/sql/drop_lams_tool_bbb.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/db/sql/drop_lams_tool_bbb.sql,v diff -u -r1.1.4.1 -r1.1.4.2 --- lams_tool_bbb/db/sql/drop_lams_tool_bbb.sql 11 May 2016 07:14:49 -0000 1.1.4.1 +++ lams_tool_bbb/db/sql/drop_lams_tool_bbb.sql 27 Feb 2017 14:00:22 -0000 1.1.4.2 @@ -1,13 +1,6 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_labbb10_user; -DROP TABLE IF EXISTS tl_labbb10_attachment; +DROP TABLE IF EXISTS tl_labbb10_config; DROP TABLE IF EXISTS tl_labbb10_session; DROP TABLE IF EXISTS tl_labbb10_bbb; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_bbb/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/db/sql/tool_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_bbb/db/sql/tool_insert.sql 11 May 2016 07:14:49 -0000 1.2.2.2 +++ lams_tool_bbb/db/sql/tool_insert.sql 27 Feb 2017 14:00:22 -0000 1.2.2.3 @@ -8,8 +8,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -33,8 +31,6 @@ 'Bbb', 'bbb', '@tool_version@', -NULL, -NULL, 0, 2, 1, Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/build.properties,v diff -u -r1.19 -r1.19.2.1 --- lams_tool_chat/build.properties 30 Jul 2012 18:50:53 -0000 1.19 +++ lams_tool_chat/build.properties 27 Feb 2017 14:00:26 -0000 1.19.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lachat11 -tool.version=20110416 +tool.version=20170101 tool.hide=false tool.short.name=chat \ No newline at end of file Index: lams_tool_chat/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/activity_insert.sql,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_chat/db/sql/activity_insert.sql 11 May 2016 07:14:21 -0000 1.5.2.2 +++ lams_tool_chat/db/sql/activity_insert.sql 27 Feb 2017 14:00:26 -0000 1.5.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Chat Tool' , 'Chat Tool' -, 'Chat Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/lachat11/images/icon_chat.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.chat.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_chat/db/sql/create_lams_tool_chat.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/create_lams_tool_chat.sql,v diff -u -r1.20.2.1 -r1.20.2.2 --- lams_tool_chat/db/sql/create_lams_tool_chat.sql 11 May 2016 07:14:21 -0000 1.20.2.1 +++ lams_tool_chat/db/sql/create_lams_tool_chat.sql 27 Feb 2017 14:00:26 -0000 1.20.2.2 @@ -1,44 +1,85 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lachat11_attachment; -drop table if exists tl_lachat11_chat; -drop table if exists tl_lachat11_message; -drop table if exists tl_lachat11_session; -drop table if exists tl_lachat11_user; -drop table if exists tl_lachat11_conditions; +CREATE TABLE tl_lachat11_chat ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + reflect_on_activity bit(1), + reflect_instructions mediumtext, + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + filtering_enabled bit(1), + filter_keywords mediumtext, + submission_deadline datetime, + PRIMARY KEY (uid) +); -create table tl_lachat11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, chat_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lachat11_chat (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, filtering_enabled bit, filter_keywords text, submission_deadline datetime default null, primary key (uid))ENGINE=InnoDB; -create table tl_lachat11_message (uid bigint not null auto_increment, chat_session_uid bigint not null, from_user_uid bigint, to_user_uid bigint, type varchar(255), body text, send_date datetime, hidden bit, primary key (uid))ENGINE=InnoDB; -create table tl_lachat11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), chat_uid bigint, jabber_room varchar(250), room_created bit, primary key (uid))ENGINE=InnoDB; -create table tl_lachat11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), jabber_id varchar(255), finishedActivity bit, jabber_nickname varchar(255), chat_session_uid bigint, primary key (uid))ENGINE=InnoDB; +CREATE TABLE tl_lachat11_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + chat_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK96E446B1A3926E3 FOREIGN KEY (chat_uid) + REFERENCES tl_lachat11_chat (uid) ON DELETE CASCADE ON UPDATE CASCADE +); +CREATE TABLE tl_lachat11_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + nickname varchar(255), + chat_session_uid bigint(20), + last_presence datetime, + PRIMARY KEY (uid), + CONSTRAINT FK4EB82169C8469FC FOREIGN KEY (chat_session_uid) + REFERENCES tl_lachat11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lachat11_message ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + chat_session_uid bigint(20) NOT NULL, + from_user_uid bigint(20), + to_user_uid bigint(20), + type varchar(255), + body mediumtext, + send_date datetime, + hidden bit(1), + PRIMARY KEY (uid), + CONSTRAINT FKCC08C1DC2AF61E05 FOREIGN KEY (to_user_uid) + REFERENCES tl_lachat11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FKCC08C1DC9C8469FC FOREIGN KEY (chat_session_uid) + REFERENCES tl_lachat11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FKCC08C1DCCF3BF9B6 FOREIGN KEY (from_user_uid) + REFERENCES tl_lachat11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lachat11_conditions ( condition_id BIGINT(20) NOT NULL , content_uid BIGINT(20) , PRIMARY KEY (condition_id) , CONSTRAINT ChatConditionInheritance FOREIGN KEY (condition_id) - REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE + REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ChatConditionToChat FOREIGN KEY (content_uid) - REFERENCES tl_lachat11_chat(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; + REFERENCES tl_lachat11_chat(uid) ON DELETE CASCADE ON UPDATE CASCADE +); -alter table tl_lachat11_attachment add index FK9ED6CB2E1A3926E3 (chat_uid), add constraint FK9ED6CB2E1A3926E3 foreign key (chat_uid) references tl_lachat11_chat (uid); -alter table tl_lachat11_message add index FKCC08C1DC2AF61E05 (to_user_uid), add constraint FKCC08C1DC2AF61E05 foreign key (to_user_uid) references tl_lachat11_user (uid); -alter table tl_lachat11_message add index FKCC08C1DC9C8469FC (chat_session_uid), add constraint FKCC08C1DC9C8469FC foreign key (chat_session_uid) references tl_lachat11_session (uid); -alter table tl_lachat11_message add index FKCC08C1DCCF3BF9B6 (from_user_uid), add constraint FKCC08C1DCCF3BF9B6 foreign key (from_user_uid) references tl_lachat11_user (uid); -alter table tl_lachat11_session add index FK96E446B1A3926E3 (chat_uid), add constraint FK96E446B1A3926E3 foreign key (chat_uid) references tl_lachat11_chat (uid); -alter table tl_lachat11_user add index FK4EB82169C8469FC (chat_session_uid), add constraint FK4EB82169C8469FC foreign key (chat_session_uid) references tl_lachat11_session (uid); - INSERT INTO tl_lachat11_chat ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, filtering_enabled, content_in_use, @@ -47,14 +88,11 @@ VALUES( "Chat", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, 0, - 0, 0 ); Index: lams_tool_chat/db/sql/drop_lams_tool_chat.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/drop_lams_tool_chat.sql,v diff -u -r1.3.12.1 -r1.3.12.2 --- lams_tool_chat/db/sql/drop_lams_tool_chat.sql 11 May 2016 07:14:21 -0000 1.3.12.1 +++ lams_tool_chat/db/sql/drop_lams_tool_chat.sql 27 Feb 2017 14:00:26 -0000 1.3.12.2 @@ -1,14 +1,7 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lachat11_user; -DROP TABLE IF EXISTS tl_lachat11_attachment; +DROP TABLE IF EXISTS tl_lachat11_message; DROP TABLE IF EXISTS tl_lachat11_session; DROP TABLE IF EXISTS tl_lachat11_chat; DROP TABLE IF EXISTS tl_lachat11_conditions; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `lams_tool_chat/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/tool_insert.sql,v diff -u -r1.12.2.2 -r1.12.2.3 --- lams_tool_chat/db/sql/tool_insert.sql 11 May 2016 07:14:21 -0000 1.12.2.2 +++ lams_tool_chat/db/sql/tool_insert.sql 27 Feb 2017 14:00:26 -0000 1.12.2.3 @@ -8,8 +8,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +32,6 @@ 'Chat', 'chat', '@tool_version@', -NULL, -NULL, 0, 2, 1, Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/build.properties,v diff -u -r1.7 -r1.7.2.1 --- lams_tool_daco/build.properties 30 Jul 2012 18:51:41 -0000 1.7 +++ lams_tool_daco/build.properties 27 Feb 2017 14:00:11 -0000 1.7.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=ladaco10 -tool.version=20090326 +tool.version=20170101 tool.hide=false tool.short.name=daco \ No newline at end of file Index: lams_tool_daco/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/activity_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_daco/db/sql/activity_insert.sql 16 Mar 2016 12:13:29 -0000 1.5.2.1 +++ lams_tool_daco/db/sql/activity_insert.sql 27 Feb 2017 14:00:11 -0000 1.5.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'Collecting data with custom structure.' + 'Collecting data with custom structure.' , 'Data Collection' , 'Asking questions with custom, limited answers.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 6 -, NULL -, NULL -, NULL -, NULL , 'tool/ladaco10/images/icon_daco.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.daco.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_daco/db/sql/create_lams_tool_daco.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/create_lams_tool_daco.sql,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_daco/db/sql/create_lams_tool_daco.sql 19 Feb 2012 20:18:41 -0000 1.10 +++ lams_tool_daco/db/sql/create_lams_tool_daco.sql 27 Feb 2017 14:00:11 -0000 1.10.2.1 @@ -1,81 +1,71 @@ SET FOREIGN_KEY_CHECKS=0; -DROP TABLE if exists tl_ladaco10_attachments cascade; -DROP TABLE if exists tl_ladaco10_contents cascade; -DROP TABLE if exists tl_ladaco10_questions cascade; -DROP TABLE if exists tl_ladaco10_answer_options cascade; -DROP TABLE if exists tl_ladaco10_sessions cascade; -DROP TABLE if exists tl_ladaco10_users cascade; -DROP TABLE if exists tl_ladaco10_answers cascade; - CREATE TABLE tl_ladaco10_contents ( uid bigint NOT NULL UNIQUE auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint DEFAULT 0, - lock_on_finished tinyint DEFAULT 0, + lock_on_finished tinyint(1) DEFAULT 0, min_records tinyint unsigned DEFAULT 0, max_records tinyint unsigned DEFAULT 0, instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint DEFAULT 0, - define_later tinyint DEFAULT 0, - content_id bigint UNIQUE, - reflect_instructions varchar(255), - reflect_on_activity tinyint, - learner_entry_notify tinyint DEFAULT 0, - record_submit_notify tinyint DEFAULT 0, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + content_in_use tinyint(1) DEFAULT 0, + define_later tinyint(1) DEFAULT 0, + content_id bigint, + reflect_instructions text, + reflect_on_activity tinyint(1), + learner_entry_notify tinyint(1) DEFAULT 0, + record_submit_notify tinyint(1) DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); CREATE TABLE tl_ladaco10_sessions ( uid bigint NOT NULL UNIQUE auto_increment, session_end_date datetime, session_start_date datetime, status integer, content_uid bigint, - session_id bigint UNIQUE, + session_id bigint, session_name varchar(250), - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT SessionToDaco FOREIGN KEY (content_uid) + REFERENCES tl_ladaco10_contents (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -CREATE TABLE tl_ladaco10_attachments ( - uid bigint NOT NULL UNIQUE auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime , - content_uid bigint, - PRIMARY KEY (uid) -)ENGINE=InnoDB; - CREATE TABLE tl_ladaco10_questions ( uid bigint NOT NULL UNIQUE auto_increment, description text, create_by bigint, create_date datetime , - is_required tinyint DEFAULT 0, + is_required tinyint(1) DEFAULT 0, question_type tinyint unsigned, min_constraint float, max_constraint float, digits_decimal tinyint unsigned, summary tinyint unsigned, content_uid bigint, session_uid bigint, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + CONSTRAINT QuestionToDaco FOREIGN KEY (content_uid) + REFERENCES tl_ladaco10_contents (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT QuestionToUser FOREIGN KEY (create_by) + REFERENCES tl_ladaco10_users (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT tl_ladaco10_questions_ibfk_1 FOREIGN KEY (session_uid) + REFERENCES tl_ladaco10_sessions (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -CREATE TABLE tl_ladaco10_answer_options -(uid bigint NOT NULL UNIQUE auto_increment, -question_uid bigint, -sequence_num tinyint unsigned DEFAULT 1, -answer_option varchar(255), -PRIMARY KEY (uid)) -ENGINE=InnoDB; +CREATE TABLE tl_ladaco10_answer_options ( + uid bigint NOT NULL UNIQUE auto_increment, + question_uid bigint, + sequence_num tinyint unsigned DEFAULT 1, + answer_option varchar(255), + PRIMARY KEY (uid), + CONSTRAINT tl_ladaco10_answer_options_ibfk_1 FOREIGN KEY (question_uid) + REFERENCES tl_ladaco10_questions (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_ladaco10_users ( uid bigint NOT NULL auto_increment, @@ -86,8 +76,12 @@ session_finished smallint, session_uid bigint, content_uid bigint, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + CONSTRAINT UserToDaco FOREIGN KEY (content_uid) + REFERENCES tl_ladaco10_contents (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT UserToSession FOREIGN KEY (session_uid) + REFERENCES tl_ladaco10_sessions (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_ladaco10_answers ( uid bigint NOT NULL UNIQUE auto_increment, @@ -100,25 +94,23 @@ file_uuid bigint, file_version_id bigint, create_date datetime, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + CONSTRAINT AnswerToQuestion FOREIGN KEY (question_uid) + REFERENCES tl_ladaco10_questions (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT AnswerToUser FOREIGN KEY (user_uid) + REFERENCES tl_ladaco10_users (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -ALTER TABLE tl_ladaco10_attachments ADD INDEX (content_uid), ADD CONSTRAINT FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid); -ALTER TABLE tl_ladaco10_contents ADD INDEX (create_by), ADD CONSTRAINT DacoToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid); -ALTER TABLE tl_ladaco10_questions ADD INDEX (create_by), ADD CONSTRAINT QuestionToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid); -ALTER TABLE tl_ladaco10_questions ADD INDEX (content_uid), ADD CONSTRAINT QuestionToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid); -ALTER TABLE tl_ladaco10_questions ADD INDEX (session_uid), ADD CONSTRAINT FOREIGN KEY (session_uid) REFERENCES tl_ladaco10_sessions (uid); -ALTER TABLE tl_ladaco10_answer_options ADD INDEX (question_uid), ADD CONSTRAINT FOREIGN KEY (question_uid) REFERENCES tl_ladaco10_questions (uid); -ALTER TABLE tl_ladaco10_sessions ADD INDEX (content_uid), ADD CONSTRAINT SessionToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid); -ALTER TABLE tl_ladaco10_users ADD INDEX (session_uid), ADD CONSTRAINT UserToSession FOREIGN KEY (session_uid) REFERENCES tl_ladaco10_sessions (uid); -ALTER TABLE tl_ladaco10_users ADD INDEX (content_uid), ADD CONSTRAINT UserToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid); -ALTER TABLE tl_ladaco10_answers ADD INDEX (user_uid), ADD CONSTRAINT AnswerToUser FOREIGN KEY (user_uid) REFERENCES tl_ladaco10_users (uid); -ALTER TABLE tl_ladaco10_answers ADD INDEX (question_uid), ADD CONSTRAINT AnswerToQuestion FOREIGN KEY (question_uid) REFERENCES tl_ladaco10_questions (uid); -INSERT INTO `tl_ladaco10_contents` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,`min_records`,`max_records`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`,`reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'Data Collection',0,0,0,0,'Instructions',NULL,NULL,0,0,${default_content_id},0); +ALTER TABLE tl_ladaco10_contents ADD CONSTRAINT DacoToUser FOREIGN KEY (create_by) + REFERENCES tl_ladaco10_users (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_ladaco10_contents (uid, title, lock_on_finished,min_records,max_records, instructions, + content_in_use, define_later, content_id,reflect_on_activity) VALUES + (1,'Data Collection',0,0,0,'Instructions',0,0,${default_content_id},0); -INSERT INTO `tl_ladaco10_questions` (`uid`, `description`, `create_by`, `create_date`, `is_required`, `question_type`, `min_constraint`, `max_constraint`,`digits_decimal`,`summary`, `content_uid`, `session_uid`) VALUES - (DEFAULT,'
What is your favourite colour?
',NULL,NOW(),0,1,NULL,NULL,NULL,NULL,1,NULL); +INSERT INTO tl_ladaco10_questions (uid, description, create_date, is_required, question_type, content_uid) VALUES + (NULL,'
What is your favourite colour?
',NOW(),0,1,1); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_daco/db/sql/drop_lams_tool_daco.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/drop_lams_tool_daco.sql,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_daco/db/sql/drop_lams_tool_daco.sql 7 Jul 2009 00:46:07 -0000 1.4 +++ lams_tool_daco/db/sql/drop_lams_tool_daco.sql 27 Feb 2017 14:00:11 -0000 1.4.2.1 @@ -1,5 +1,4 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_ladaco10_attachments; drop table if exists tl_ladaco10_contents; drop table if exists tl_ladaco10_questions; drop table if exists tl_ladaco10_answer_options; Index: lams_tool_daco/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/library_insert.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_daco/db/sql/library_insert.sql 7 Jul 2009 00:46:07 -0000 1.3 +++ lams_tool_daco/db/sql/library_insert.sql 27 Feb 2017 14:00:11 -0000 1.3.2.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Data Collection', 0, NOW() -) +) \ No newline at end of file Index: lams_tool_daco/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/tool_insert.sql,v diff -u -r1.6.2.1 -r1.6.2.2 --- lams_tool_daco/db/sql/tool_insert.sql 24 Feb 2016 12:35:52 -0000 1.6.2.1 +++ lams_tool_daco/db/sql/tool_insert.sql 27 Feb 2017 14:00:11 -0000 1.6.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -35,8 +29,6 @@ 'Collecting data with custom structure.', 'daco', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +43,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/build.properties,v diff -u -r1.30 -r1.30.2.1 --- lams_tool_forum/build.properties 30 Jul 2012 18:51:58 -0000 1.30 +++ lams_tool_forum/build.properties 27 Feb 2017 14:00:12 -0000 1.30.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lafrum11 -tool.version=20110408 +tool.version=20170101 tool.hide=false tool.short.name=forum \ No newline at end of file Index: lams_tool_forum/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/activity_insert.sql,v diff -u -r1.13.2.2 -r1.13.2.3 --- lams_tool_forum/db/sql/activity_insert.sql 11 May 2016 07:15:00 -0000 1.13.2.2 +++ lams_tool_forum/db/sql/activity_insert.sql 27 Feb 2017 14:00:12 -0000 1.13.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'Forum/Message Board' + 'Forum/Message Board' , 'Forum' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/lafrum11/images/icon_forum.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.forum.ApplicationResources' -) +) \ No newline at end of file Fisheye: Tag 1.9.2.2 refers to a dead (removed) revision in file `lams_tool_forum/db/sql/cleanup_lams_tool_forum.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/create_lams_tool_forum.sql,v diff -u -r1.38.2.1 -r1.38.2.2 --- lams_tool_forum/db/sql/create_lams_tool_forum.sql 11 May 2016 07:15:00 -0000 1.38.2.1 +++ lams_tool_forum/db/sql/create_lams_tool_forum.sql 27 Feb 2017 14:00:12 -0000 1.38.2.2 @@ -1,68 +1,78 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lafrum11_attachment; -drop table if exists tl_lafrum11_forum; -drop table if exists tl_lafrum11_forum_user; -drop table if exists tl_lafrum11_message; -drop table if exists tl_lafrum11_message_seq; -drop table if exists tl_lafrum11_report; -drop table if exists tl_lafrum11_message_rating; -drop table if exists tl_lafrum11_tool_session; -drop table if exists tl_lafrum11_timestamp; -create table tl_lafrum11_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - forum_uid bigint, - message_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + create table tl_lafrum11_forum ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - allow_anonym smallint, - run_offline smallint, - lock_on_finished smallint, + allow_anonym tinyint(1), + lock_on_finished tinyint(1), instructions text, - online_instructions text, - offline_instructions text, - content_in_use smallint, - define_later smallint, - content_id bigint unique, - allow_edit smallint, - allow_rich_editor smallint, - allow_new_topic smallint, - allow_upload smallint, - allow_rate_messages smallint, + content_in_use tinyint(1), + define_later tinyint(1), + content_id bigint, + allow_edit tinyint(1), + allow_rich_editor tinyint(1), + allow_new_topic tinyint(1), + allow_upload tinyint(1), + allow_rate_messages tinyint(1), maximum_reply integer, minimum_reply integer, limited_of_chars integer, - limited_input_flag smallint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - notify_learners_on_forum_posting tinyint DEFAULT 0, - notify_teachers_on_forum_posting tinyint DEFAULT 0, - mark_release_notify tinyint DEFAULT 0, + limited_input_flag tinyint(1), + reflect_instructions text, + reflect_on_activity tinyint(1), + notify_learners_on_forum_posting tinyint(1) DEFAULT 0, + notify_teachers_on_forum_posting tinyint(1) DEFAULT 0, + mark_release_notify tinyint(1) DEFAULT 0, submission_deadline datetime, - primary key (uid) -)ENGINE=InnoDB; + minimum_rate int(11) DEFAULT 0, + maximum_rate int(11) DEFAULT 0, + min_characters int(11) DEFAULT 0, + limited_min_characters tinyint(1) DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_lafrum11_tool_session ( + uid bigint not null auto_increment, + version integer not null, + session_end_date datetime, + session_start_date datetime, + status integer, + mark_released tinyint(1), + forum_uid bigint, + session_id bigint, + session_name varchar(250), + primary key (uid), + UNIQUE KEY (session_id), + CONSTRAINT FK5A04D7AE131CE31E FOREIGN KEY (forum_uid) + REFERENCES tl_lafrum11_forum (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lafrum11_forum_user ( uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), - session_finished smallint, + session_finished tinyint(1), + primary key (uid), + KEY idx_user_id (user_id), + CONSTRAINT FK7B83A4A85F0116B6 FOREIGN KEY (session_id) + REFERENCES tl_lafrum11_tool_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_lafrum11_report ( + uid bigint not null auto_increment, + comment text, + release_date datetime, + mark float, primary key (uid) -)ENGINE=InnoDB; +); + create table tl_lafrum11_message ( uid bigint not null auto_increment, create_date datetime, @@ -73,31 +83,44 @@ subject varchar(255), body text, sequence_id integer, - is_authored smallint, - is_anonymous smallint, + is_authored tinyint(1), + is_anonymous tinyint(1), forum_session_uid bigint, parent_uid bigint, forum_uid bigint, reply_number integer, - hide_flag smallint, + hide_flag tinyint(1), report_id bigint, authored_parent_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + is_monitor tinyint(1) DEFAULT 0, + PRIMARY KEY (uid), + CONSTRAINT FK4A6067E8131CE31E FOREIGN KEY (forum_uid) + REFERENCES tl_lafrum11_forum (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK4A6067E8647A7264 FOREIGN KEY (modified_by) + REFERENCES tl_lafrum11_forum_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK4A6067E89357B45B FOREIGN KEY (forum_session_uid) + REFERENCES tl_lafrum11_tool_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK4A6067E897F0DB46 FOREIGN KEY (report_id) + REFERENCES tl_lafrum11_report (uid), + CONSTRAINT FK4A6067E8E42F4351 FOREIGN KEY (create_by) + REFERENCES tl_lafrum11_forum_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); + create table tl_lafrum11_message_seq ( uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_lafrum11_report ( - uid bigint not null auto_increment, - comment text, - release_date datetime, - mark float, - primary key (uid) -)ENGINE=InnoDB; + thread_message_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FKD2C71F8845213B4D FOREIGN KEY (root_message_uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FKD2C71F88FE939F2A FOREIGN KEY (message_uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT fkfrum11mseqthread FOREIGN KEY (thread_message_uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lafrum11_message_rating ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , rating float @@ -110,19 +133,8 @@ , INDEX (message_id) , CONSTRAINT FK_tl_lafrum11_message_rating_2 FOREIGN KEY (message_id) REFERENCES tl_lafrum11_message (uid) -)ENGINE=InnoDB; -create table tl_lafrum11_tool_session ( - uid bigint not null auto_increment, - version integer not null, - session_end_date datetime, - session_start_date datetime, - status integer, - mark_released smallint, - forum_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; +); + CREATE TABLE tl_lafrum11_conditions ( condition_id BIGINT(20) NOT NULL , content_uid BIGINT(20) @@ -131,7 +143,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid) REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE tl_lafrum11_condition_topics ( condition_id BIGINT(20) @@ -141,40 +153,48 @@ REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid) REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); + create table tl_lafrum11_timestamp ( uid BIGINT(20) not null auto_increment, message_uid BIGINT(20) not null, timestamp_date DATETIME not null, forum_user_uid BIGINT(20) not null, - primary key (`uid`), - unique key `uid` (`uid`), - key `message_uid` (`message_uid`), - key `forum_user_uid` (`forum_user_uid`) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT ForumUserFK FOREIGN KEY (forum_user_uid) + REFERENCES tl_lafrum11_forum_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT MessageFK FOREIGN KEY (message_uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid); -alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); -alter table tl_lafrum11_forum add index FK87917942E42F4351 (create_by), add constraint FK87917942E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid); -alter table tl_lafrum11_forum_user add index FK7B83A4A85F0116B6 (session_id), add constraint FK7B83A4A85F0116B6 foreign key (session_id) references tl_lafrum11_tool_session (uid); -alter table tl_lafrum11_message add index FK4A6067E8E42F4351 (create_by), add constraint FK4A6067E8E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid); -alter table tl_lafrum11_message add index FK4A6067E897F0DB46 (report_id), add constraint FK4A6067E897F0DB46 foreign key (report_id) references tl_lafrum11_report (uid); -alter table tl_lafrum11_message add index FK4A6067E8131CE31E (forum_uid), add constraint FK4A6067E8131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); -alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid); -alter table tl_lafrum11_message add index FK4A6067E89357B45B (forum_session_uid), add constraint FK4A6067E89357B45B foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid); -alter table tl_lafrum11_message add index FK4A6067E8647A7264 (modified_by), add constraint FK4A6067E8647A7264 foreign key (modified_by) references tl_lafrum11_forum_user (uid); -alter table tl_lafrum11_message add index IX_msg_auth_parent (authored_parent_uid); -alter table tl_lafrum11_message_seq add index FKD2C71F88FE939F2A (message_uid), add constraint FKD2C71F88FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid); -alter table tl_lafrum11_message_seq add index FKD2C71F8845213B4D (root_message_uid), add constraint FKD2C71F8845213B4D foreign key (root_message_uid) references tl_lafrum11_message (uid); -alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); -alter table tl_lafrum11_timestamp add index ForumUserFK (forum_user_uid), add constraint ForumUserFK foreign key (forum_user_uid) references tl_lafrum11_forum_user (uid); -alter table tl_lafrum11_timestamp add index MessageFK (message_uid), add constraint MessageFK foreign key (message_uid) references tl_lafrum11_message (uid); +create table tl_lafrum11_attachment ( + uid bigint not null auto_increment, + file_version_id bigint, + file_type varchar(255), + file_name varchar(255), + file_uuid bigint, + create_date datetime, + forum_uid bigint, + message_uid bigint, + primary key (uid), + CONSTRAINT FK389AD9A2131CE31E FOREIGN KEY (forum_uid) + REFERENCES tl_lafrum11_forum (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK389AD9A2FE939F2A FOREIGN KEY (message_uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -INSERT INTO tl_lafrum11_forum (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor, + +ALTER TABLE tl_lafrum11_forum ADD CONSTRAINT FK87917942E42F4351 FOREIGN KEY (create_by) + REFERENCES tl_lafrum11_forum_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; +ALTER TABLE tl_lafrum11_message ADD CONSTRAINT FK4A6067E824089E4D FOREIGN KEY (parent_uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +INSERT INTO tl_lafrum11_forum (uid,title,instructions,content_id,allow_anonym,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor, allow_new_topic,allow_upload,allow_rate_messages,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,notify_learners_on_forum_posting,notify_teachers_on_forum_posting,reflect_on_activity) -VALUES(1,"Forum","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,0,0,1,0,1,5000,0,0,0); +VALUES(1,"Forum","Instructions",${default_content_id},0,0,0,0,1,0,1,0,0,1,0,1,5000,0,0,0); -INSERT INTO `tl_lafrum11_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `sequence_id`, `is_authored`, `is_anonymous`, `forum_session_uid`, `parent_uid`, `forum_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES - (1,NOW(),NOW(),NOW(),null,null,'Topic Heading','Topic message',1,1,0,NULL,NULL,1,0,0,NULL); +INSERT INTO tl_lafrum11_message (uid, create_date, last_reply_date, update_date, subject, body, + sequence_id, is_authored, is_anonymous, forum_uid, reply_number, hide_flag) +VALUES (1,NOW(),NOW(),NOW(),'Topic Heading','Topic message',1,1,0,1,0,0); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/drop_lams_tool_forum.sql,v diff -u -r1.12.10.1 -r1.12.10.2 --- lams_tool_forum/db/sql/drop_lams_tool_forum.sql 11 May 2016 07:15:00 -0000 1.12.10.1 +++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql 27 Feb 2017 14:00:12 -0000 1.12.10.2 @@ -1,19 +1,13 @@ - - SET FOREIGN_KEY_CHECKS=0; drop table if exists tl_lafrum11_attachment; drop table if exists tl_lafrum11_forum; drop table if exists tl_lafrum11_forum_user; drop table if exists tl_lafrum11_message; drop table if exists tl_lafrum11_message_seq; +drop table if exists tl_lafrum11_message_rating; drop table if exists tl_lafrum11_tool_session; drop table if exists tl_lafrum11_report; drop table if exists tl_lafrum11_condition_topics; drop table if exists tl_lafrum11_conditions; drop table if exists tl_lafrum11_timestamp; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Fisheye: Tag 1.5.14.2 refers to a dead (removed) revision in file `lams_tool_forum/db/sql/insert_lams_tool_forum_data.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.26.2.1 refers to a dead (removed) revision in file `lams_tool_forum/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/tool_insert.sql,v diff -u -r1.29.2.2 -r1.29.2.3 --- lams_tool_forum/db/sql/tool_insert.sql 11 May 2016 07:15:00 -0000 1.29.2.2 +++ lams_tool_forum/db/sql/tool_insert.sql 27 Feb 2017 14:00:12 -0000 1.29.2.3 @@ -8,8 +8,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +32,6 @@ 'Forum / Message Boards', 'forum', '@tool_version@', -NULL, -NULL, 0, 2, 1, Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/build.properties,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_gmap/build.properties 30 Jul 2012 18:51:34 -0000 1.3 +++ lams_tool_gmap/build.properties 27 Feb 2017 14:00:06 -0000 1.3.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=lagmap10 -tool.version=20080521 +tool.version=20170101 tool.hide=false tool.short.name=gmap \ No newline at end of file Index: lams_tool_gmap/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/activity_insert.sql,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_gmap/db/sql/activity_insert.sql 11 May 2016 07:14:33 -0000 1.3.2.2 +++ lams_tool_gmap/db/sql/activity_insert.sql 27 Feb 2017 14:00:06 -0000 1.3.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Gmap Tool' , 'Gmap Tool' -, 'Gmap Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/lagmap10/images/icon_gmap.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.gmap.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/create_lams_tool_gmap.sql,v diff -u -r1.12.2.1 -r1.12.2.2 --- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql 11 May 2016 07:14:33 -0000 1.12.2.1 +++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql 27 Feb 2017 14:00:06 -0000 1.12.2.2 @@ -1,26 +1,93 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lagmap10_attachment; -drop table if exists tl_lagmap10_gmap; -drop table if exists tl_lagmap10_marker; -drop table if exists tl_lagmap10_session; -drop table if exists tl_lagmap10_user; -drop table if exists tl_lagmap10_configuration; -create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), reflect_on_activity bit, reflect_instructions text, default_geocoder_address varchar(255), primary key (uid))ENGINE=InnoDB; -create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lagmap10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))ENGINE=InnoDB; -alter table tl_lagmap10_attachment add index FKBA2ECCB274028C80 (gmap_uid), add constraint FKBA2ECCB274028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid); -alter table tl_lagmap10_marker add index FK10F2274974028C80 (gmap_uid), add constraint FK10F2274974028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid); -alter table tl_lagmap10_marker add index FK10F22749C5F056D9 (gmap_session_uid), add constraint FK10F22749C5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid); -alter table tl_lagmap10_marker add index FK10F22749EF5F6920 (updated_by), add constraint FK10F22749EF5F6920 foreign key (updated_by) references tl_lagmap10_user (uid); -alter table tl_lagmap10_marker add index FK10F22749529F7FD3 (created_by), add constraint FK10F22749529F7FD3 foreign key (created_by) references tl_lagmap10_user (uid); -alter table tl_lagmap10_session add index FK519D516774028C80 (gmap_uid), add constraint FK519D516774028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid); -alter table tl_lagmap10_user add index FK7CB3F69AC5F056D9 (gmap_session_uid), add constraint FK7CB3F69AC5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid); +CREATE TABLE tl_lagmap10_gmap ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + allow_edit_markers bit(1), + show_all_markers bit(1), + limit_markers bit(1), + max_markers int(11), + allow_zoom bit(1), + allow_terrain bit(1), + allow_satellite bit(1), + allow_hybrid bit(1), + map_center_latitude double, + map_center_longitude double, + map_zoom int(11), + map_type varchar(20), + reflect_on_activity bit(1), + reflect_instructions mediumtext, + default_geocoder_address varchar(255), + PRIMARY KEY (uid) +); + +CREATE TABLE tl_lagmap10_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + gmap_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK519D516774028C80 FOREIGN KEY (gmap_uid) + REFERENCES tl_lagmap10_gmap (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + + CREATE TABLE tl_lagmap10_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + gmap_session_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK7CB3F69AC5F056D9 FOREIGN KEY (gmap_session_uid) + REFERENCES tl_lagmap10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lagmap10_marker ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + longitude double, + latitude double, + info_window_message mediumtext, + create_date datetime, + update_date datetime, + is_authored bit(1), + gmap_uid bigint(20), + title varchar(55), + created_by bigint(20), + updated_by bigint(20), + gmap_session_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK10F22749529F7FD3 FOREIGN KEY (created_by) + REFERENCES tl_lagmap10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK10F2274974028C80 FOREIGN KEY (gmap_uid) + REFERENCES tl_lagmap10_gmap (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK10F22749C5F056D9 FOREIGN KEY (gmap_session_uid) + REFERENCES tl_lagmap10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK10F22749EF5F6920 FOREIGN KEY (updated_by) + REFERENCES tl_lagmap10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); + +CREATE TABLE tl_lagmap10_configuration ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + config_key varchar(30), + config_value varchar(255), + PRIMARY KEY (uid), + UNIQUE KEY config_key (config_key) +); + -- Inserting the required config item into the config table -- Gmap API key is added here for shaun so the Gmap works there automatically for each build INSERT INTO tl_lagmap10_configuration ( @@ -36,10 +103,7 @@ INSERT INTO tl_lagmap10_gmap ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, @@ -62,13 +126,10 @@ VALUES( "Gmap", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, - 0, 1, 1, 0, @@ -86,4 +147,4 @@ "Macquarie University, Sydney NSW" ); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_gmap/db/sql/drop_lams_tool_gmap.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/drop_lams_tool_gmap.sql,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_gmap/db/sql/drop_lams_tool_gmap.sql 11 May 2016 07:14:33 -0000 1.1.12.1 +++ lams_tool_gmap/db/sql/drop_lams_tool_gmap.sql 27 Feb 2017 14:00:06 -0000 1.1.12.2 @@ -1,13 +1,7 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lagmap10_user; -DROP TABLE IF EXISTS tl_lagmap10_attachment; +DROP TABLE IF EXISTS tl_lagmap10_configuration; DROP TABLE IF EXISTS tl_lagmap10_session; DROP TABLE IF EXISTS tl_lagmap10_gmap; -SET FOREIGN_KEY_CHECKS=1; - - - - - +DROP TABLE IF EXISTS tl_lagmap10_marker; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Fisheye: Tag 1.10.2.1 refers to a dead (removed) revision in file `lams_tool_gmap/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/tool_insert.sql,v diff -u -r1.4.2.2 -r1.4.2.3 --- lams_tool_gmap/db/sql/tool_insert.sql 11 May 2016 07:14:33 -0000 1.4.2.2 +++ lams_tool_gmap/db/sql/tool_insert.sql 27 Feb 2017 14:00:06 -0000 1.4.2.3 @@ -8,8 +8,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -33,8 +31,6 @@ 'Gmap', 'gmap', '@tool_version@', -NULL, -NULL, 0, 2, 1, Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/build.properties,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_images/build.properties 30 Jul 2012 18:51:46 -0000 1.5 +++ lams_tool_images/build.properties 27 Feb 2017 14:00:36 -0000 1.5.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.3 +min.server.version.number=3.0 signature=laimag10 -tool.version=20090819 +tool.version=20170101 tool.hide=false tool.short.name=imageGallery \ No newline at end of file Index: lams_tool_images/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/activity_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_images/db/sql/activity_insert.sql 16 Mar 2016 12:13:28 -0000 1.2.2.1 +++ lams_tool_images/db/sql/activity_insert.sql 27 Feb 2017 14:00:36 -0000 1.2.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'ImageGallery' , 'ImageGallery' -, 'ImageGallery' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/laimag10/images/icon_imageGallery.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.imageGallery.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/create_lams_tool_imageGallery.sql,v diff -u -r1.17 -r1.17.2.1 --- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql 4 Feb 2014 23:22:22 -0000 1.17 +++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql 27 Feb 2017 14:00:36 -0000 1.17.2.1 @@ -1,58 +1,68 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laimag10_attachment; -drop table if exists tl_laimag10_imagegallery; -drop table if exists tl_laimag10_imagegallery_item; -drop table if exists tl_laimag10_image_comment; -drop table if exists tl_laimag10_image_rating; -drop table if exists tl_laimag10_image_vote; -drop table if exists tl_laimag10_item_log; -drop table if exists tl_laimag10_session; -drop table if exists tl_laimag10_user; -drop table if exists tl_laimag10_configuration; -create table tl_laimag10_attachment ( - attachment_uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - imageGallery_uid bigint, - primary key (attachment_uid) -)ENGINE=InnoDB; create table tl_laimag10_imagegallery ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint, - lock_on_finished tinyint, + lock_on_finished tinyint(1), instructions text, next_image_title bigint, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - allow_comment_images tinyint, - allow_share_images tinyint, - allow_vote tinyint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - allow_rank tinyint, - image_submit_notify tinyint DEFAULT 0, - primary key (uid) -)ENGINE=InnoDB; + content_in_use tinyint(1), + define_later tinyint(1), + content_id bigint, + allow_share_images tinyint(1), + allow_vote tinyint(1), + reflect_instructions text, + reflect_on_activity tinyint(1), + allow_rank tinyint(1), + image_submit_notify tinyint(1) DEFAULT 0, + minimum_rates int(11) DEFAULT 0, + maximum_rates int(11) DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_laimag10_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status integer, + imageGallery_uid bigint, + session_id bigint, + session_name varchar(250), + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_1821149711_24AA78C530E79035 FOREIGN KEY (imageGallery_uid) + REFERENCES tl_laimag10_imagegallery (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_laimag10_user ( + uid bigint not null auto_increment, + user_id bigint, + last_name varchar(255), + first_name varchar(255), + login_name varchar(255), + session_finished smallint, + session_uid bigint, + imageGallery_uid bigint, + primary key (uid), + CONSTRAINT FK_NEW_1821149711_30113BFC309ED320 FOREIGN KEY (imageGallery_uid) + REFERENCES tl_laimag10_imagegallery (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1821149711_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_laimag10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laimag10_imagegallery_item ( uid bigint not null auto_increment, description text, title varchar(255), create_by bigint, create_date datetime, - create_by_author tinyint, + create_by_author tinyint(1), sequence_id integer, - is_hide tinyint, + is_hide tinyint(1), imageGallery_uid bigint, original_file_uuid bigint, original_image_width integer, @@ -64,92 +74,61 @@ file_version_id bigint, file_type varchar(255), file_name varchar(255), - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimag10_image_comment ( - uid bigint not null auto_increment, - comment text, - imageGallery_item_uid bigint, - create_by bigint, - create_date datetime, - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimag10_image_rating ( - uid bigint not null auto_increment, - rating integer, - imageGallery_item_uid bigint, - create_by bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_1821149711_F52D1F9330E79035 FOREIGN KEY (imageGallery_uid) + REFERENCES tl_laimag10_imagegallery (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1821149711_F52D1F93758092FB FOREIGN KEY (create_by) + REFERENCES tl_laimag10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); + create table tl_laimag10_image_vote ( uid bigint not null auto_increment, - is_voted tinyint, + is_voted tinyint(1), imageGallery_item_uid bigint, create_by bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_tl_laimag10_image_vote_2 FOREIGN KEY (create_by) + REFERENCES tl_laimag10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK_tl_laimag10_image_vote_3 FOREIGN KEY (imageGallery_item_uid) + REFERENCES tl_laimag10_imagegallery_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laimag10_item_log ( uid bigint not null auto_increment, access_date datetime, imageGallery_item_uid bigint, user_uid bigint, - complete tinyint, + complete tinyint(1), session_id bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimag10_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, - imageGallery_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimag10_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - session_uid bigint, - imageGallery_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_1821149711_693580A438BF8DFE FOREIGN KEY (imageGallery_item_uid) + REFERENCES tl_laimag10_imagegallery_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1821149711_693580A441F9365D FOREIGN KEY (user_uid) + REFERENCES tl_laimag10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laimag10_configuration ( uid bigint not null auto_increment, - config_key varchar(30) unique, + config_key varchar(30), config_value varchar(255), - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + UNIQUE KEY config_key (config_key) +); -alter table tl_laimag10_attachment add index FK_NEW_1821149711_1E7009430E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_1E7009430E79035 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid); -alter table tl_laimag10_imagegallery add index FK_NEW_1821149711_89093BF758092FB (create_by), add constraint FK_NEW_1821149711_89093BF758092FB foreign key (create_by) references tl_laimag10_user (uid); -alter table tl_laimag10_imagegallery_item add index FK_NEW_1821149711_F52D1F93758092FB (create_by), add constraint FK_NEW_1821149711_F52D1F93758092FB foreign key (create_by) references tl_laimag10_user (uid); -alter table tl_laimag10_imagegallery_item add index FK_NEW_1821149711_F52D1F9330E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_F52D1F9330E79035 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid); -alter table tl_laimag10_image_comment add index FK_tl_laimag10_image_comment_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_comment_3 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid); -alter table tl_laimag10_image_comment add index FK_tl_laimag10_image_comment_2 (create_by), add constraint FK_tl_laimag10_image_comment_2 foreign key (create_by) references tl_laimag10_user (uid); -alter table tl_laimag10_image_rating add index FK_tl_laimag10_image_rating_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_rating_3 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid); -alter table tl_laimag10_image_rating add index FK_tl_laimag10_image_rating_2 (create_by), add constraint FK_tl_laimag10_image_rating_2 foreign key (create_by) references tl_laimag10_user (uid); -alter table tl_laimag10_image_vote add index FK_tl_laimag10_image_vote_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_vote_3 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid); -alter table tl_laimag10_image_vote add index FK_tl_laimag10_image_vote_2 (create_by), add constraint FK_tl_laimag10_image_vote_2 foreign key (create_by) references tl_laimag10_user (uid); -alter table tl_laimag10_item_log add index FK_NEW_1821149711_693580A438BF8DFE (imageGallery_item_uid), add constraint FK_NEW_1821149711_693580A438BF8DFE foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid); -alter table tl_laimag10_item_log add index FK_NEW_1821149711_693580A441F9365D (user_uid), add constraint FK_NEW_1821149711_693580A441F9365D foreign key (user_uid) references tl_laimag10_user (uid); -alter table tl_laimag10_session add index FK_NEW_1821149711_24AA78C530E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_24AA78C530E79035 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid); -alter table tl_laimag10_user add index FK_NEW_1821149711_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_1821149711_30113BFCEC0D3147 foreign key (session_uid) references tl_laimag10_session (uid); -alter table tl_laimag10_user add index FK_NEW_1821149711_30113BFC309ED320 (imageGallery_uid), add constraint FK_NEW_1821149711_30113BFC309ED320 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid); -INSERT INTO `tl_laimag10_imagegallery` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, - `instructions`, `next_image_title`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_comment_images`, - `allow_share_images`, `allow_vote`, `allow_rank`, `reflect_on_activity`, `image_submit_notify`) VALUES - (1,NULL,NULL,NULL,'Image Gallery','0','0','Instructions ',1,null,null,0,0,${default_content_id},0,0,0,0,0,0); +ALTER TABLE tl_laimag10_imagegallery ADD CONSTRAINT FK_NEW_1821149711_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_laimag10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + -INSERT INTO `tl_laimag10_configuration` (`config_key`, `config_value`) VALUES +INSERT INTO tl_laimag10_imagegallery (uid, title, lock_on_finished, + instructions, next_image_title, content_in_use, define_later, content_id, + allow_share_images, allow_vote, allow_rank, reflect_on_activity, image_submit_notify) VALUES + (1,'Image Gallery','0','Instructions ',1,0,0,${default_content_id},0,0,0,0,0); + +INSERT INTO tl_laimag10_configuration (config_key, config_value) VALUES ('mediumImageDimensions', '640'); -INSERT INTO `tl_laimag10_configuration` (`config_key`, `config_value`) VALUES +INSERT INTO tl_laimag10_configuration (config_key, config_value) VALUES ('thumbnailImageDimensions', '100'); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql 4 Feb 2014 23:22:22 -0000 1.2 +++ lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql 27 Feb 2017 14:00:36 -0000 1.2.2.1 @@ -1,14 +1,9 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laimag10_attachment; -drop table if exists tl_laimag10_item_instruction; +drop table if exists tl_laimag10_configuration; +drop table if exists tl_laimag10_image_vote; drop table if exists tl_laimag10_imagegallery; drop table if exists tl_laimag10_imagegallery_item; drop table if exists tl_laimag10_item_log; drop table if exists tl_laimag10_session; drop table if exists tl_laimag10_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_images/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_images/db/sql/library_insert.sql 11 Oct 2008 12:04:14 -0000 1.1 +++ lams_tool_images/db/sql/library_insert.sql 27 Feb 2017 14:00:36 -0000 1.1.12.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Share imageGallery', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.15.2.1 refers to a dead (removed) revision in file `lams_tool_images/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/tool_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_images/db/sql/tool_insert.sql 24 Feb 2016 12:35:36 -0000 1.5.2.1 +++ lams_tool_images/db/sql/tool_insert.sql 27 Feb 2017 14:00:36 -0000 1.5.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -36,8 +30,6 @@ 'ImageGallery', 'imageGallery', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -53,4 +45,4 @@ NOW(), 'tool/laimag10/laimag10admin/start.do', 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/build.properties,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_imscc/build.properties 11 Nov 2016 15:52:22 -0000 1.3.2.2 +++ lams_tool_imscc/build.properties 27 Feb 2017 14:00:32 -0000 1.3.2.3 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=laimsc11 -tool.version=20110511 +tool.version=20170101 tool.hide=false tool.short.name=commonCartridge \ No newline at end of file Index: lams_tool_imscc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/db/sql/activity_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_imscc/db/sql/activity_insert.sql 16 Mar 2016 12:12:47 -0000 1.2.2.1 +++ lams_tool_imscc/db/sql/activity_insert.sql 27 Feb 2017 14:00:32 -0000 1.2.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'CommonCartridge' , 'CommonCartridge' -, 'CommonCartridge' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/laimsc11/images/icon_commonCartridge.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql 4 Feb 2014 23:22:13 -0000 1.3 +++ lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql 27 Feb 2017 14:00:32 -0000 1.3.2.1 @@ -1,50 +1,54 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laimsc11_attachment; -drop table if exists tl_laimsc11_item_instruction; -drop table if exists tl_laimsc11_commoncartridge; -drop table if exists tl_laimsc11_commoncartridge_item; -drop table if exists tl_laimsc11_commoncartridge_item_visit_log; -drop table if exists tl_laimsc11_session; -drop table if exists tl_laimsc11_user; -drop table if exists tl_laimsc11_configuration; -create table tl_laimsc11_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - commonCartridge_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimsc11_item_instruction ( - uid bigint not null auto_increment, - description varchar(255), - sequence_id integer, - item_uid bigint, - primary key (uid) -)ENGINE=InnoDB; create table tl_laimsc11_commoncartridge ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint, - lock_on_finished tinyint, + lock_on_finished tinyint(1), instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, + content_in_use tinyint(1), + define_later tinyint(1), + content_id bigint, mini_view_commonCartridge_number integer, - allow_auto_run tinyint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - primary key (uid) -)ENGINE=InnoDB; + allow_auto_run tinyint(1), + reflect_instructions text, + reflect_on_activity tinyint(1), + primary key (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_laimsc11_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status integer, + commonCartridge_uid bigint, + session_id bigint, + session_name varchar(250), + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_1279208528_24AA78C530E79035 FOREIGN KEY (commonCartridge_uid) + REFERENCES tl_laimsc11_commoncartridge (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_laimsc11_user ( + uid bigint not null auto_increment, + user_id bigint, + last_name varchar(255), + first_name varchar(255), + login_name varchar(255), + session_finished tinyint(1), + session_uid bigint, + commonCartridge_uid bigint, + primary key (uid), + CONSTRAINT FK_NEW_1279208528_30113BFC309ED320 FOREIGN KEY (commonCartridge_uid) + REFERENCES tl_laimsc11_commoncartridge (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1279208528_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_laimsc11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laimsc11_commoncartridge_item ( uid bigint not null auto_increment, file_uuid bigint, @@ -64,78 +68,67 @@ frame_height integer, create_by bigint, create_date datetime, - create_by_author tinyint, - is_hide tinyint, + create_by_author tinyint(1), + is_hide tinyint(1), item_type smallint, file_type varchar(255), file_name varchar(255), - open_url_new_window tinyint, + open_url_new_window tinyint(1), commonCartridge_uid bigint, - session_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_1279208528_F52D1F9330E79035 FOREIGN KEY (commonCartridge_uid) + REFERENCES tl_laimsc11_commoncartridge (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1279208528_F52D1F93758092FB FOREIGN KEY (create_by) + REFERENCES tl_laimsc11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); + +create table tl_laimsc11_item_instruction ( + uid bigint not null auto_increment, + description varchar(255), + sequence_id integer, + item_uid bigint, + primary key (uid), + CONSTRAINT FK_NEW_1279208528_A5665013980570ED FOREIGN KEY (item_uid) + REFERENCES tl_laimsc11_commoncartridge_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laimsc11_item_log ( uid bigint not null auto_increment, access_date datetime, commonCartridge_item_uid bigint, user_uid bigint, - complete tinyint, + complete tinyint(1), session_id bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimsc11_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, - commonCartridge_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; -create table tl_laimsc11_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - session_uid bigint, - commonCartridge_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_1279208528_693580A438BF8DFE FOREIGN KEY (commonCartridge_item_uid) + REFERENCES tl_laimsc11_commoncartridge_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1279208528_693580A441F9365D FOREIGN KEY (user_uid) + REFERENCES tl_laimsc11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laimsc11_configuration ( uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid) -)ENGINE=InnoDB; +); -alter table tl_laimsc11_attachment add index FK_NEW_1279208528_1E7009430E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_1E7009430E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid); -alter table tl_laimsc11_item_instruction add index FK_NEW_1279208528_A5665013980570ED (item_uid), add constraint FK_NEW_1279208528_A5665013980570ED foreign key (item_uid) references tl_laimsc11_commoncartridge_item (uid); -alter table tl_laimsc11_commoncartridge add index FK_NEW_1279208528_89093BF758092FB (create_by), add constraint FK_NEW_1279208528_89093BF758092FB foreign key (create_by) references tl_laimsc11_user (uid); -alter table tl_laimsc11_commoncartridge_item add index FK_NEW_1279208528_F52D1F93758092FB (create_by), add constraint FK_NEW_1279208528_F52D1F93758092FB foreign key (create_by) references tl_laimsc11_user (uid); -alter table tl_laimsc11_commoncartridge_item add index FK_NEW_1279208528_F52D1F9330E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_F52D1F9330E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid); -alter table tl_laimsc11_commoncartridge_item add index FK_NEW_1279208528_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_1279208528_F52D1F93EC0D3147 foreign key (session_uid) references tl_laimsc11_session (uid); -alter table tl_laimsc11_item_log add index FK_NEW_1279208528_693580A438BF8DFE (commonCartridge_item_uid), add constraint FK_NEW_1279208528_693580A438BF8DFE foreign key (commonCartridge_item_uid) references tl_laimsc11_commoncartridge_item (uid); -alter table tl_laimsc11_item_log add index FK_NEW_1279208528_693580A441F9365D (user_uid), add constraint FK_NEW_1279208528_693580A441F9365D foreign key (user_uid) references tl_laimsc11_user (uid); -alter table tl_laimsc11_session add index FK_NEW_1279208528_24AA78C530E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_24AA78C530E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid); -alter table tl_laimsc11_user add index FK_NEW_1279208528_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_1279208528_30113BFCEC0D3147 foreign key (session_uid) references tl_laimsc11_session (uid); -alter table tl_laimsc11_user add index FK_NEW_1279208528_30113BFC309ED320 (commonCartridge_uid), add constraint FK_NEW_1279208528_30113BFC309ED320 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid); +ALTER TABLE tl_laimsc11_commoncartridge ADD CONSTRAINT FK_NEW_1279208528_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_laimsc11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; - -INSERT INTO `tl_laimsc11_commoncartridge` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, - `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, - `mini_view_commonCartridge_number`, `allow_auto_run`,`reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'CommonCartridge','0','0','Instructions ',null,null,0,0,${default_content_id},0,0,0); + +INSERT INTO tl_laimsc11_commoncartridge (uid, title, lock_on_finished, + instructions, content_in_use, define_later, content_id, + mini_view_commonCartridge_number, allow_auto_run,reflect_on_activity) VALUES + (1,'CommonCartridge','0','Instructions ',0,0,${default_content_id},0,0,0); -INSERT INTO `tl_laimsc11_commoncartridge_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `commonCartridge_uid`, `session_uid`, `frame_height`) VALUES - (1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL, 100); +INSERT INTO tl_laimsc11_commoncartridge_item (uid, title, url, create_date, create_by_author, is_hide, item_type,open_url_new_window, commonCartridge_uid,frame_height) VALUES + (1,'Web Search','http://www.google.com ',NOW(),1,0,1,0,1,100); -INSERT INTO `tl_laimsc11_configuration` (`config_key`, `config_value`) VALUES +INSERT INTO tl_laimsc11_configuration (config_key, config_value) VALUES ('allowExposeUserName', 'true'); -INSERT INTO `tl_laimsc11_configuration` (`config_key`, `config_value`) VALUES +INSERT INTO tl_laimsc11_configuration (config_key, config_value) VALUES ('allowExposeUserEmail', 'true'); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql 4 Feb 2014 23:22:13 -0000 1.2 +++ lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql 27 Feb 2017 14:00:32 -0000 1.2.2.1 @@ -1,14 +1,9 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laimsc11_attachment; +drop table if exists tl_laimsc11_configuration; drop table if exists tl_laimsc11_item_instruction; drop table if exists tl_laimsc11_commoncartridge; drop table if exists tl_laimsc11_commoncartridge_item; drop table if exists tl_laimsc11_item_log; drop table if exists tl_laimsc11_session; drop table if exists tl_laimsc11_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_imscc/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_imscc/db/sql/library_insert.sql 28 May 2011 18:03:48 -0000 1.1 +++ lams_tool_imscc/db/sql/library_insert.sql 27 Feb 2017 14:00:32 -0000 1.1.2.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Share commonCartridge', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_imscc/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/db/sql/tool_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_imscc/db/sql/tool_insert.sql 24 Feb 2016 12:35:13 -0000 1.2.2.1 +++ lams_tool_imscc/db/sql/tool_insert.sql 27 Feb 2017 14:00:32 -0000 1.2.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -36,8 +30,6 @@ 'Shared CommonCartridge', 'sharedcommonCartridge', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -53,4 +45,4 @@ NOW(), NOW(), 'tool/laimsc11/laimsc11admin/start.do' -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/build.properties,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/build.properties 8 Sep 2015 07:15:03 -0000 1.1.2.1 +++ lams_tool_kaltura/build.properties 27 Feb 2017 14:00:19 -0000 1.1.2.2 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=lakalt11 -tool.version=20121018 +tool.version=20170101 tool.hide=true tool.short.name=kaltura Index: lams_tool_kaltura/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/db/sql/activity_insert.sql,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_kaltura/db/sql/activity_insert.sql 11 May 2016 07:37:16 -0000 1.3.2.2 +++ lams_tool_kaltura/db/sql/activity_insert.sql 27 Feb 2017 14:00:19 -0000 1.3.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Kaltura Tool' , 'Kaltura Tool' -, 'Kaltura Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/lakalt11/images/icon_kaltura.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.kaltura.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql 11 May 2016 07:37:16 -0000 1.2.2.1 +++ lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql 27 Feb 2017 14:00:19 -0000 1.2.2.2 @@ -1,134 +1,126 @@ - - SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS tl_lakalt11_attachment; -DROP TABLE IF EXISTS tl_lakalt11_kaltura; -DROP TABLE IF EXISTS tl_lakalt11_kaltura_item; -DROP TABLE IF EXISTS tl_lakalt11_comment; -DROP TABLE IF EXISTS tl_lakalt11_rating; -DROP TABLE IF EXISTS tl_lakalt11_item_log; -DROP TABLE IF EXISTS tl_lakalt11_session; -DROP TABLE IF EXISTS tl_lakalt11_user; - -CREATE TABLE tl_lakalt11_attachment ( - uid bigint NOT NULL AUTO_INCREMENT, - file_version_id BIGINT, - file_type VARCHAR(255), - file_name VARCHAR(255), - file_uuid BIGINT, - create_date DATETIME, - kaltura_uid BIGINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; CREATE TABLE tl_lakalt11_kaltura ( uid BIGINT NOT NULL AUTO_INCREMENT, create_date DATETIME, update_date DATETIME, create_by BIGINT, title VARCHAR(255), instructions TEXT, - run_offline BIT, lock_on_finished BIT, allow_contribute_videos BIT, allow_seeing_other_users_recordings BIT, learner_contribution_limit integer DEFAULT -1, allow_comments BIT, allow_ratings BIT, - online_instructions TEXT, - offline_instructions TEXT, content_in_use BIT, define_later BIT, tool_content_id BIGINT, submission_deadline DATETIME DEFAULT NULL, reflect_on_activity BIT, reflect_instructions TEXT, PRIMARY KEY (uid) -)ENGINE=InnoDB; +); + +CREATE TABLE tl_lakalt11_session ( + uid BIGINT NOT NULL AUTO_INCREMENT, + session_end_date DATETIME, + session_start_date DATETIME, + status INTEGER, + session_id BIGINT, + session_name VARCHAR(250), + kaltura_uid BIGINT, + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_1533935501_B7C198E2FC940906 FOREIGN KEY (kaltura_uid) + REFERENCES tl_lakalt11_kaltura (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lakalt11_user ( + uid BIGINT NOT NULL AUTO_INCREMENT, + user_id BIGINT, + last_name VARCHAR(255), + login_name VARCHAR(255), + first_name VARCHAR(255), + finishedActivity BIT, + kaltura_session_uid BIGINT, + kaltura_uid BIGINT, + PRIMARY KEY (uid), + CONSTRAINT FK_tl_lakalt11_user_1 FOREIGN KEY (kaltura_session_uid) + REFERENCES tl_lakalt11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_lakalt11_user_2 FOREIGN KEY (kaltura_uid) + REFERENCES tl_lakalt11_kaltura (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lakalt11_kaltura_item ( uid bigint not null AUTO_INCREMENT, entry_id VARCHAR(255), title VARCHAR(255), duration INTEGER, create_by BIGINT, create_date DATETIME, - create_by_author TINYINT, + create_by_author TINYINT(1), sequence_id INTEGER, - is_hidden TINYINT, + is_hidden TINYINT(1), kaltura_uid BIGINT, mark BIGINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + CONSTRAINT FK_tl_lakalt11_item_1 FOREIGN KEY (create_by) + REFERENCES tl_lakalt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK_tl_lakalt11_item_2 FOREIGN KEY (kaltura_uid) + REFERENCES tl_lakalt11_kaltura (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lakalt11_comment ( uid BIGINT not null AUTO_INCREMENT, comment TEXT, kaltura_item_uid BIGINT, create_by BIGINT, create_date DATETIME, - is_hidden TINYINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + is_hidden TINYINT(1), + PRIMARY KEY (uid), + CONSTRAINT FK_tl_lakalt11_comment_2 FOREIGN KEY (create_by) + REFERENCES tl_lakalt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK_tl_lakalt11_comment_3 FOREIGN KEY (kaltura_item_uid) + REFERENCES tl_lakalt11_kaltura_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lakalt11_rating ( uid BIGINT not null AUTO_INCREMENT, rating FLOAT, kaltura_item_uid BIGINT, create_by BIGINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + CONSTRAINT FK_tl_lakalt11_rating_2 FOREIGN KEY (create_by) + REFERENCES tl_lakalt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_lakalt11_rating_3 FOREIGN KEY (kaltura_item_uid) + REFERENCES tl_lakalt11_kaltura_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lakalt11_item_log ( uid BIGINT not null AUTO_INCREMENT, access_date DATETIME, kaltura_item_uid BIGINT, user_uid BIGINT, - complete TINYINT, + complete TINYINT(1), session_id BIGINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; -CREATE TABLE tl_lakalt11_session ( - uid BIGINT NOT NULL AUTO_INCREMENT, - session_end_date DATETIME, - session_start_date DATETIME, - status INTEGER, - session_id BIGINT, - session_name VARCHAR(250), - kaltura_uid BIGINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; -CREATE TABLE tl_lakalt11_user ( - uid BIGINT NOT NULL AUTO_INCREMENT, - user_id BIGINT, - last_name VARCHAR(255), - login_name VARCHAR(255), - first_name VARCHAR(255), - finishedActivity BIT, - kaltura_session_uid BIGINT, - kaltura_uid BIGINT, - PRIMARY KEY (uid) -)ENGINE=InnoDB; + PRIMARY KEY (uid), + CONSTRAINT FK_tl_lakalt11_item_log_1 FOREIGN KEY (kaltura_item_uid) + REFERENCES tl_lakalt11_kaltura_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_lakalt11_item_log_2 FOREIGN KEY (user_uid) + REFERENCES tl_lakalt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -ALTER TABLE tl_lakalt11_kaltura ADD INDEX FK_NEW_174079131_89093BF758092FB (create_by), ADD CONSTRAINT FK_NEW_174079131_89093BF758092FB FOREIGN KEY (create_by) REFERENCES tl_lakalt11_user (uid); -ALTER TABLE tl_lakalt11_attachment ADD INDEX FK_NEW_1533935501_12090F57FC940906 (kaltura_uid), ADD CONSTRAINT FK_NEW_1533935501_12090F57FC940906 FOREIGN KEY (kaltura_uid) REFERENCES tl_lakalt11_kaltura (uid); -ALTER TABLE tl_lakalt11_session ADD INDEX FK_NEW_1533935501_B7C198E2FC940906 (kaltura_uid), ADD CONSTRAINT FK_NEW_1533935501_B7C198E2FC940906 FOREIGN KEY (kaltura_uid) REFERENCES tl_lakalt11_kaltura (uid); -ALTER TABLE tl_lakalt11_user ADD INDEX FK_tl_lakalt11_user_1 (kaltura_session_uid), ADD CONSTRAINT FK_tl_lakalt11_user_1 FOREIGN KEY (kaltura_session_uid) REFERENCES tl_lakalt11_session (uid); -ALTER TABLE tl_lakalt11_user ADD INDEX FK_tl_lakalt11_user_2 (kaltura_uid), ADD CONSTRAINT FK_tl_lakalt11_user_2 FOREIGN KEY (kaltura_uid) REFERENCES tl_lakalt11_kaltura (uid); -ALTER TABLE tl_lakalt11_kaltura_item ADD INDEX FK_tl_lakalt11_item_1 (create_by), ADD CONSTRAINT FK_tl_lakalt11_item_1 FOREIGN KEY (create_by) REFERENCES tl_lakalt11_user (uid); -ALTER TABLE tl_lakalt11_kaltura_item ADD INDEX FK_tl_lakalt11_item_2 (kaltura_uid), ADD CONSTRAINT FK_tl_lakalt11_item_2 FOREIGN KEY (kaltura_uid) REFERENCES tl_lakalt11_kaltura (uid); -ALTER TABLE tl_lakalt11_comment ADD INDEX FK_tl_lakalt11_comment_3 (kaltura_item_uid), ADD CONSTRAINT FK_tl_lakalt11_comment_3 FOREIGN KEY (kaltura_item_uid) REFERENCES tl_lakalt11_kaltura_item (uid); -ALTER TABLE tl_lakalt11_comment ADD INDEX FK_tl_lakalt11_comment_2 (create_by), ADD CONSTRAINT FK_tl_lakalt11_comment_2 FOREIGN KEY (create_by) REFERENCES tl_lakalt11_user (uid); -ALTER TABLE tl_lakalt11_rating ADD INDEX FK_tl_lakalt11_rating_3 (kaltura_item_uid), ADD CONSTRAINT FK_tl_lakalt11_rating_3 FOREIGN KEY (kaltura_item_uid) REFERENCES tl_lakalt11_kaltura_item (uid); -ALTER TABLE tl_lakalt11_rating ADD INDEX FK_tl_lakalt11_rating_2 (create_by), ADD CONSTRAINT FK_tl_lakalt11_rating_2 FOREIGN KEY (create_by) REFERENCES tl_lakalt11_user (uid); -ALTER TABLE tl_lakalt11_item_log ADD INDEX FK_tl_lakalt11_item_log_1 (kaltura_item_uid), ADD CONSTRAINT FK_tl_lakalt11_item_log_1 FOREIGN KEY (kaltura_item_uid) REFERENCES tl_lakalt11_kaltura_item (uid); -ALTER TABLE tl_lakalt11_item_log ADD INDEX FK_tl_lakalt11_item_log_2 (user_uid), ADD CONSTRAINT FK_tl_lakalt11_item_log_2 FOREIGN KEY (user_uid) REFERENCES tl_lakalt11_user (uid); +ALTER TABLE tl_lakalt11_kaltura ADD CONSTRAINT FK_NEW_174079131_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_lakalt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + INSERT INTO tl_lakalt11_kaltura ( uid, title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, allow_contribute_videos, learner_contribution_limit, @@ -142,11 +134,8 @@ 1, "Kaltura Video", "Instructions", - "", - "", ${default_content_id}, 0, - 0, 1, -1, 0, @@ -157,4 +146,4 @@ 0 ); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_kaltura/db/sql/drop_lams_tool_kaltura.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/db/sql/drop_lams_tool_kaltura.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/db/sql/drop_lams_tool_kaltura.sql 11 May 2016 07:37:16 -0000 1.1.2.1 +++ lams_tool_kaltura/db/sql/drop_lams_tool_kaltura.sql 27 Feb 2017 14:00:19 -0000 1.1.2.2 @@ -1,17 +1,9 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lakalt11_user; -DROP TABLE IF EXISTS tl_lakalt11_attachment; DROP TABLE IF EXISTS tl_lakalt11_session; DROP TABLE IF EXISTS tl_lakalt11_kaltura; DROP TABLE IF EXISTS tl_lakalt11_kaltura_item; DROP TABLE IF EXISTS tl_lakalt11_comment; DROP TABLE IF EXISTS tl_lakalt11_rating; DROP TABLE IF EXISTS tl_lakalt11_item_log; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_kaltura/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/db/sql/library_insert.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_kaltura/db/sql/library_insert.sql 11 May 2016 07:37:16 -0000 1.1.2.1 +++ lams_tool_kaltura/db/sql/library_insert.sql 27 Feb 2017 14:00:19 -0000 1.1.2.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Kaltura', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_kaltura/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/db/sql/tool_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_kaltura/db/sql/tool_insert.sql 11 May 2016 07:37:17 -0000 1.2.2.2 +++ lams_tool_kaltura/db/sql/tool_insert.sql 27 Feb 2017 14:00:19 -0000 1.2.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +30,6 @@ 'Kaltura', 'kaltura', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +45,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/build.properties,v diff -u -r1.18 -r1.18.2.1 --- lams_tool_lamc/build.properties 30 Jul 2012 18:50:18 -0000 1.18 +++ lams_tool_lamc/build.properties 27 Feb 2017 14:00:18 -0000 1.18.2.1 @@ -1,8 +1,8 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lamc11 -tool.version=20110416 +tool.version=20170101 tool.hide=false tool.short.name=mc Index: lams_tool_lamc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/activity_insert.sql,v diff -u -r1.17.2.2 -r1.17.2.3 --- lams_tool_lamc/db/sql/activity_insert.sql 11 May 2016 07:36:14 -0000 1.17.2.2 +++ lams_tool_lamc/db/sql/activity_insert.sql 27 Feb 2017 14:00:18 -0000 1.17.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'Allows creation and use of multiple choice questioning format' + 'Allows creation and use of multiple choice questioning format' , 'Multiple Choice Questions' , 'Help text' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 3 -, NULL -, NULL -, NULL -, NULL , 'tool/lamc11/images/icon_mcq.svg' -, NULL -, NULL -, NULL ,'org.lamsfoundation.lams.tool.mc.ApplicationResources' -) +) \ No newline at end of file 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.27 -r1.27.2.1 --- lams_tool_lamc/db/sql/create_lams_tool_mc.sql 19 Feb 2012 20:21:32 -0000 1.27 +++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql 27 Feb 2017 14:00:18 -0000 1.27.2.1 @@ -1,3 +1,5 @@ +SET FOREIGN_KEY_CHECKS=0; + CREATE TABLE tl_lamc11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , content_id BIGINT(20) NOT NULL @@ -8,48 +10,21 @@ , reflect TINYINT(1) NOT NULL DEFAULT 0 , questions_sequenced TINYINT(1) NOT NULL DEFAULT 0 , created_by BIGINT(20) NOT NULL DEFAULT 0 - , run_offline TINYINT(1) NOT NULL DEFAULT 0 , define_later TINYINT(1) NOT NULL DEFAULT 0 - , offline_instructions TEXT - , online_instructions TEXT - , content_in_use TINYINT(1) NOT NULL DEFAULT 0 , retries TINYINT(1) NOT NULL DEFAULT 0 , pass_mark INTEGER , show_report TINYINT(1) NOT NULL DEFAULT 0 , reflectionSubject TEXT , showMarks TINYINT(1) NOT NULL DEFAULT 0 , randomize TINYINT(1) NOT NULL DEFAULT 0 , displayAnswers TINYINT(1) NOT NULL DEFAULT 1 - , submission_deadline datetime DEFAULT NULL + , submission_deadline datetime + , use_select_leader_tool_ouput tinyint(1) NOT NULL DEFAULT 0 + , prefix_answers_with_letters tinyint(1) NOT NULL DEFAULT 1 , UNIQUE UQ_tl_lamc11_content_1 (content_id) , PRIMARY KEY (uid) -)ENGINE=InnoDB; +); -CREATE TABLE tl_lamc11_que_content ( - uid BIGINT(20) NOT NULL AUTO_INCREMENT - , question TEXT - , mark INT(5) NOT NULL DEFAULT 1 - , display_order INT(5) - , mc_content_id BIGINT(20) NOT NULL - , feedback TEXT - , PRIMARY KEY (uid) - , INDEX (mc_content_id) - , CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (mc_content_id) - REFERENCES tl_lamc11_content (uid) -)ENGINE=InnoDB; - -CREATE TABLE tl_lamc11_options_content ( - uid BIGINT(20) NOT NULL AUTO_INCREMENT - , correct_option TINYINT(1) NOT NULL DEFAULT 0 - , mc_que_content_id BIGINT(20) NOT NULL - , mc_que_option_text VARCHAR(250) - , displayOrder INT(5) - , PRIMARY KEY (uid) - , INDEX (mc_que_content_id) - , CONSTRAINT FK_tl_lamc11_options_content_1 FOREIGN KEY (mc_que_content_id) - REFERENCES tl_lamc11_que_content (uid) -)ENGINE=InnoDB; - CREATE TABLE tl_lamc11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , mc_session_id BIGINT(20) NOT NULL @@ -58,12 +33,13 @@ , session_name VARCHAR(100) , session_status VARCHAR(100) , mc_content_id BIGINT(20) NOT NULL - , UNIQUE UQ_tl_lamc11_session_1 (mc_session_id) + , mc_group_leader_uid BIGINT(20) , PRIMARY KEY (uid) + , UNIQUE UQ_tl_lamc11_session_1 (mc_session_id) , INDEX (mc_content_id) , CONSTRAINT FK_tl_lamc_session_1 FOREIGN KEY (mc_content_id) - REFERENCES tl_lamc11_content (uid) -)ENGINE=InnoDB; + REFERENCES tl_lamc11_content (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_lamc11_que_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -73,14 +49,40 @@ , fullname VARCHAR(255) , responseFinalised TINYINT(1) NOT NULL DEFAULT 0 , viewSummaryRequested TINYINT(1) NOT NULL DEFAULT 0 - , last_attempt_order INTEGER , last_attempt_total_mark INTEGER + , number_attempts int(11) DEFAULT 0 , PRIMARY KEY (uid) + , UNIQUE KEY que_usr_id (que_usr_id,mc_session_id) , INDEX (mc_session_id) , CONSTRAINT FK_tl_lamc11_que_usr_1 FOREIGN KEY (mc_session_id) - REFERENCES tl_lamc11_session (uid) -)ENGINE=InnoDB; + REFERENCES tl_lamc11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); +CREATE TABLE tl_lamc11_que_content ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , question TEXT + , mark INT(5) NOT NULL DEFAULT 1 + , display_order INT(5) + , mc_content_id BIGINT(20) NOT NULL + , feedback TEXT + , PRIMARY KEY (uid) + , INDEX (mc_content_id) + , CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (mc_content_id) + REFERENCES tl_lamc11_content (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lamc11_options_content ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , correct_option TINYINT(1) NOT NULL DEFAULT 0 + , mc_que_content_id BIGINT(20) NOT NULL + , mc_que_option_text TEXT + , displayOrder INT(5) + , PRIMARY KEY (uid) + , INDEX (mc_que_content_id) + , CONSTRAINT FK_tl_lamc11_options_content_1 FOREIGN KEY (mc_que_content_id) + REFERENCES tl_lamc11_que_content (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lamc11_usr_attempt ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , que_usr_id BIGINT(20) NOT NULL @@ -90,38 +92,29 @@ , isAttemptCorrect TINYINT(1) NOT NULL DEFAULT 0 , mark VARCHAR(255) , passed TINYINT(1) NOT NULL DEFAULT 0 - , attemptOrder INTEGER NOT NULL DEFAULT 1 - , finished TINYINT(1) DEFAULT 0 , PRIMARY KEY (uid) + , UNIQUE KEY attempt_unique_index (que_usr_id,mc_que_content_id) , INDEX (mc_que_content_id) , CONSTRAINT FK_tl_lamc11_usr_attempt_2 FOREIGN KEY (mc_que_content_id) - REFERENCES tl_lamc11_que_content (uid) + REFERENCES tl_lamc11_que_content (uid) ON DELETE CASCADE ON UPDATE CASCADE , INDEX (mc_que_option_id) , CONSTRAINT FK_tl_lamc11_usr_attempt_3 FOREIGN KEY (mc_que_option_id) - REFERENCES tl_lamc11_options_content (uid) + REFERENCES tl_lamc11_options_content (uid) ON DELETE CASCADE ON UPDATE CASCADE , INDEX (que_usr_id) , CONSTRAINT FK_tl_lamc11_usr_attempt_4 FOREIGN KEY (que_usr_id) - REFERENCES tl_lamc11_que_usr (uid) -)ENGINE=InnoDB; + REFERENCES tl_lamc11_que_usr (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -CREATE TABLE tl_lamc11_uploadedfile ( - submissionId BIGINT(20) NOT NULL AUTO_INCREMENT - , uuid VARCHAR(255) NOT NULL - , mc_content_id BIGINT(20) NOT NULL - , isOnline_File TINYINT(1) NOT NULL - , filename VARCHAR(255) NOT NULL - , PRIMARY KEY (submissionId) - , INDEX (mc_content_id) - , CONSTRAINT FK_tl_lamc11_uploadedFile FOREIGN KEY (mc_content_id) - REFERENCES tl_lamc11_content (uid) -)ENGINE=InnoDB; +ALTER TABLE tl_lamc11_session ADD CONSTRAINT FK_lamc11_session1 FOREIGN KEY (mc_group_leader_uid) + REFERENCES tl_lamc11_que_usr (uid) ON DELETE SET NULL ON UPDATE CASCADE; -INSERT INTO tl_lamc11_content(uid, content_id , title, instructions, creation_date , reflect, questions_sequenced , created_by , run_offline , define_later, offline_instructions, online_instructions, content_in_use, retries, show_report, pass_mark) VALUES (1, ${default_content_id} , 'MCQ', 'Instructions', NOW(), 0, 0, 1, 0, 0, '','', 0, 0, 0, 0); +INSERT INTO tl_lamc11_content(uid, content_id , title, instructions, creation_date , reflect, questions_sequenced, created_by , define_later, retries, show_report, pass_mark) VALUES (1, 2, 'MCQ', 'Instructions', NOW(), 0, 0, 1, 0, 0, 0, 0); + INSERT INTO tl_lamc11_que_content (uid,question, mark, display_order, mc_content_id) VALUES (1, 'A Sample question?', 1,1,1); INSERT INTO tl_lamc11_options_content (uid, correct_option, displayOrder, mc_que_content_id, mc_que_option_text) VALUES (1, 0, 1, 1,'Answer 1'); INSERT INTO tl_lamc11_options_content (uid, correct_option, displayOrder, mc_que_content_id, mc_que_option_text) VALUES (2, 1, 2, 1,'Answer 2'); - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_lamc/db/sql/drop_lams_tool_mc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/drop_lams_tool_mc.sql,v diff -u -r1.4.18.1 -r1.4.18.2 --- lams_tool_lamc/db/sql/drop_lams_tool_mc.sql 11 May 2016 07:36:14 -0000 1.4.18.1 +++ lams_tool_lamc/db/sql/drop_lams_tool_mc.sql 27 Feb 2017 14:00:18 -0000 1.4.18.2 @@ -1,18 +1,8 @@ - - SET FOREIGN_KEY_CHECKS=0; -DROP TABLE tl_lamc11_uploadedFile; DROP TABLE tl_lamc11_usr_attempt; DROP TABLE tl_lamc11_que_usr; DROP TABLE tl_lamc11_session; DROP TABLE tl_lamc11_options_content; DROP TABLE tl_lamc11_que_content; DROP TABLE tl_lamc11_content; -SET FOREIGN_KEY_CHECKS=1; - - - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_lamc/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/library_insert.sql,v diff -u -r1.5.18.1 -r1.5.18.2 --- lams_tool_lamc/db/sql/library_insert.sql 11 May 2016 07:36:14 -0000 1.5.18.1 +++ lams_tool_lamc/db/sql/library_insert.sql 27 Feb 2017 14:00:18 -0000 1.5.18.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'MCQ', 0, NOW() -) +) \ No newline at end of file Index: lams_tool_lamc/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/tool_insert.sql,v diff -u -r1.27.2.2 -r1.27.2.3 --- lams_tool_lamc/db/sql/tool_insert.sql 11 May 2016 07:36:14 -0000 1.27.2.2 +++ lams_tool_lamc/db/sql/tool_insert.sql 27 Feb 2017 14:00:18 -0000 1.27.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +30,6 @@ 'Multiple Choice Questions', 'mc', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -50,4 +44,4 @@ 'org.lamsfoundation.lams.tool.mc.ApplicationResources', NOW(), NOW(), -1) +1) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/build.properties,v diff -u -r1.34 -r1.34.2.1 --- lams_tool_laqa/build.properties 30 Jul 2012 18:50:33 -0000 1.34 +++ lams_tool_laqa/build.properties 27 Feb 2017 14:00:17 -0000 1.34.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=laqa11 -tool.version=20110217 +tool.version=20170101 tool.hide=false tool.short.name=qa \ No newline at end of file Index: lams_tool_laqa/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/activity_insert.sql,v diff -u -r1.20.2.2 -r1.20.2.3 --- lams_tool_laqa/db/sql/activity_insert.sql 11 May 2016 07:35:57 -0000 1.20.2.2 +++ lams_tool_laqa/db/sql/activity_insert.sql 27 Feb 2017 14:00:17 -0000 1.20.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'Allows creation and use of question and answer format' + 'Allows creation and use of question and answer format' , 'Question and Answer' , 'Help text' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 6 -, NULL -, NULL -, NULL -, NULL , 'tool/laqa11/images/icon_questionanswer.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.qa.ApplicationResources' -) +) \ No newline at end of file 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.58 -r1.58.2.1 --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql 19 Feb 2012 20:21:47 -0000 1.58 +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql 27 Feb 2017 14:00:16 -0000 1.58.2.1 @@ -11,18 +11,20 @@ , username_visible TINYINT(1) NOT NULL DEFAULT 0 , allow_rate_answers TINYINT(1) NOT NULL DEFAULT 0 , 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 TEXT - , online_instructions TEXT - , content_inUse TINYINT(1) DEFAULT 0 , reflectionSubject TEXT , lockWhenFinished TINYINT(1) NOT NULL DEFAULT 1 , showOtherAnswers TINYINT(1) NOT NULL DEFAULT 1 , allow_rich_editor TINYINT(1) NOT NULL DEFAULT 0 - , PRIMARY KEY (uid) -)ENGINE=InnoDB; + , use_select_leader_tool_ouput tinyint(1) NOT NULL DEFAULT 0 + , notify_response_submit tinyint(1) NOT NULL DEFAULT 0 + , minimum_rates int(11) DEFAULT 0 + , maximum_rates int(11) DEFAULT 0 + , no_reedit_allowed tinyint(1) NOT NULL DEFAULT 0 + , show_other_answers_after_deadline tinyint(1) NOT NULL DEFAULT 0 + , PRIMARY KEY (uid) + , KEY tl_laqa11_content_qa_content_id (qa_content_id) +); CREATE TABLE tl_laqa11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -32,11 +34,13 @@ , session_name VARCHAR(100) , session_status VARCHAR(100) , qa_content_id BIGINT(20) NOT NULL + , qa_group_leader_uid bigint(20) , PRIMARY KEY (uid) - , INDEX (qa_content_id) + , UNIQUE KEY qa_session_id (qa_session_id) + , KEY qa_content_id (qa_content_id) , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (qa_content_id) - REFERENCES tl_laqa11_content (uid) -)ENGINE=InnoDB; + REFERENCES tl_laqa11_content (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_laqa11_que_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -47,10 +51,11 @@ , fullname VARCHAR(255) , learnerFinished TINYINT(1) NOT NULL , PRIMARY KEY (uid) + , UNIQUE KEY que_usr_id (que_usr_id,qa_session_id) , INDEX (qa_session_id) , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (qa_session_id) - REFERENCES tl_laqa11_session (uid) -)ENGINE=InnoDB; + REFERENCES tl_laqa11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_laqa11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -59,55 +64,31 @@ , display_order INT(5) DEFAULT 1 , qa_content_id BIGINT(20) , answer_required TINYINT(1) NOT NULL DEFAULT 0 + , min_words_limit int(11) DEFAULT 0 , PRIMARY KEY (uid) , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id) - REFERENCES tl_laqa11_content (uid) -)ENGINE=InnoDB; + REFERENCES tl_laqa11_content (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_laqa11_usr_resp ( response_id BIGINT(20) NOT NULL AUTO_INCREMENT , answer TEXT , time_zone VARCHAR(255) , attempt_time DATETIME , que_usr_id BIGINT(20) NOT NULL - , qa_que_content_id BIGINT(20) NOT NULL + , qa_que_content_id BIGINT(20) , visible TINYINT(1) NOT NULL DEFAULT 1 + , answer_autosaved text , PRIMARY KEY (response_id) , INDEX (que_usr_id) , CONSTRAINT FK_tl_laqa11_usr_resp_3 FOREIGN KEY (que_usr_id) - REFERENCES tl_laqa11_que_usr (uid) + REFERENCES tl_laqa11_que_usr (uid) ON DELETE CASCADE ON UPDATE CASCADE , INDEX (qa_que_content_id) , CONSTRAINT FK_tl_laqa11_usr_resp_2 FOREIGN KEY (qa_que_content_id) - REFERENCES tl_laqa11_que_content (uid) -)ENGINE=InnoDB; + REFERENCES tl_laqa11_que_content (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -CREATE TABLE tl_laqa11_response_rating ( - uid BIGINT(20) NOT NULL AUTO_INCREMENT - , rating float - , user_id BIGINT(20) NOT NULL - , response_id BIGINT(20) NOT NULL - , PRIMARY KEY (uid) - , INDEX (user_id) - , CONSTRAINT FK_tl_laqa11_response_rating_1 FOREIGN KEY (user_id) - REFERENCES tl_laqa11_que_usr (uid) - , INDEX (response_id) - , CONSTRAINT FK_tl_laqa11_response_rating_2 FOREIGN KEY (response_id) - REFERENCES tl_laqa11_usr_resp (response_id) -)ENGINE=InnoDB; - -CREATE TABLE tl_laqa11_uploadedfile ( - submissionId BIGINT(20) NOT NULL AUTO_INCREMENT - , uuid VARCHAR(255) NOT NULL - , isOnline_File TINYINT(1) NOT NULL - , filename VARCHAR(255) NOT NULL - , qa_content_id BIGINT(20) NOT NULL - , PRIMARY KEY (submissionId) - , INDEX (qa_content_id) - , CONSTRAINT FK_tl_laqa11_uploadedfile_1 FOREIGN KEY (qa_content_id) - REFERENCES tl_laqa11_content (uid) -)ENGINE=InnoDB; - CREATE TABLE tl_laqa11_conditions ( condition_id BIGINT(20) NOT NULL , content_uid BIGINT(20) @@ -116,7 +97,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT QaConditionToQaContent FOREIGN KEY (content_uid) REFERENCES tl_laqa11_content(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE tl_laqa11_condition_questions ( condition_id BIGINT(20) @@ -126,27 +107,51 @@ REFERENCES tl_laqa11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT QaConditionQuestionToQaQuestion FOREIGN KEY (question_uid) REFERENCES tl_laqa11_que_content(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); +CREATE TABLE tl_laqa11_configuration ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + config_key varchar(30), + config_value varchar(255), + PRIMARY KEY (uid), + UNIQUE KEY config_key (config_key) +); + +CREATE TABLE tl_laqa11_wizard_category ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + title varchar(255) NOT NULL, + PRIMARY KEY (uid) +); + +CREATE TABLE tl_laqa11_wizard_cognitive_skill ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + title varchar(255) NOT NULL, + category_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK3BA4132BCBB0DC8D FOREIGN KEY (category_uid) + REFERENCES tl_laqa11_wizard_category (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_laqa11_wizard_question ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + cognitive_skill_uid bigint(20), + title mediumtext NOT NULL, + PRIMARY KEY (uid), + CONSTRAINT FKAF08A0C7EFF77FD4 FOREIGN KEY (cognitive_skill_uid) + REFERENCES tl_laqa11_wizard_cognitive_skill (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + + +ALTER TABLE tl_laqa11_session ADD CONSTRAINT FK_laqa11_session1 FOREIGN KEY (qa_group_leader_uid) + REFERENCES tl_laqa11_que_usr (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + -- data for content table INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date, lockWhenFinished) VALUES (${default_content_id}, 'Q&A', 'Instructions', NOW() , 0); -- data for content questions table INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('Sample Question 1?',1,1); -SET FOREIGN_KEY_CHECKS=0; --- insert scripts for the wizard tables -drop table if exists tl_laqa11_configuration; -drop table if exists tl_laqa11_wizard_category; -drop table if exists tl_laqa11_wizard_cognitive_skill; -drop table if exists tl_laqa11_wizard_question; -create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))ENGINE=InnoDB; -create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))ENGINE=InnoDB; -create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))ENGINE=InnoDB; -alter table tl_laqa11_wizard_cognitive_skill add index FK3BA4132BCBB0DC8D (category_uid), add constraint FK3BA4132BCBB0DC8D foreign key (category_uid) references tl_laqa11_wizard_category (uid); -alter table tl_laqa11_wizard_question add index FKAF08A0C7EFF77FD4 (cognitive_skill_uid), add constraint FKAF08A0C7EFF77FD4 foreign key (cognitive_skill_uid) references tl_laqa11_wizard_cognitive_skill (uid); - -- Inserting the required config item into the config table INSERT INTO tl_laqa11_configuration ( config_key, @@ -168,5 +173,4 @@ -- Wizard questions INSERT INTO tl_laqa11_wizard_question VALUES (1,1,'Please%20identify%u2026'),(2,2,'What%20do%20you%20observe%20...'),(3,2,'What%20do%20you%20see%u2026%3F'),(4,3,'Give%20the%20definition%20of%u2026'),(5,3,'What%20is%20the%20meaning%20of%u2026%3F'),(6,3,'What%20has%20been%20said%20by%u2026%20about%u2026%3F'),(7,4,'Find%20a%20criterion%20to%20order%20these%u2026'),(8,4,'Order%20these%u2026'),(9,4,'Find%20the%205%20biggest/smallest%20%u2026'),(10,5,'Compare%20these%u2026%20using%20the%20following%20criteria%u2026'),(11,5,'Find%20the%20pros%20and%20cons%20of%u2026'),(12,5,'Find%20both%20the%20similarities%20and%20the%20differences%20between..%20and%u2026'),(13,6,'Arrange%20these%u2026by%20the%20following%20criterion%u2026'),(14,6,'Sort%20these%u2026%20by%20the%20following%20criterion%u2026'),(15,6,'Put%20these%u2026in%20an%20ascending/descending%20sequence%u2026'),(16,7,'Group%20these%20elements%20using%20the%20following%20criteria%u2026'),(17,7,'Find%20the%20pros%20and%20cons%20of%20these%u2026solutions'),(18,7,'Find%205%20%20advantages%20and%203%20disadvantages%20%20of%20%u2026'),(19,8,'Clarify%20whether%20this%20%u2026describes%20a%20fact%20or%20if%20it%20is%20a%20personal%20opinion'),(20,8,'Provide%20more%20than%20one%20view%20about%20the%20following%u2026'),(21,8,'Provide%20logical%20arguments%20to%20support%20the%20following%20statement'),(22,9,'Identify%20the%20parts/units/characteristics%20of%u2026'),(23,9,'Define%20the%20data%20given%20and%20the%20objectives%20of%u2026.'),(24,9,'Refer%20to%20the%20appropriate%20phases%20of%20the%20solution%20plan%20for%u2026'),(25,10,'What%20do%20we%20mean%20by%u2026%3F'),(26,10,'Provide%20an%20example%20to%20clarify%u2026'),(27,10,'When%20does%20this%u2026have%20a%20meaning%u2026%3F'),(28,11,'Distinguish%20possible%20relationships%20among%20the%20data%u2026'),(29,11,'Is%20there%20any%20reason%20that%20affects%20this%20phenomenon%u2026%3F'),(30,11,'Is%20there%20any%20structure%20within%u2026%3F'),(31,12,'Is%20there%20any%20pattern%20that%20is%20repeated%20in%u2026%3F'),(32,12,'Find%20out%20what%20is%20common%20in%u2026'),(33,12,'Find%20out%20what%20is%20similar%20in%u2026'),(34,13,'Point%20out%20the%20mistakes%20of/in%u2026'),(35,13,'Are%20there%20any%20contradictions%20in%u2026%3F'),(36,13,'What%20is%20missing%20in%u2026%3F'),(37,14,'Form%20an%20abstract%20of%20%u2026%28number%29%20words%20to%20describe%u2026'),(38,14,'Which%20are%20the%20main%20points%20of%20%u2026'),(39,14,'Which%20are%20the%20top%205%20essential%20points%20of%20%u2026'),(40,15,'What%20have%20you%20learnt%20about%u2026%3F'),(41,15,'Are%20there%20any%20points%20that%20you%u2026%3F'),(42,16,'If%20%u2026%20then%u2026'),(43,17,'Could%20you%20make%20any%20predictions%20about%u2026%3F'),(44,17,'If%20we%20do%u2026then%20what%20will%20happen%3F'),(45,17,'In%20the%20case%20of%u2026find%20out%u2026'),(46,18,'Please%20explain%20how%20the%20meaning%20of%u2026'),(47,18,'Please%20explain%20why%20the%20meaning%20of/%u2026'),(48,18,'Please%20explain%20what%20the%20meaning%20of%20%u2026'),(49,18,'Please%20explain%20in%20your%20own%20words%u2026'),(50,18,'Please%20explain%20in%20your%20own%20words%u2026'),(51,19,'Could%20you%20accept%20the%20role%20of%u2026%3F'),(52,19,'What%20are%20the%20possible%20arguments%20of%20others%20for%u2026%3F'),(53,19,'What%20would%20be%20your%20answer%20if%20you%20were%20in%20the%20position%20of%u2026%3F'),(54,20,'Make%20a%20hierarchical%20tree%20to%20describe%u2026'),(55,20,'Can%20you%20form%20a%20sequential%20structure%20of%u2026%3F'),(56,20,'Characterize%20it%20according%20to%20the%20following%20criteria%u2026'),(57,21,'How%20can%20you%20improve%20this%u2026in%20order%20to%u2026%3F'),(58,21,'How%20can%20you%20apply%20this%u2026in%20order%20to%u2026%3F'),(59,22,'Assess%20this%u2026'),(60,22,'Evaluate%20the%u2026'),(61,22,'What%20kind%20of%20criteria%20can%20you%20use%20to%20evaluate%20the%u2026%3F'),(62,23,'Please%20verify%20that%u2026'),(63,23,'Please%20confirm%20that%u2026'),(64,24,'Based%20on%20this%u2026what%20do%20you%20conclude%3F'),(65,24,'Based%20on%20these%u2026what%20do%20you%20conclude%3F'),(66,24,'Are%20there%20any%20exceptions%20to%u2026%3F'),(67,24,'Are%20there%20any%20weak%20points%20in%u2026%3F'); -SET FOREIGN_KEY_CHECKS=1; - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_laqa/db/sql/drop_lams_tool_qa.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/drop_lams_tool_qa.sql,v diff -u -r1.15.2.1 -r1.15.2.2 --- lams_tool_laqa/db/sql/drop_lams_tool_qa.sql 11 May 2016 07:35:57 -0000 1.15.2.1 +++ lams_tool_laqa/db/sql/drop_lams_tool_qa.sql 27 Feb 2017 14:00:17 -0000 1.15.2.2 @@ -1,34 +1,14 @@ --- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) --- ============================================================= --- License Information: http://lamsfoundation.org/licensing/lams/2.0/ --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License version 2.0 as --- published by the Free Software Foundation. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301-- USA --- --- http://www.gnu.org/licenses/gpl.txt --- **************************************************************** --- - - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_laqa11_conditions; -DROP TABLE IF EXISTS tl_laqa11_uploadedfile; +DROP TABLE IF EXISTS tl_laqa11_configuration; DROP TABLE IF EXISTS tl_laqa11_usr_resp; DROP TABLE IF EXISTS tl_laqa11_response_rating; DROP TABLE IF EXISTS tl_laqa11_que_content; DROP TABLE IF EXISTS tl_laqa11_que_usr; DROP TABLE IF EXISTS tl_laqa11_session; DROP TABLE IF EXISTS tl_laqa11_content; DROP TABLE IF EXISTS tl_laqa11_condition_questions; +DROP TABLE IF EXISTS tl_laqa11_wizard_category; +DROP TABLE IF EXISTS tl_laqa11_wizard_cognitive_skill; +DROP TABLE IF EXISTS tl_laqa11_wizard_question; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_laqa/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/library_insert.sql,v diff -u -r1.7.14.1 -r1.7.14.2 --- lams_tool_laqa/db/sql/library_insert.sql 11 May 2016 07:35:57 -0000 1.7.14.1 +++ lams_tool_laqa/db/sql/library_insert.sql 27 Feb 2017 14:00:17 -0000 1.7.14.2 @@ -1,26 +1,3 @@ --- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) --- ============================================================= --- License Information: http://lamsfoundation.org/licensing/lams/2.0/ --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License version 2.0 as --- published by the Free Software Foundation. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301-- USA --- --- http://www.gnu.org/licenses/gpl.txt --- **************************************************************** --- - - - INSERT INTO lams_learning_library ( description, @@ -34,4 +11,4 @@ 'Question and Answer', 0, NOW() -) +) \ No newline at end of file Index: lams_tool_laqa/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/tool_insert.sql,v diff -u -r1.31.2.2 -r1.31.2.3 --- lams_tool_laqa/db/sql/tool_insert.sql 11 May 2016 07:35:57 -0000 1.31.2.2 +++ lams_tool_laqa/db/sql/tool_insert.sql 27 Feb 2017 14:00:16 -0000 1.31.2.3 @@ -1,26 +1,4 @@ -- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) --- ============================================================= --- License Information: http://lamsfoundation.org/licensing/lams/2.0/ --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License version 2.0 as --- published by the Free Software Foundation. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301-- USA --- --- http://www.gnu.org/licenses/gpl.txt --- **************************************************************** --- - - - INSERT INTO lams_tool ( tool_signature, @@ -29,8 +7,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -56,8 +32,6 @@ 'Q/A Tool', 'qa', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -74,4 +48,4 @@ NOW(), 1, 'tool/laqa11/laqa11admin.do' -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/build.properties,v diff -u -r1.18 -r1.18.2.1 --- lams_tool_larsrc/build.properties 30 Jul 2012 18:50:05 -0000 1.18 +++ lams_tool_larsrc/build.properties 27 Feb 2017 14:00:02 -0000 1.18.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=larsrc11 -tool.version=20110810 +tool.version=20170101 tool.hide=false tool.short.name=rsrc \ No newline at end of file Index: lams_tool_larsrc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/activity_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_larsrc/db/sql/activity_insert.sql 16 Mar 2016 12:13:25 -0000 1.5.2.1 +++ lams_tool_larsrc/db/sql/activity_insert.sql 27 Feb 2017 14:00:02 -0000 1.5.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Share Resources' , 'Share Resources' -, 'Share Resources' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/larsrc11/images/icon_rsrc.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql,v diff -u -r1.24 -r1.24.2.1 --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql 19 Feb 2012 20:22:04 -0000 1.24 +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql 27 Feb 2017 14:00:02 -0000 1.24.2.1 @@ -1,51 +1,58 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_larsrc11_attachment; -drop table if exists tl_larsrc11_item_instruction; -drop table if exists tl_larsrc11_resource; -drop table if exists tl_larsrc11_resource_item; -drop table if exists tl_larsrc11_resource_item_visit_log; -drop table if exists tl_larsrc11_session; -drop table if exists tl_larsrc11_user; -create table tl_larsrc11_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - resource_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_larsrc11_item_instruction ( - uid bigint not null auto_increment, - description varchar(255), - sequence_id integer, - item_uid bigint, - primary key (uid) -)ENGINE=InnoDB; create table tl_larsrc11_resource ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint, - lock_on_finished tinyint, + lock_on_finished TINYINT(1), instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - allow_add_files tinyint, - allow_add_urls tinyint, + content_in_use TINYINT(1), + define_later TINYINT(1), + content_id bigint, + allow_add_files TINYINT(1), + allow_add_urls TINYINT(1), mini_view_resource_number integer, - allow_auto_run tinyint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - assigment_submit_notify tinyint DEFAULT 0, - primary key (uid) -)ENGINE=InnoDB; + allow_auto_run TINYINT(1), + reflect_instructions text, + reflect_on_activity TINYINT(1), + assigment_submit_notify TINYINT(1) DEFAULT 0, + file_upload_notify TINYINT(1) DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_larsrc11_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status integer, + resource_uid bigint, + session_id bigint, + session_name varchar(250), + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK24AA78C530E79035 FOREIGN KEY (resource_uid) + REFERENCES tl_larsrc11_resource (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_larsrc11_user ( + uid bigint not null auto_increment, + user_id bigint, + last_name varchar(255), + first_name varchar(255), + login_name varchar(255), + session_finished TINYINT(1), + session_uid bigint, + resource_uid bigint, + primary key (uid), + KEY idx_user_user_id (user_id), + CONSTRAINT FK30113BFC309ED320 FOREIGN KEY (resource_uid) + REFERENCES tl_larsrc11_resource (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_larsrc11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_larsrc11_resource_item ( uid bigint not null auto_increment, file_uuid bigint, @@ -58,70 +65,63 @@ url text, create_by bigint, create_date datetime, - create_by_author tinyint, - is_hide tinyint, + create_by_author tinyint(1), + is_hide tinyint(1), item_type smallint, file_type varchar(255), file_name varchar(255), - open_url_new_window tinyint, + open_url_new_window tinyint(1), resource_uid bigint, session_uid bigint, order_id integer, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FKF52D1F9330E79035 FOREIGN KEY (resource_uid) + REFERENCES tl_larsrc11_resource (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FKF52D1F93758092FB FOREIGN KEY (create_by) + REFERENCES tl_larsrc11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FKF52D1F93EC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_larsrc11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_larsrc11_item_instruction ( + uid bigint not null auto_increment, + description text, + sequence_id integer, + item_uid bigint, + primary key (uid), + CONSTRAINT FKA5665013980570ED FOREIGN KEY (item_uid) + REFERENCES tl_larsrc11_resource_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_larsrc11_item_log ( uid bigint not null auto_increment, access_date datetime, complete_date datetime, resource_item_uid bigint, user_uid bigint, - complete tinyint, + complete tinyint(1), session_id bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_larsrc11_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, - resource_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; -create table tl_larsrc11_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - session_uid bigint, - resource_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); -alter table tl_larsrc11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid); -alter table tl_larsrc11_resource add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_larsrc11_user (uid); -alter table tl_larsrc11_resource_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid); -alter table tl_larsrc11_resource_item add index FKF52D1F9330E79035 (resource_uid), add constraint FKF52D1F9330E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); -alter table tl_larsrc11_resource_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid); -alter table tl_larsrc11_item_log add index FK693580A438BF8DFE (resource_item_uid), add constraint FK693580A438BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid); -alter table tl_larsrc11_item_log add index FK693580A441F9365D (user_uid), add constraint FK693580A441F9365D foreign key (user_uid) references tl_larsrc11_user (uid); -alter table tl_larsrc11_session add index FK24AA78C530E79035 (resource_uid), add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); -alter table tl_larsrc11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid); -alter table tl_larsrc11_user add index FK30113BFC309ED320 (resource_uid), add constraint FK30113BFC309ED320 foreign key (resource_uid) references tl_larsrc11_resource (uid); + primary key (uid), + KEY idx_item_log_session_id (session_id), + CONSTRAINT FK693580A438BF8DFE FOREIGN KEY (resource_item_uid) + REFERENCES tl_larsrc11_resource_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK693580A441F9365D FOREIGN KEY (user_uid) + REFERENCES tl_larsrc11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); - -INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, - `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, - `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`,`reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'Resources','0','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0); +ALTER TABLE tl_larsrc11_resource ADD CONSTRAINT FK89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_larsrc11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_larsrc11_resource (uid, title, lock_on_finished, + instructions, content_in_use, define_later, content_id, allow_add_files, + allow_add_urls, mini_view_resource_number, allow_auto_run,reflect_on_activity) VALUES + (1,'Resources','0','Instructions ',0,0,${default_content_id},0,0,0,0,0); -INSERT INTO `tl_larsrc11_resource_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `resource_uid`, `session_uid`, `order_id`) VALUES - (1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL, 1); -INSERT INTO `tl_larsrc11_item_instruction` (`uid`, `description`, `sequence_id`, `item_uid`) VALUES +INSERT INTO tl_larsrc11_resource_item (uid, title, url,create_date, create_by_author, is_hide, item_type, open_url_new_window, resource_uid,order_id) VALUES + (1,'Web Search','http://www.google.com ',NOW(),1,0,1,0,1,1); +INSERT INTO tl_larsrc11_item_instruction (uid, description, sequence_id, item_uid) VALUES (1,'Use Google to search the web',0,1); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql,v diff -u -r1.4 -r1.4.4.1 --- lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql 7 Jul 2009 00:39:36 -0000 1.4 +++ lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql 27 Feb 2017 14:00:02 -0000 1.4.4.1 @@ -1,14 +1,8 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_larsrc11_attachment; drop table if exists tl_larsrc11_item_instruction; drop table if exists tl_larsrc11_resource; drop table if exists tl_larsrc11_resource_item; drop table if exists tl_larsrc11_item_log; drop table if exists tl_larsrc11_session; drop table if exists tl_larsrc11_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_larsrc/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/library_insert.sql,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_larsrc/db/sql/library_insert.sql 7 Jul 2009 00:39:36 -0000 1.2 +++ lams_tool_larsrc/db/sql/library_insert.sql 27 Feb 2017 14:00:02 -0000 1.2.4.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Share resources', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.17.2.1 refers to a dead (removed) revision in file `lams_tool_larsrc/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/tool_insert.sql,v diff -u -r1.15.2.1 -r1.15.2.2 --- lams_tool_larsrc/db/sql/tool_insert.sql 24 Feb 2016 12:36:17 -0000 1.15.2.1 +++ lams_tool_larsrc/db/sql/tool_insert.sql 27 Feb 2017 14:00:02 -0000 1.15.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -35,8 +29,6 @@ 'Shared Resources', 'sharedresources', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +43,4 @@ 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources', NOW(), NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_leader/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/build.properties,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_leader/build.properties 8 Jan 2014 20:13:46 -0000 1.1 +++ lams_tool_leader/build.properties 27 Feb 2017 14:00:03 -0000 1.1.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=lalead11 -tool.version=20130422 +tool.version=20170101 tool.hide=false tool.short.name=leaderselection Index: lams_tool_leader/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_leader/db/sql/activity_insert.sql 11 May 2016 07:37:50 -0000 1.2.2.2 +++ lams_tool_leader/db/sql/activity_insert.sql 27 Feb 2017 14:00:03 -0000 1.2.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Leaderselection Tool' , 'Leaderselection Tool' -, 'Leaderselection Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 6 -, NULL -, NULL -, NULL -, NULL , 'tool/lalead11/images/icon_leaderselection.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.leaderselection.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_leader/db/sql/create_lams_tool_leaderselection.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/db/sql/create_lams_tool_leaderselection.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_leader/db/sql/create_lams_tool_leaderselection.sql 11 May 2016 07:37:50 -0000 1.1.2.1 +++ lams_tool_leader/db/sql/create_lams_tool_leaderselection.sql 27 Feb 2017 14:00:03 -0000 1.1.2.2 @@ -1,30 +1,63 @@ - - SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS tl_lalead11_leaderselection; -DROP TABLE IF EXISTS tl_lalead11_session; -DROP TABLE IF EXISTS tl_lalead11_user; -CREATE TABLE tl_lalead11_leaderselection (uid BIGINT NOT NULL AUTO_INCREMENT, create_date DATETIME, update_date DATETIME, create_by BIGINT, title VARCHAR(255), instructions TEXT, run_offline BIT, content_in_use BIT, define_later BIT, tool_content_id BIGINT, PRIMARY KEY (uid))ENGINE=InnoDB; -CREATE TABLE tl_lalead11_session (uid BIGINT NOT NULL AUTO_INCREMENT, session_end_date DATETIME, session_start_date DATETIME, status integer, session_id BIGINT, session_name VARCHAR(250), leaderselection_uid BIGINT, group_leader_uid BIGINT, PRIMARY KEY (uid))ENGINE=InnoDB; -CREATE TABLE tl_lalead11_user (uid BIGINT NOT NULL AUTO_INCREMENT, user_id BIGINT, last_name VARCHAR(255), login_name VARCHAR(255), first_name VARCHAR(255), finishedActivity BIT, leaderselection_session_uid BIGINT, PRIMARY KEY (uid))ENGINE=InnoDB; -ALTER TABLE tl_lalead11_session ADD INDEX FK_NEW_1316293302_B7C198E2FC940906 (leaderselection_uid), ADD CONSTRAINT FK_NEW_1316293302_B7C198E2FC940906 FOREIGN KEY (leaderselection_uid) REFERENCES tl_lalead11_leaderselection (uid); -ALTER TABLE tl_lalead11_session ADD INDEX FK_lalead11_1 (group_leader_uid), ADD CONSTRAINT FK_lalead11_1 FOREIGN KEY (group_leader_uid) REFERENCES tl_lalead11_user (uid); -ALTER TABLE tl_lalead11_user ADD INDEX FK_NEW_1316293302_CB8A58FFA3B0FADF (leaderselection_session_uid), ADD CONSTRAINT FK_NEW_1316293302_CB8A58FFA3B0FADF FOREIGN KEY (leaderselection_session_uid) REFERENCES tl_lalead11_session (uid); +CREATE TABLE tl_lalead11_leaderselection ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + PRIMARY KEY (uid) +); + +CREATE TABLE tl_lalead11_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + leaderselection_uid bigint(20), + group_leader_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_1316293302_B7C198E2FC940906 FOREIGN KEY (leaderselection_uid) + REFERENCES tl_lalead11_leaderselection (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lalead11_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + leaderselection_session_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK_NEW_1316293302_CB8A58FFA3B0FADF FOREIGN KEY (leaderselection_session_uid) + REFERENCES tl_lalead11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + + +ALTER TABLE tl_lalead11_session ADD CONSTRAINT FK_lalead11_1 FOREIGN KEY (group_leader_uid) + REFERENCES tl_lalead11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + INSERT INTO tl_lalead11_leaderselection ( title, instructions, tool_content_id, - run_offline, content_in_use, define_later) VALUES( "Leader Selection", "Instructions", ${default_content_id}, 0, - 0, 0 ); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_leader/db/sql/drop_lams_tool_leaderselection.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/db/sql/drop_lams_tool_leaderselection.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_leader/db/sql/drop_lams_tool_leaderselection.sql 11 May 2016 07:37:50 -0000 1.1.2.1 +++ lams_tool_leader/db/sql/drop_lams_tool_leaderselection.sql 27 Feb 2017 14:00:03 -0000 1.1.2.2 @@ -1,12 +1,5 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lalead11_user; DROP TABLE IF EXISTS tl_lalead11_session; DROP TABLE IF EXISTS tl_lalead11_leaderselection; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_leader/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/db/sql/library_insert.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_leader/db/sql/library_insert.sql 11 May 2016 07:37:50 -0000 1.1.2.1 +++ lams_tool_leader/db/sql/library_insert.sql 27 Feb 2017 14:00:03 -0000 1.1.2.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Leaderselection', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_leader/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_leader/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/db/sql/tool_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_leader/db/sql/tool_insert.sql 11 May 2016 07:37:50 -0000 1.2.2.2 +++ lams_tool_leader/db/sql/tool_insert.sql 27 Feb 2017 14:00:03 -0000 1.2.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -33,8 +29,6 @@ 'Leaderselection', 'leaderselection', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -49,4 +43,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/build.properties,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_mindmap/build.properties 30 Jul 2012 18:49:31 -0000 1.5 +++ lams_tool_mindmap/build.properties 27 Feb 2017 14:00:35 -0000 1.5.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.3 +min.server.version.number=3.0 signature=lamind10 -tool.version=20110414 +tool.version=20170101 tool.hide=false tool.short.name=mindmap \ No newline at end of file Index: lams_tool_mindmap/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_mindmap/db/sql/activity_insert.sql 11 May 2016 07:37:45 -0000 1.2.2.2 +++ lams_tool_mindmap/db/sql/activity_insert.sql 27 Feb 2017 14:00:35 -0000 1.2.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Mindmap Tool' , 'Mindmap Tool' -, 'Mindmap Tool' , 'Mindmap Tool for creating mindmaps.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 6 -, NULL -, NULL -, NULL -, NULL , 'tool/lamind10/images/icon_mindmap.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.mindmap.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql 11 May 2016 07:37:45 -0000 1.5.2.1 +++ lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql 27 Feb 2017 14:00:34 -0000 1.5.2.2 @@ -1,34 +1,95 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lamind10_attachment; -drop table if exists tl_lamind10_mindmap; -drop table if exists tl_lamind10_session; -drop table if exists tl_lamind10_user; -drop table if exists tl_lamind10_node; -drop table if exists tl_lamind10_request; -create table tl_lamind10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, mindmap_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lamind10_mindmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, submission_deadline datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, multiuser_mode bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, export_content text, reflect_on_activity bit, reflect_instructions text, primary key (uid))ENGINE=InnoDB; -create table tl_lamind10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), mindmap_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lamind10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mindmap_session_uid bigint, entry_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lamind10_node (node_id bigint not null auto_increment, unique_id bigint, parent_id bigint, node_text varchar(100), node_color varchar(6), session_id bigint, user_id bigint, mindmap_id bigint, primary key (node_id))ENGINE=InnoDB; -CREATE TABLE tl_lamind10_request (`uid` BIGINT(20) NOT NULL AUTO_INCREMENT, `unique_id` BIGINT(20) DEFAULT NULL, `global_id` BIGINT(20) DEFAULT NULL, `request_type` TINYINT(4) DEFAULT NULL, `node_id` BIGINT(20) DEFAULT NULL, `node_child_id` BIGINT(20) DEFAULT NULL, `user_id` BIGINT(20) DEFAULT NULL, `mindmap_id` BIGINT(20) DEFAULT NULL, PRIMARY KEY (`uid`), KEY `mindmap_id` (`mindmap_id`), KEY `user_id` (`user_id`), CONSTRAINT `tl_lamind10_request_fk` FOREIGN KEY (`mindmap_id`) REFERENCES `tl_lamind10_mindmap` (`uid`), CONSTRAINT `tl_lamind10_request_fk1` FOREIGN KEY (`user_id`) REFERENCES `tl_lamind10_user` (`uid`))ENGINE=InnoDB; +CREATE TABLE tl_lamind10_mindmap ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + submission_deadline datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + multiuser_mode bit(1), + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + export_content mediumtext, + reflect_on_activity bit(1), + reflect_instructions mediumtext, + PRIMARY KEY (uid) +); -alter table tl_lamind10_attachment add index FK_NEW_972920762_12090F57FC940906 (mindmap_uid), add constraint FK_NEW_972920762_12090F57FC940906 foreign key (mindmap_uid) references tl_lamind10_mindmap (uid); -alter table tl_lamind10_session add index FK_NEW_972920762_B7C198E2FC940906 (mindmap_uid), add constraint FK_NEW_972920762_B7C198E2FC940906 foreign key (mindmap_uid) references tl_lamind10_mindmap (uid); -alter table tl_lamind10_user add index FK_NEW_972920762_CB8A58FFA3B0FADF (mindmap_session_uid), add constraint FK_NEW_972920762_CB8A58FFA3B0FADF foreign key (mindmap_session_uid) references tl_lamind10_session (uid); -alter table tl_lamind10_node add index MindmapNode_Parent_FK (parent_id), add constraint MindmapNode_Parent_FK foreign key (parent_id) references tl_lamind10_node (node_id); -alter table tl_lamind10_node add index MindmapNode_User_FK (user_id), add constraint MindmapNode_User_FK foreign key (user_id) references tl_lamind10_user (uid); -alter table tl_lamind10_node add index MindmapNode_Mindmap_FK (mindmap_id), add constraint MindmapNode_Mindmap_FK foreign key (mindmap_id) references tl_lamind10_mindmap (uid); +CREATE TABLE tl_lamind10_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + mindmap_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_972920762_B7C198E2FC940906 FOREIGN KEY (mindmap_uid) + REFERENCES tl_lamind10_mindmap (uid) ON DELETE CASCADE ON UPDATE CASCADE +); +CREATE TABLE tl_lamind10_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + mindmap_session_uid bigint(20), + entry_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK_NEW_972920762_CB8A58FFA3B0FADF FOREIGN KEY (mindmap_session_uid) + REFERENCES tl_lamind10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lamind10_node ( + node_id bigint(20) NOT NULL AUTO_INCREMENT, + unique_id bigint(20), + parent_id bigint(20), + node_text varchar(100), + node_color varchar(6), + session_id bigint(20), + user_id bigint(20), + mindmap_id bigint(20), + PRIMARY KEY (node_id), + CONSTRAINT MindmapNode_Mindmap_FK FOREIGN KEY (mindmap_id) + REFERENCES tl_lamind10_mindmap (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT MindmapNode_User_FK FOREIGN KEY (user_id) + REFERENCES tl_lamind10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); + +CREATE TABLE tl_lamind10_request ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + unique_id bigint(20), + global_id bigint(20), + request_type tinyint(4), + node_id bigint(20), + node_child_id bigint(20), + user_id bigint(20), + mindmap_id bigint(20), + PRIMARY KEY (uid), + KEY mindmap_id (mindmap_id), + KEY user_id (user_id), + CONSTRAINT tl_lamind10_request_fk FOREIGN KEY (mindmap_id) + REFERENCES tl_lamind10_mindmap (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT tl_lamind10_request_fk1 FOREIGN KEY (user_id) + REFERENCES tl_lamind10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + + +ALTER TABLE tl_lamind10_node ADD CONSTRAINT MindmapNode_Parent_FK FOREIGN KEY (parent_id) + REFERENCES tl_lamind10_node (node_id) ON DELETE CASCADE ON UPDATE CASCADE; + + INSERT INTO tl_lamind10_mindmap ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, @@ -37,15 +98,12 @@ VALUES( "Mindmap", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, 0, - 0, 0 ); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_mindmap/db/sql/drop_lams_tool_mindmap.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/drop_lams_tool_mindmap.sql,v diff -u -r1.1.8.1 -r1.1.8.2 --- lams_tool_mindmap/db/sql/drop_lams_tool_mindmap.sql 11 May 2016 07:37:45 -0000 1.1.8.1 +++ lams_tool_mindmap/db/sql/drop_lams_tool_mindmap.sql 27 Feb 2017 14:00:35 -0000 1.1.8.2 @@ -1,10 +1,7 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lamind10_user; -DROP TABLE IF EXISTS tl_lamind10_attachment; DROP TABLE IF EXISTS tl_lamind10_session; DROP TABLE IF EXISTS tl_lamind10_mindmap; DROP TABLE IF EXISTS tl_lamind10_node; DROP TABLE IF EXISTS tl_lamind10_request; -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_mindmap/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/library_insert.sql,v diff -u -r1.1.8.1 -r1.1.8.2 --- lams_tool_mindmap/db/sql/library_insert.sql 11 May 2016 07:37:45 -0000 1.1.8.1 +++ lams_tool_mindmap/db/sql/library_insert.sql 27 Feb 2017 14:00:35 -0000 1.1.8.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Mindmap', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_mindmap/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/tool_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_mindmap/db/sql/tool_insert.sql 11 May 2016 07:37:45 -0000 1.2.2.2 +++ lams_tool_mindmap/db/sql/tool_insert.sql 27 Feb 2017 14:00:34 -0000 1.2.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +30,6 @@ 'Mindmap', 'mindmap', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +45,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/build.properties,v diff -u -r1.25 -r1.25.2.1 --- lams_tool_nb/build.properties 30 Jul 2012 18:51:09 -0000 1.25 +++ lams_tool_nb/build.properties 27 Feb 2017 14:00:33 -0000 1.25.2.1 @@ -1,8 +1,8 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lanb11 -tool.version=20081209 +tool.version=20170101 tool.hide=false tool.short.name=noticeboard Index: lams_tool_nb/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/activity_insert.sql,v diff -u -r1.19.2.2 -r1.19.2.3 --- lams_tool_nb/db/sql/activity_insert.sql 11 May 2016 07:37:11 -0000 1.19.2.2 +++ lams_tool_nb/db/sql/activity_insert.sql 27 Feb 2017 14:00:33 -0000 1.19.2.3 @@ -1,98 +1,30 @@ --- --- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) --- ============================================================= --- License Information: http://lamsfoundation.org/licensing/lams/2.0/ --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License version 2.0 as --- published by the Free Software Foundation. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 --- USA --- --- http://www.gnu.org/licenses/gpl.txt --- **************************************************************** --- - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'Displays a NoticeboardX' + 'Displays a NoticeboardX' , 'NoticeboardX' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/lanb11/images/icon_htmlnb.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_nb/db/sql/create_lams_tool_nb.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/create_lams_tool_nb.sql,v diff -u -r1.20.2.1 -r1.20.2.2 --- lams_tool_nb/db/sql/create_lams_tool_nb.sql 11 May 2016 07:37:11 -0000 1.20.2.1 +++ lams_tool_nb/db/sql/create_lams_tool_nb.sql 27 Feb 2017 14:00:33 -0000 1.20.2.2 @@ -1,22 +1,20 @@ - - CREATE TABLE tl_lanb11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , nb_content_id BIGINT(20) UNIQUE NOT NULL + , nb_content_id BIGINT(20) NOT NULL , title TEXT , content TEXT - , online_instructions TEXT - , offline_instructions TEXT , define_later TINYINT(1) - , force_offline TINYINT(1) , reflect_on_activity TINYINT(1) , reflect_instructions TEXT , content_in_use TINYINT(1) , creator_user_id BIGINT(20) , date_created DATETIME , date_updated DATETIME + , allow_comments tinyint(1) DEFAULT 0 + , comments_like_dislike tinyint(1) DEFAULT 0 , PRIMARY KEY (uid) -)ENGINE=InnoDB; + , UNIQUE KEY nb_content_id (nb_content_id) +); CREATE TABLE tl_lanb11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -30,7 +28,7 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_session_1 FOREIGN KEY (nb_content_uid) REFERENCES tl_lanb11_content (uid) -)ENGINE=InnoDB; +); CREATE TABLE tl_lanb11_user ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -43,43 +41,23 @@ , INDEX (nb_session_uid) , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) REFERENCES tl_lanb11_session (uid) -)ENGINE=InnoDB; +); - -CREATE TABLE tl_lanb11_attachment ( - attachment_id BIGINT(20) NOT NULL AUTO_INCREMENT - , nb_content_uid BIGINT(20) NOT NULL - , filename VARCHAR(255) NOT NULL - , uuid BIGINT(20) NOT NULL - , version_id BIGINT(20) - , online_file TINYINT(1) NOT NULL - , PRIMARY KEY (attachment_id) - , INDEX (nb_content_uid) - , CONSTRAINT FK_tl_lanb11_attachment_1 FOREIGN KEY (nb_content_uid) - REFERENCES tl_lanb11_content (uid) -)ENGINE=InnoDB; - -- Default Content For Noticeboard Tool INSERT INTO tl_lanb11_content ( nb_content_id, title, content, - online_instructions, - offline_instructions, define_later, - force_offline, reflect_on_activity, reflect_instructions, content_in_use, date_created) VALUES (${default_content_id}, 'Noticeboard', 'Content', - '', - '', 0, 0, - 0, 'Reflect on noticeboard', 0, - now()); + now()); \ No newline at end of file Index: lams_tool_nb/db/sql/drop_lams_tool_nb.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/drop_lams_tool_nb.sql,v diff -u -r1.9.14.1 -r1.9.14.2 --- lams_tool_nb/db/sql/drop_lams_tool_nb.sql 11 May 2016 07:37:11 -0000 1.9.14.1 +++ lams_tool_nb/db/sql/drop_lams_tool_nb.sql 27 Feb 2017 14:00:33 -0000 1.9.14.2 @@ -1,7 +1,3 @@ - - -DROP TABLE IF EXISTS tl_lanb11_attachment; DROP TABLE IF EXISTS tl_lanb11_user; DROP TABLE IF EXISTS tl_lanb11_session; -DROP TABLE IF EXISTS tl_lanb11_content; - +DROP TABLE IF EXISTS tl_lanb11_content; \ No newline at end of file Index: lams_tool_nb/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/library_insert.sql,v diff -u -r1.5.14.1 -r1.5.14.2 --- lams_tool_nb/db/sql/library_insert.sql 11 May 2016 07:37:11 -0000 1.5.14.1 +++ lams_tool_nb/db/sql/library_insert.sql 27 Feb 2017 14:00:33 -0000 1.5.14.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Noticeboard', 0, NOW() -) +) \ No newline at end of file Index: lams_tool_nb/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/tool_insert.sql,v diff -u -r1.27.2.2 -r1.27.2.3 --- lams_tool_nb/db/sql/tool_insert.sql 11 May 2016 07:37:11 -0000 1.27.2.2 +++ lams_tool_nb/db/sql/tool_insert.sql 27 Feb 2017 14:00:33 -0000 1.27.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -33,8 +29,6 @@ 'Displays a NoticeboardX', 'nb', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -49,4 +43,4 @@ 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources', NOW(), NOW() -); +); \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/build.properties,v diff -u -r1.15 -r1.15.2.1 --- lams_tool_notebook/build.properties 30 Jul 2012 18:54:37 -0000 1.15 +++ lams_tool_notebook/build.properties 27 Feb 2017 14:00:37 -0000 1.15.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lantbk11 -tool.version=20110510 +tool.version=20170101 tool.hide=false tool.short.name=notebook \ No newline at end of file Index: lams_tool_notebook/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/activity_insert.sql,v diff -u -r1.4.2.2 -r1.4.2.3 --- lams_tool_notebook/db/sql/activity_insert.sql 11 May 2016 07:37:21 -0000 1.4.2.2 +++ lams_tool_notebook/db/sql/activity_insert.sql 27 Feb 2017 14:00:37 -0000 1.4.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Notebook Tool' , 'Notebook Tool' -, 'Notebook Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 6 -, NULL -, NULL -, NULL -, NULL , 'tool/lantbk11/images/icon_notebook.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.notebook.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_notebook/db/sql/create_lams_tool_notebook.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/create_lams_tool_notebook.sql,v diff -u -r1.9.2.1 -r1.9.2.2 --- lams_tool_notebook/db/sql/create_lams_tool_notebook.sql 11 May 2016 07:37:22 -0000 1.9.2.1 +++ lams_tool_notebook/db/sql/create_lams_tool_notebook.sql 27 Feb 2017 14:00:37 -0000 1.9.2.2 @@ -1,51 +1,77 @@ - - SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS tl_lantbk11_conditions; -drop table if exists tl_lantbk11_attachment; -drop table if exists tl_lantbk11_notebook; -drop table if exists tl_lantbk11_session; -drop table if exists tl_lantbk11_user; -create table tl_lantbk11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, notebook_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, submission_deadline datetime DEFAULT NULL, primary key (uid))ENGINE=InnoDB; -create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid))ENGINE=InnoDB; -alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid); -alter table tl_lantbk11_session add index FKB7C198E2FC940906 (notebook_uid), add constraint FKB7C198E2FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid); -alter table tl_lantbk11_user add index FKCB8A58FFA3B0FADF (notebook_session_uid), add constraint FKCB8A58FFA3B0FADF foreign key (notebook_session_uid) references tl_lantbk11_session (uid); +CREATE TABLE tl_lantbk11_notebook ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + allow_rich_editor bit(1), + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + submission_deadline datetime, + force_response bit(1) DEFAULT b'0', + PRIMARY KEY (uid) +); + +CREATE TABLE tl_lantbk11_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + notebook_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FKB7C198E2FC940906 FOREIGN KEY (notebook_uid) + REFERENCES tl_lantbk11_notebook (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lantbk11_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + notebook_session_uid bigint(20), + entry_uid bigint(20), + teachers_comment mediumtext, + PRIMARY KEY (uid), + CONSTRAINT FKCB8A58FFA3B0FADF FOREIGN KEY (notebook_session_uid) + REFERENCES tl_lantbk11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lantbk11_conditions ( + condition_id BIGINT(20) NOT NULL + , content_uid BIGINT(20) + , PRIMARY KEY (condition_id) + , CONSTRAINT NotebookConditionInheritance FOREIGN KEY (condition_id) + REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE + , CONSTRAINT NotebookConditionToNotebook FOREIGN KEY (content_uid) + REFERENCES tl_lantbk11_notebook(uid) ON DELETE CASCADE ON UPDATE CASCADE +); + INSERT INTO tl_lantbk11_notebook ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, allow_rich_editor) VALUES( "Notebook", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, - 0, 0 ); -CREATE TABLE tl_lantbk11_conditions ( - condition_id BIGINT(20) NOT NULL - , content_uid BIGINT(20) - , PRIMARY KEY (condition_id) - , CONSTRAINT NotebookConditionInheritance FOREIGN KEY (condition_id) - REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE - , CONSTRAINT NotebookConditionToNotebook FOREIGN KEY (content_uid) - REFERENCES tl_lantbk11_notebook(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; - SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_notebook/db/sql/drop_lams_tool_notebook.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/drop_lams_tool_notebook.sql,v diff -u -r1.2.12.1 -r1.2.12.2 --- lams_tool_notebook/db/sql/drop_lams_tool_notebook.sql 11 May 2016 07:37:21 -0000 1.2.12.1 +++ lams_tool_notebook/db/sql/drop_lams_tool_notebook.sql 27 Feb 2017 14:00:37 -0000 1.2.12.2 @@ -1,14 +1,6 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lantbk11_conditions; DROP TABLE IF EXISTS tl_lantbk11_user; -DROP TABLE IF EXISTS tl_lantbk11_attachment; DROP TABLE IF EXISTS tl_lantbk11_session; DROP TABLE IF EXISTS tl_lantbk11_notebook; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_notebook/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/library_insert.sql,v diff -u -r1.1.14.1 -r1.1.14.2 --- lams_tool_notebook/db/sql/library_insert.sql 11 May 2016 07:37:22 -0000 1.1.14.1 +++ lams_tool_notebook/db/sql/library_insert.sql 27 Feb 2017 14:00:37 -0000 1.1.14.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Notebook', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/tool_insert.sql,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_notebook/db/sql/tool_insert.sql 11 May 2016 07:37:21 -0000 1.11.2.2 +++ lams_tool_notebook/db/sql/tool_insert.sql 27 Feb 2017 14:00:37 -0000 1.11.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +30,6 @@ 'Notebook', 'notebook', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +45,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_pixlr/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/build.properties,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_pixlr/build.properties 30 Jul 2012 18:53:10 -0000 1.4 +++ lams_tool_pixlr/build.properties 27 Feb 2017 14:00:28 -0000 1.4.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.3 +min.server.version.number=3.0 signature=lapixl10 -tool.version=20081217 +tool.version=20170101 tool.hide=false tool.short.name=pixlr \ No newline at end of file Index: lams_tool_pixlr/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/activity_insert.sql,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_pixlr/db/sql/activity_insert.sql 11 May 2016 07:37:25 -0000 1.3.2.2 +++ lams_tool_pixlr/db/sql/activity_insert.sql 27 Feb 2017 14:00:28 -0000 1.3.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Pixlr Tool' , 'Pixlr Tool' -, 'Pixlr Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/lapixl10/images/icon_pixlr.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.pixlr.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql 11 May 2016 07:37:25 -0000 1.5.2.1 +++ lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql 27 Feb 2017 14:00:28 -0000 1.5.2.2 @@ -1,20 +1,64 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lapixl10_attachment; -drop table if exists tl_lapixl10_pixlr; -drop table if exists tl_lapixl10_session; -drop table if exists tl_lapixl10_user; -drop table if exists tl_lapixl10_configuration; -create table tl_lapixl10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, pixlr_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lapixl10_pixlr (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, allow_view_others_images bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, image_file_name text, image_width bigint, image_height bigint, reflect_instructions text, primary key (uid))ENGINE=InnoDB; -create table tl_lapixl10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), pixlr_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lapixl10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, pixlr_session_uid bigint, entry_uid bigint, image_file_name text, imageHeight bigint, imageWidth bigint, imageHidden bit, primary key (uid))ENGINE=InnoDB; -create table tl_lapixl10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value text, primary key (uid))ENGINE=InnoDB; -alter table tl_lapixl10_attachment add index FK951F889ACB8ADA74 (pixlr_uid), add constraint FK951F889ACB8ADA74 foreign key (pixlr_uid) references tl_lapixl10_pixlr (uid); -alter table tl_lapixl10_session add index FKE5C05E7FCB8ADA74 (pixlr_uid), add constraint FKE5C05E7FCB8ADA74 foreign key (pixlr_uid) references tl_lapixl10_pixlr (uid); -alter table tl_lapixl10_user add index FK9A39C08236E23005 (pixlr_session_uid), add constraint FK9A39C08236E23005 foreign key (pixlr_session_uid) references tl_lapixl10_session (uid); +CREATE TABLE tl_lapixl10_pixlr ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + reflect_on_activity bit(1), + allow_view_others_images bit(1), + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + image_file_name mediumtext, + image_width bigint(20), + image_height bigint(20), + reflect_instructions mediumtext, + PRIMARY KEY (uid) +); + +CREATE TABLE tl_lapixl10_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + pixlr_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FKE5C05E7FCB8ADA74 FOREIGN KEY (pixlr_uid) + REFERENCES tl_lapixl10_pixlr (uid) ON DELETE CASCADE ON UPDATE CASCADE +); +CREATE TABLE tl_lapixl10_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + pixlr_session_uid bigint(20), + entry_uid bigint(20), + image_file_name mediumtext, + imageHeight bigint(20), + imageWidth bigint(20), + imageHidden bit(1), + PRIMARY KEY (uid), + CONSTRAINT FK9A39C08236E23005 FOREIGN KEY (pixlr_session_uid) + REFERENCES tl_lapixl10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lapixl10_configuration ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + config_key varchar(30), + config_value mediumtext, + PRIMARY KEY (uid), + UNIQUE KEY config_key (config_key) +); + -- Inserting the required config item into the config table -- Currently supported languages for pixlr INSERT INTO tl_lapixl10_configuration ( @@ -30,10 +74,7 @@ INSERT INTO tl_lapixl10_pixlr ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, @@ -42,22 +83,17 @@ image_width, image_height, image_file_name - ) VALUES( "Pixlr", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, 0, - 0, 1, 400, 450, "blank.jpg" -); - +); \ No newline at end of file Index: lams_tool_pixlr/db/sql/drop_lams_tool_pixlr.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/drop_lams_tool_pixlr.sql,v diff -u -r1.2.10.1 -r1.2.10.2 --- lams_tool_pixlr/db/sql/drop_lams_tool_pixlr.sql 11 May 2016 07:37:25 -0000 1.2.10.1 +++ lams_tool_pixlr/db/sql/drop_lams_tool_pixlr.sql 27 Feb 2017 14:00:28 -0000 1.2.10.2 @@ -1,14 +1,6 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lapixl10_user; -DROP TABLE IF EXISTS tl_lapixl10_attachment; DROP TABLE IF EXISTS tl_lapixl10_session; DROP TABLE IF EXISTS tl_lapixl10_pixlr; DROP TABLE IF EXISTS tl_lapixl10_configuration; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_pixlr/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/library_insert.sql,v diff -u -r1.1.10.1 -r1.1.10.2 --- lams_tool_pixlr/db/sql/library_insert.sql 11 May 2016 07:37:25 -0000 1.1.10.1 +++ lams_tool_pixlr/db/sql/library_insert.sql 27 Feb 2017 14:00:28 -0000 1.1.10.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Pixlr', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_pixlr/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_pixlr/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/tool_insert.sql,v diff -u -r1.4.2.2 -r1.4.2.3 --- lams_tool_pixlr/db/sql/tool_insert.sql 11 May 2016 07:37:25 -0000 1.4.2.2 +++ lams_tool_pixlr/db/sql/tool_insert.sql 27 Feb 2017 14:00:28 -0000 1.4.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +30,6 @@ 'Pixlr', 'pixlr', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +45,4 @@ NOW(), 0, 'tool/lapixl10/lapixl10admin.do' -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_preview/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/build.properties,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_preview/build.properties 24 Jul 2015 00:46:10 -0000 1.1 +++ lams_tool_preview/build.properties 27 Feb 2017 14:00:14 -0000 1.1.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=laprev11 -tool.version=20150708 +tool.version=20170101 tool.hide=false -tool.short.name=peerreview +tool.short.name=peerreview \ No newline at end of file Index: lams_tool_preview/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/db/sql/activity_insert.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_preview/db/sql/activity_insert.sql 16 Mar 2016 12:13:39 -0000 1.1.2.1 +++ lams_tool_preview/db/sql/activity_insert.sql 27 Feb 2017 14:00:14 -0000 1.1.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Peerreview' , 'Peerreview' -, 'Peerreview' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/laprev11/images/icon_peerreview.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.peerreview.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_preview/db/sql/create_lams_tool_peerreview.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/db/sql/create_lams_tool_peerreview.sql,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_preview/db/sql/create_lams_tool_peerreview.sql 24 Jul 2015 00:34:29 -0000 1.1 +++ lams_tool_preview/db/sql/create_lams_tool_peerreview.sql 27 Feb 2017 14:00:14 -0000 1.1.2.1 @@ -1,26 +1,29 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_laprev11_peerreview; -drop table if exists tl_laprev11_session; -drop table if exists tl_laprev11_user; + create table tl_laprev11_peerreview ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - lock_on_finished tinyint, - show_ratings_left_for_user tinyint DEFAULT 1, + lock_on_finished TINYINT(1), + show_ratings_left_for_user TINYINT(1) DEFAULT 1, instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, + content_in_use TINYINT(1), + define_later TINYINT(1), + content_id bigint, reflect_instructions text, - reflect_on_activity smallint, + reflect_on_activity TINYINT(1), minimum_rates integer DEFAULT 0, maximum_rates integer DEFAULT 0, maximum_rates_per_user integer DEFAULT 0, - primary key (uid) -)ENGINE=InnoDB; + self_review tinyint(1) DEFAULT 0, + notify_users_of_results tinyint(1) DEFAULT 1, + show_ratings_left_by_user tinyint(1) DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); + create table tl_laprev11_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -29,26 +32,36 @@ peerreview_uid bigint, session_id bigint, session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_1661738138_24AA78C530E79035 FOREIGN KEY (peerreview_uid) + REFERENCES tl_laprev11_peerreview (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_laprev11_user ( uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), - session_finished smallint, + session_finished TINYINT(1), session_uid bigint, peerreview_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -alter table tl_laprev11_peerreview add index FK_NEW_1661738138_89093BF758092FB (create_by), add constraint FK_NEW_1661738138_89093BF758092FB foreign key (create_by) references tl_laprev11_user (uid); -alter table tl_laprev11_session add index FK_NEW_1661738138_24AA78C530E79035 (peerreview_uid), add constraint FK_NEW_1661738138_24AA78C530E79035 foreign key (peerreview_uid) references tl_laprev11_peerreview (uid); -alter table tl_laprev11_user add index FK_NEW_1661738138_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_1661738138_30113BFCEC0D3147 foreign key (session_uid) references tl_laprev11_session (uid); -alter table tl_laprev11_user add index FK_NEW_1661738138_30113BFC309ED320 (peerreview_uid), add constraint FK_NEW_1661738138_30113BFC309ED320 foreign key (peerreview_uid) references tl_laprev11_peerreview (uid); + primary key (uid), + UNIQUE KEY prev11uniqusersession (user_id,session_uid), + CONSTRAINT FK_NEW_1661738138_30113BFC309ED320 FOREIGN KEY (peerreview_uid) + REFERENCES tl_laprev11_peerreview (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_1661738138_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_laprev11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -INSERT INTO `tl_laprev11_peerreview` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `lock_on_finished`, - `instructions`, `content_in_use`, `define_later`, `content_id`, `reflect_on_activity`, `show_ratings_left_for_user`) VALUES - (1,NULL,NULL,NULL,'Peer review','0','Instructions ',0,0,${default_content_id},0, 1); + +ALTER TABLE tl_laprev11_peerreview ADD CONSTRAINT FK_NEW_1661738138_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_laprev11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_laprev11_peerreview (uid, title, lock_on_finished, + instructions, content_in_use, define_later, content_id, reflect_on_activity, show_ratings_left_for_user) VALUES + (1,'Peer review','0','Instructions ',0,0,${default_content_id},0, 1); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql 24 Jul 2015 00:34:29 -0000 1.1 +++ lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql 27 Feb 2017 14:00:14 -0000 1.1.2.1 @@ -2,9 +2,4 @@ drop table if exists tl_laprev11_peerreview; drop table if exists tl_laprev11_session; drop table if exists tl_laprev11_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_preview/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_preview/db/sql/library_insert.sql 24 Jul 2015 00:34:29 -0000 1.1 +++ lams_tool_preview/db/sql/library_insert.sql 27 Feb 2017 14:00:14 -0000 1.1.2.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Peerreview', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_preview/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_preview/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/db/sql/tool_insert.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_preview/db/sql/tool_insert.sql 24 Feb 2016 12:35:39 -0000 1.1.2.1 +++ lams_tool_preview/db/sql/tool_insert.sql 27 Feb 2017 14:00:14 -0000 1.1.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +28,6 @@ 'Peerreview', 'peerreview', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -49,4 +41,4 @@ 'org.lamsfoundation.lams.tool.peerreview.ApplicationResources', NOW(), NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.properties,v diff -u -r1.27 -r1.27.2.1 --- lams_tool_sbmt/build.properties 30 Jul 2012 18:54:54 -0000 1.27 +++ lams_tool_sbmt/build.properties 27 Feb 2017 14:00:05 -0000 1.27.2.1 @@ -1,8 +1,8 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lasbmt11 -tool.version=20110325 +tool.version=20170101 tool.hide=false tool.short.name=sbmt Index: lams_tool_sbmt/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/activity_insert.sql,v diff -u -r1.15.2.2 -r1.15.2.3 --- lams_tool_sbmt/db/sql/activity_insert.sql 11 May 2016 07:35:37 -0000 1.15.2.2 +++ lams_tool_sbmt/db/sql/activity_insert.sql 27 Feb 2017 14:00:04 -0000 1.15.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL -, 'Uploading of files by learners, for review by teachers.' + 'Uploading of files by learners, for review by teachers.' , 'Submit File' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 3 -, NULL -, NULL -, NULL -, NULL , 'tool/lasbmt11/images/icon_reportsubmission.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql,v diff -u -r1.32.2.1 -r1.32.2.2 --- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql 11 May 2016 07:35:37 -0000 1.32.2.1 +++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql 27 Feb 2017 14:00:04 -0000 1.32.2.2 @@ -1,55 +1,67 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lasbmt11_content; -drop table if exists tl_lasbmt11_instruction_files; -drop table if exists tl_lasbmt11_report; -drop table if exists tl_lasbmt11_session; -drop table if exists tl_lasbmt11_user; -drop table if exists tl_lasbmt11_submission_details; + create table tl_lasbmt11_content ( content_id bigint not null, - title varchar(64) not null, + title varchar(255) not null, instruction text, - define_later smallint not null, - run_offline smallint not null, - offline_instruction text, - online_instruction text, - content_in_use smallint, - lock_on_finished smallint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - limit_upload smallint, + define_later TINYINT(1), + content_in_use TINYINT(1), + lock_on_finished TINYINT(1), + reflect_instructions TEXT, + reflect_on_activity TINYINT(1), + limit_upload TINYINT(1), limit_upload_number integer, created datetime, created_by bigint, updated datetime, submission_deadline datetime, - mark_release_notify tinyint DEFAULT 0, - file_submit_notify tinyint DEFAULT 0, + mark_release_notify TINYINT(1) DEFAULT 0, + file_submit_notify TINYINT(1) DEFAULT 0, primary key (content_id) -)ENGINE=InnoDB; +); + +create table tl_lasbmt11_session ( + session_id bigint not null, + status TINYINT(1), + content_id bigint, + session_name varchar(250), + primary key (session_id), + CONSTRAINT FKEC8C77C9785A173A FOREIGN KEY (content_id) + REFERENCES tl_lasbmt11_content (content_id) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lasbmt11_user ( uid bigint not null auto_increment, user_id integer, - finished bit, + finished TINYINT(1), session_id bigint, first_name varchar(255), login_name varchar(255), last_name varchar(255), content_id bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + KEY session_id (session_id), + CONSTRAINT tl_lasbmt11_user_ibfk_1 FOREIGN KEY (session_id) + REFERENCES tl_lasbmt11_session (session_id) ON DELETE CASCADE ON UPDATE CASCADE +); -create table tl_lasbmt11_instruction_files ( - uid bigint not null auto_increment, +create table tl_lasbmt11_submission_details ( + submission_id bigint not null auto_increment, + filePath varchar(250), + fileDescription text, + date_of_submission datetime, uuid bigint, version_id bigint, - type varchar(20), - name varchar(255), - content_id bigint, - primary key (uid) -)ENGINE=InnoDB; + session_id bigint, + learner_id bigint, + removed tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (submission_id), + CONSTRAINT FK1411A53C93C861A FOREIGN KEY (session_id) + REFERENCES tl_lasbmt11_session (session_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK1411A53CFFD5A38B FOREIGN KEY (learner_id) + REFERENCES tl_lasbmt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lasbmt11_report ( report_id bigint not null auto_increment, comments text, @@ -58,34 +70,17 @@ mark_file_uuid bigint, mark_file_version_id bigint, mark_file_name varchar(255), - primary key (report_id) -)ENGINE=InnoDB; -create table tl_lasbmt11_session ( - session_id bigint not null, - status integer not null, - content_id bigint, - session_name varchar(250), - primary key (session_id) -)ENGINE=InnoDB; -create table tl_lasbmt11_submission_details ( - submission_id bigint not null auto_increment, - filePath varchar(250), - fileDescription varchar(250), - date_of_submission datetime, - uuid bigint, - version_id bigint, - session_id bigint, - learner_id bigint, - primary key (submission_id) -)ENGINE=InnoDB; + primary key (report_id), + CONSTRAINT tl_lasbmt11_report_ibfk_1 FOREIGN KEY (report_id) + REFERENCES tl_lasbmt11_submission_details (submission_id) ON DELETE CASCADE ON UPDATE CASCADE +); -alter table tl_lasbmt11_content add index FKAEF329AC172BC670 (created_by), add constraint FKAEF329AC172BC670 foreign key (created_by) references tl_lasbmt11_user (uid); -alter table tl_lasbmt11_instruction_files add index FKA75538F9785A173A (content_id), add constraint FKA75538F9785A173A foreign key (content_id) references tl_lasbmt11_content (content_id); -alter table tl_lasbmt11_session add index FKEC8C77C9785A173A (content_id), add constraint FKEC8C77C9785A173A foreign key (content_id) references tl_lasbmt11_content (content_id); -alter table tl_lasbmt11_submission_details add index FK1411A53CFFD5A38B (learner_id), add constraint FK1411A53CFFD5A38B foreign key (learner_id) references tl_lasbmt11_user (uid); -alter table tl_lasbmt11_submission_details add index FK1411A53C93C861A (session_id), add constraint FK1411A53C93C861A foreign key (session_id) references tl_lasbmt11_session (session_id); +ALTER TABLE tl_lasbmt11_content ADD CONSTRAINT FKAEF329AC172BC670 FOREIGN KEY (created_by) + REFERENCES tl_lasbmt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + -INSERT INTO `tl_lasbmt11_content` (content_id,title,instruction,define_later,run_offline,content_in_use,lock_on_finished,reflect_on_activity,limit_upload,limit_upload_number) -values(${default_content_id},"Submit Files","Instructions",0,0,0,0,0,0,1); +INSERT INTO tl_lasbmt11_content (content_id,title,instruction,define_later,content_in_use,lock_on_finished,reflect_on_activity,limit_upload,limit_upload_number) +values(${default_content_id},"Submit Files","Instructions",0,0,0,0,0,1); + SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_sbmt/db/sql/drop_lams_tool_sbmt.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/drop_lams_tool_sbmt.sql,v diff -u -r1.5.14.1 -r1.5.14.2 --- lams_tool_sbmt/db/sql/drop_lams_tool_sbmt.sql 11 May 2016 07:35:37 -0000 1.5.14.1 +++ lams_tool_sbmt/db/sql/drop_lams_tool_sbmt.sql 27 Feb 2017 14:00:05 -0000 1.5.14.2 @@ -1,10 +1,6 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lasbmt11_session; DROP TABLE IF EXISTS tl_lasbmt11_report; DROP TABLE IF EXISTS tl_lasbmt11_submission_details; DROP TABLE IF EXISTS tl_lasbmt11_content; -DROP TABLE IF EXISTS tl_lasbmt11_instruction_files; -DROP TABLE IF EXISTS tl_lasbmt11_session_learners; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Fisheye: Tag 1.3.14.2 refers to a dead (removed) revision in file `lams_tool_sbmt/db/sql/insert_test_data.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/library_insert.sql,v diff -u -r1.4.14.1 -r1.4.14.2 --- lams_tool_sbmt/db/sql/library_insert.sql 11 May 2016 07:35:37 -0000 1.4.14.1 +++ lams_tool_sbmt/db/sql/library_insert.sql 27 Feb 2017 14:00:05 -0000 1.4.14.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Submit file', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.21.2.1 refers to a dead (removed) revision in file `lams_tool_sbmt/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/tool_insert.sql,v diff -u -r1.25.2.2 -r1.25.2.3 --- lams_tool_sbmt/db/sql/tool_insert.sql 11 May 2016 07:35:37 -0000 1.25.2.2 +++ lams_tool_sbmt/db/sql/tool_insert.sql 27 Feb 2017 14:00:04 -0000 1.25.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -33,8 +29,6 @@ 'Submit File Tool Description', 'submitfile', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -49,7 +43,4 @@ 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources', NOW(), NOW() -); - - - +); \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/build.properties,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_scratchie/build.properties 28 Aug 2012 15:22:19 -0000 1.2 +++ lams_tool_scratchie/build.properties 27 Feb 2017 14:00:16 -0000 1.2.4.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=lascrt11 -tool.version=20110509 +tool.version=20170101 tool.hide=false tool.short.name=scratchie \ No newline at end of file Index: lams_tool_scratchie/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/db/sql/activity_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_scratchie/db/sql/activity_insert.sql 16 Mar 2016 12:13:18 -0000 1.2.2.1 +++ lams_tool_scratchie/db/sql/activity_insert.sql 27 Feb 2017 14:00:15 -0000 1.2.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Scratchie' , 'Scratchie' -, 'Scratchie' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/lascrt11/images/icon_scratchie.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.scratchie.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql 30 Sep 2013 15:54:44 -0000 1.8 +++ lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql 27 Feb 2017 14:00:15 -0000 1.8.2.1 @@ -1,117 +1,158 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lascrt11_attachment; -drop table if exists tl_lascrt11_scratchie; -drop table if exists tl_lascrt11_scratchie_item; -drop table if exists tl_lascrt11_scratchie_answer; -drop table if exists tl_lascrt11_answer_log; -drop table if exists tl_lascrt11_session; -drop table if exists tl_lascrt11_user; -create table tl_lascrt11_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - scratchie_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + create table tl_lascrt11_scratchie ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint, instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - reflect_instructions varchar(255), - reflect_on_activity smallint, - extra_point smallint, - show_results_page smallint, - primary key (uid) -)ENGINE=InnoDB; + define_later TINYINT(1), + content_id bigint, + reflect_instructions text, + reflect_on_activity TINYINT(1), + extra_point TINYINT(1), + submission_deadline datetime, + burning_questions_enabled TINYINT(1) DEFAULT 1, + time_limit int(11) DEFAULT 0, + PRIMARY KEY (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_lascrt11_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status TINYINT(1), + scratchie_uid bigint, + session_id bigint, + session_name varchar(250), + group_leader_uid bigint(20), + mark int(11) DEFAULT 0, + scratching_finished TINYINT(1) DEFAULT 0, + time_limit_launched_date datetime, + PRIMARY KEY (uid), + UNIQUE KEY session_id_UNIQUE (session_id), + CONSTRAINT FK_NEW_610529188_24AA78C530E79035 FOREIGN KEY (scratchie_uid) + REFERENCES tl_lascrt11_scratchie (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_lascrt11_user ( + uid bigint not null auto_increment, + user_id bigint, + last_name varchar(255), + first_name varchar(255), + login_name varchar(255), + session_finished TINYINT(1), + scratching_finished TINYINT(1), + session_uid bigint, + scratchie_uid bigint, + primary key (uid), + UNIQUE KEY user_id (user_id,session_uid), + KEY userIdIndex (user_id), + CONSTRAINT FK_NEW_610529188_30113BFC309ED320 FOREIGN KEY (scratchie_uid) + REFERENCES tl_lascrt11_scratchie (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_610529188_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_lascrt11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lascrt11_scratchie_item ( uid bigint not null auto_increment, title varchar(255), description text, - create_by bigint, create_date datetime, - create_by_author tinyint, + create_by_author TINYINT(1), scratchie_uid bigint, session_uid bigint, order_id integer, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_610529188_F52D1F9330E79035 FOREIGN KEY (scratchie_uid) + REFERENCES tl_lascrt11_scratchie (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_610529188_F52D1F93EC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_lascrt11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lascrt11_scratchie_answer ( uid bigint not null auto_increment, description text, - correct tinyint, + correct TINYINT(1), scratchie_item_uid bigint, order_id integer, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_scratchie_answer_1 FOREIGN KEY (scratchie_item_uid) + REFERENCES tl_lascrt11_scratchie_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lascrt11_answer_log ( uid bigint not null auto_increment, access_date datetime, scratchie_answer_uid bigint, - user_uid bigint, session_id bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_lascrt11_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, - scratchie_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; -create table tl_lascrt11_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - scratching_finished smallint, - session_uid bigint, - scratchie_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -alter table tl_lascrt11_attachment add index FK_NEW_610529188_1E7009430E79035 (scratchie_uid), add constraint FK_NEW_610529188_1E7009430E79035 foreign key (scratchie_uid) references tl_lascrt11_scratchie (uid); -alter table tl_lascrt11_scratchie add index FK_NEW_610529188_89093BF758092FB (create_by), add constraint FK_NEW_610529188_89093BF758092FB foreign key (create_by) references tl_lascrt11_user (uid); -alter table tl_lascrt11_scratchie_item add index FK_NEW_610529188_F52D1F93758092FB (create_by), add constraint FK_NEW_610529188_F52D1F93758092FB foreign key (create_by) references tl_lascrt11_user (uid); -alter table tl_lascrt11_scratchie_item add index FK_NEW_610529188_F52D1F9330E79035 (scratchie_uid), add constraint FK_NEW_610529188_F52D1F9330E79035 foreign key (scratchie_uid) references tl_lascrt11_scratchie (uid); -alter table tl_lascrt11_scratchie_item add index FK_NEW_610529188_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_610529188_F52D1F93EC0D3147 foreign key (session_uid) references tl_lascrt11_session (uid); -alter table tl_lascrt11_answer_log add index FK_NEW_610529188_693580A438BF8DFE (scratchie_answer_uid), add constraint FK_NEW_610529188_693580A438BF8DFE foreign key (scratchie_answer_uid) references tl_lascrt11_scratchie_answer (uid); -alter table tl_lascrt11_answer_log add index FK_NEW_610529188_693580A441F9365D (user_uid), add constraint FK_NEW_610529188_693580A441F9365D foreign key (user_uid) references tl_lascrt11_user (uid); -alter table tl_lascrt11_session add index FK_NEW_610529188_24AA78C530E79035 (scratchie_uid), add constraint FK_NEW_610529188_24AA78C530E79035 foreign key (scratchie_uid) references tl_lascrt11_scratchie (uid); -alter table tl_lascrt11_user add index FK_NEW_610529188_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_610529188_30113BFCEC0D3147 foreign key (session_uid) references tl_lascrt11_session (uid); -alter table tl_lascrt11_user add index FK_NEW_610529188_30113BFC309ED320 (scratchie_uid), add constraint FK_NEW_610529188_30113BFC309ED320 foreign key (scratchie_uid) references tl_lascrt11_scratchie (uid); + primary key (uid), + UNIQUE KEY FK_NEW_lascrt11_30113BFC309ED321 (scratchie_answer_uid,session_id), + CONSTRAINT FK_NEW_610529188_693580A438BF8DFE FOREIGN KEY (scratchie_answer_uid) + REFERENCES tl_lascrt11_scratchie_answer (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT sessionIdIndex FOREIGN KEY (session_id) + REFERENCES tl_lascrt11_session (session_id) ON DELETE CASCADE ON UPDATE CASCADE +); + CREATE TABLE tl_lascrt11_burning_question ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + access_date datetime, + scratchie_item_uid bigint(20), + session_id bigint(20), + question mediumtext, + general_question tinyint(1), + PRIMARY KEY (uid), + CONSTRAINT FK_NEW_610529188_693580A438BF8DF2 FOREIGN KEY (scratchie_item_uid) + REFERENCES tl_lascrt11_scratchie_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT sessionIdIndex2 FOREIGN KEY (session_id) + REFERENCES tl_lascrt11_session (session_id) ON DELETE CASCADE ON UPDATE CASCADE +); +CREATE TABLE tl_lascrt11_burning_que_like ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + burning_question_uid bigint(20), + session_id bigint(20), + PRIMARY KEY (uid), + KEY FK_burning_que_uid (burning_question_uid), + CONSTRAINT FK_burning_que_uid FOREIGN KEY (burning_question_uid) + REFERENCES tl_lascrt11_burning_question (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -INSERT INTO `tl_lascrt11_scratchie` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, - `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `reflect_on_activity`, `extra_point`, `show_results_page`) VALUES - (1,NULL,NULL,NULL,'Scratchie','0','Scenario explanation ', null,null,0,0,${default_content_id},0, 0, 1); +CREATE TABLE tl_lascrt11_configuration ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + config_key varchar(30), + config_value varchar(255), + PRIMARY KEY (uid), + UNIQUE KEY config_key (config_key) +); -INSERT INTO `tl_lascrt11_scratchie_item` (`uid`, `title`, `description`, `create_by`, `create_date`, `create_by_author`, `scratchie_uid`, `session_uid`, `order_id`) VALUES - (1, 'Question Title','Question Description',null,NOW(),1,1,NULL, 1); + +ALTER TABLE tl_lascrt11_session ADD CONSTRAINT FK_lalead11_session1 FOREIGN KEY (group_leader_uid) + REFERENCES tl_lascrt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_lascrt11_scratchie (uid,title, + instructions, define_later, content_id, reflect_on_activity, extra_point) VALUES + (1,'Scratchie','Scenario explanation ',0,${default_content_id},0, 0); + +INSERT INTO tl_lascrt11_scratchie_item (uid, title, description, create_date, create_by_author, scratchie_uid, order_id) VALUES + (1, 'Question Title','Question Description',NOW(),1,1,1); -INSERT INTO `tl_lascrt11_scratchie_answer` (`uid`, `description`, `correct`, `scratchie_item_uid`, `order_id`) VALUES +INSERT INTO tl_lascrt11_scratchie_answer (uid, description, correct, scratchie_item_uid, order_id) VALUES (1, 'Question Answer A',1,1,0); -INSERT INTO `tl_lascrt11_scratchie_answer` (`uid`, `description`, `correct`, `scratchie_item_uid`, `order_id`) VALUES +INSERT INTO tl_lascrt11_scratchie_answer (uid, description, correct, scratchie_item_uid, order_id) VALUES (2, 'Question Answer B',0,1,1); -INSERT INTO `tl_lascrt11_scratchie_answer` (`uid`, `description`, `correct`, `scratchie_item_uid`, `order_id`) VALUES +INSERT INTO tl_lascrt11_scratchie_answer (uid, description, correct, scratchie_item_uid, order_id) VALUES (3, 'Question Answer C',0,1,2); -INSERT INTO `tl_lascrt11_scratchie_answer` (`uid`, `description`, `correct`, `scratchie_item_uid`, `order_id`) VALUES +INSERT INTO tl_lascrt11_scratchie_answer (uid, description, correct, scratchie_item_uid, order_id) VALUES (4, 'Question Answer D',0,1,3); -SET FOREIGN_KEY_CHECKS=1; + +INSERT INTO tl_lascrt11_configuration (config_key, config_value) VALUES + ('isEnabledExtraPointOption', 'true'); +INSERT INTO tl_lascrt11_configuration (config_key, config_value) VALUES + ('presetMarks', '4,2,1,0'); + +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_scratchie/db/sql/drop_lams_tool_scratchie.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/db/sql/drop_lams_tool_scratchie.sql,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_scratchie/db/sql/drop_lams_tool_scratchie.sql 19 Jul 2012 19:20:07 -0000 1.1 +++ lams_tool_scratchie/db/sql/drop_lams_tool_scratchie.sql 27 Feb 2017 14:00:15 -0000 1.1.4.1 @@ -1,14 +1,10 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lascrt11_attachment; -drop table if exists tl_lascrt11_item_instruction; drop table if exists tl_lascrt11_scratchie; drop table if exists tl_lascrt11_scratchie_item; -drop table if exists tl_lascrt11_item_log; drop table if exists tl_lascrt11_session; drop table if exists tl_lascrt11_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +drop table if exists tl_lascrt11_answer_log; +drop table if exists tl_lascrt11_burning_que_like; +drop table if exists tl_lascrt11_burning_question; +drop table if exists tl_lascrt11_configuration; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_scratchie/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_scratchie/db/sql/library_insert.sql 19 Jul 2012 19:20:07 -0000 1.1 +++ lams_tool_scratchie/db/sql/library_insert.sql 27 Feb 2017 14:00:15 -0000 1.1.4.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Scratchie', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_scratchie/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/db/sql/tool_insert.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_scratchie/db/sql/tool_insert.sql 24 Feb 2016 12:36:22 -0000 1.3.2.1 +++ lams_tool_scratchie/db/sql/tool_insert.sql 27 Feb 2017 14:00:15 -0000 1.3.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -26,6 +20,7 @@ language_file, create_date_time, modified_date_time, +admin_url, supports_outputs ) VALUES @@ -36,8 +31,6 @@ 'Scratchie', 'scratchie', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -52,5 +45,6 @@ 'org.lamsfoundation.lams.tool.scratchie.ApplicationResources', NOW(), NOW(), +'tool/lascrt11/admin/start.do', 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/build.properties,v diff -u -r1.15 -r1.15.2.1 --- lams_tool_scribe/build.properties 30 Jul 2012 18:53:22 -0000 1.15 +++ lams_tool_scribe/build.properties 27 Feb 2017 14:00:31 -0000 1.15.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lascrb11 -tool.version=20090226 +tool.version=20170101 tool.hide=false tool.short.name=scribe \ No newline at end of file Index: lams_tool_scribe/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/activity_insert.sql,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_scribe/db/sql/activity_insert.sql 11 May 2016 07:35:45 -0000 1.3.2.2 +++ lams_tool_scribe/db/sql/activity_insert.sql 27 Feb 2017 14:00:31 -0000 1.3.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Scribe Tool' , 'Scribe Tool' -, 'Scribe Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/lascrb11/images/icon_scribe.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.scribe.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_scribe/db/sql/create_lams_tool_scribe.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/create_lams_tool_scribe.sql,v diff -u -r1.12.2.1 -r1.12.2.2 --- lams_tool_scribe/db/sql/create_lams_tool_scribe.sql 11 May 2016 07:35:45 -0000 1.12.2.1 +++ lams_tool_scribe/db/sql/create_lams_tool_scribe.sql 27 Feb 2017 14:00:31 -0000 1.12.2.2 @@ -1,34 +1,88 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lascrb11_attachment; -drop table if exists tl_lascrb11_heading; -drop table if exists tl_lascrb11_report_entry; -drop table if exists tl_lascrb11_scribe; -drop table if exists tl_lascrb11_session; -drop table if exists tl_lascrb11_user; -create table tl_lascrb11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, scribe_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lascrb11_heading (uid bigint not null auto_increment, heading text, scribe_uid bigint, display_order integer, primary key (uid))ENGINE=InnoDB; -create table tl_lascrb11_report_entry (uid bigint not null auto_increment, entry_text text, scribe_heading_uid bigint, scribe_session_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lascrb11_scribe (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, auto_select_scribe bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, aggregated_reports bit default 0, primary key (uid))ENGINE=InnoDB; -create table tl_lascrb11_session (uid bigint not null auto_increment, version integer not null, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), scribe_uid bigint, appointed_scribe_uid bigint, force_complete bit, report_submitted bit, primary key (uid))ENGINE=InnoDB; -create table tl_lascrb11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, scribe_session_uid bigint, report_approved bit, started_activity bit, primary key (uid))ENGINE=InnoDB; -alter table tl_lascrb11_attachment add index FK57953706B3FA1495 (scribe_uid), add constraint FK57953706B3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); -alter table tl_lascrb11_heading add index FK428A22FFB3FA1495 (scribe_uid), add constraint FK428A22FFB3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); -alter table tl_lascrb11_report_entry add index FK5439FACAEA50D086 (scribe_heading_uid), add constraint FK5439FACAEA50D086 foreign key (scribe_heading_uid) references tl_lascrb11_heading (uid); -alter table tl_lascrb11_report_entry add index FK5439FACA1C266FAE (scribe_session_uid), add constraint FK5439FACA1C266FAE foreign key (scribe_session_uid) references tl_lascrb11_session (uid); -alter table tl_lascrb11_session add index FK89732793B3FA1495 (scribe_uid), add constraint FK89732793B3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); -alter table tl_lascrb11_session add index FK89732793E46919FF (appointed_scribe_uid), add constraint FK89732793E46919FF foreign key (appointed_scribe_uid) references tl_lascrb11_user (uid); -alter table tl_lascrb11_user add index FK187DAFEE1C266FAE (scribe_session_uid), add constraint FK187DAFEE1C266FAE foreign key (scribe_session_uid) references tl_lascrb11_session (uid); +CREATE TABLE tl_lascrb11_scribe ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + auto_select_scribe bit(1), + reflect_on_activity bit(1), + reflect_instructions mediumtext, + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + aggregated_reports bit(1) DEFAULT b'0', + PRIMARY KEY (uid) +); + +CREATE TABLE tl_lascrb11_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + version int(11) NOT NULL, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + scribe_uid bigint(20), + appointed_scribe_uid bigint(20), + force_complete bit(1), + report_submitted bit(1), + PRIMARY KEY (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK89732793B3FA1495 FOREIGN KEY (scribe_uid) + REFERENCES tl_lascrb11_scribe (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lascrb11_heading ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + heading mediumtext, + scribe_uid bigint(20), + display_order int(11), + PRIMARY KEY (uid), + CONSTRAINT FK428A22FFB3FA1495 FOREIGN KEY (scribe_uid) + REFERENCES tl_lascrb11_scribe (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lascrb11_report_entry ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + entry_text mediumtext, + scribe_heading_uid bigint(20), + scribe_session_uid bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK5439FACA1C266FAE FOREIGN KEY (scribe_session_uid) + REFERENCES tl_lascrb11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK5439FACAEA50D086 FOREIGN KEY (scribe_heading_uid) + REFERENCES tl_lascrb11_heading (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE tl_lascrb11_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + scribe_session_uid bigint(20), + report_approved bit(1), + started_activity bit(1), + PRIMARY KEY (uid), + CONSTRAINT FK187DAFEE1C266FAE FOREIGN KEY (scribe_session_uid) + REFERENCES tl_lascrb11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + + +ALTER TABLE tl_lascrb11_session ADD CONSTRAINT FK89732793E46919FF FOREIGN KEY (appointed_scribe_uid) + REFERENCES tl_lascrb11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + INSERT INTO tl_lascrb11_scribe ( uid, title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, @@ -39,10 +93,7 @@ 1, "Scribe", "Instructions", - "", - "", ${default_content_id}, - 0, 1, 0, 0, @@ -61,5 +112,4 @@ 0 ); - -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_scribe/db/sql/drop_lams_tool_scribe.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/drop_lams_tool_scribe.sql,v diff -u -r1.1.14.1 -r1.1.14.2 --- lams_tool_scribe/db/sql/drop_lams_tool_scribe.sql 11 May 2016 07:35:45 -0000 1.1.14.1 +++ lams_tool_scribe/db/sql/drop_lams_tool_scribe.sql 27 Feb 2017 14:00:31 -0000 1.1.14.2 @@ -1,13 +1,7 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lascrb11_user; -DROP TABLE IF EXISTS tl_lascrb11_attachment; +DROP TABLE IF EXISTS tl_lascrb11_heading; +DROP TABLE IF EXISTS tl_lascrb11_report_entry; DROP TABLE IF EXISTS tl_lascrb11_session; DROP TABLE IF EXISTS tl_lascrb11_scribe; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_scribe/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/library_insert.sql,v diff -u -r1.1.14.1 -r1.1.14.2 --- lams_tool_scribe/db/sql/library_insert.sql 11 May 2016 07:35:45 -0000 1.1.14.1 +++ lams_tool_scribe/db/sql/library_insert.sql 27 Feb 2017 14:00:31 -0000 1.1.14.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Scribe', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/make_activity_invalid.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/tool_insert.sql,v diff -u -r1.9.2.2 -r1.9.2.3 --- lams_tool_scribe/db/sql/tool_insert.sql 11 May 2016 07:35:45 -0000 1.9.2.2 +++ lams_tool_scribe/db/sql/tool_insert.sql 27 Feb 2017 14:00:31 -0000 1.9.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -33,8 +29,6 @@ 'Scribe', 'scribe', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -49,4 +43,4 @@ 'org.lamsfoundation.lams.tool.scribe.ApplicationResources', NOW(), NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/build.properties,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_spreadsheet/build.properties 30 Jul 2012 18:54:02 -0000 1.3 +++ lams_tool_spreadsheet/build.properties 27 Feb 2017 14:00:38 -0000 1.3.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=lasprd10 -tool.version=20080612 +tool.version=20170101 tool.hide=false tool.short.name=spreadsheet \ No newline at end of file Index: lams_tool_spreadsheet/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/activity_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_spreadsheet/db/sql/activity_insert.sql 16 Mar 2016 12:13:36 -0000 1.2.2.1 +++ lams_tool_spreadsheet/db/sql/activity_insert.sql 27 Feb 2017 14:00:38 -0000 1.2.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Spreadsheet' , 'Spreadsheet' -, 'Spreadsheet' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/lasprd10/images/icon_spreadsheet.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql 19 Feb 2012 20:24:17 -0000 1.3 +++ lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql 27 Feb 2017 14:00:38 -0000 1.3.2.1 @@ -1,88 +1,84 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lasprd10_attachment; -drop table if exists tl_lasprd10_spreadsheet; -drop table if exists tl_lasprd10_user_modified_spreadsheet; -drop table if exists tl_lasprd10_session; -drop table if exists tl_lasprd10_user; -create table tl_lasprd10_attachment ( + + +create table tl_lasprd10_spreadsheet_mark ( uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - spreadsheet_uid bigint, + marks FLOAT, + comments text, + date_marks_released datetime, primary key (uid) -)ENGINE=InnoDB; +); + create table tl_lasprd10_spreadsheet ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint, - is_learner_allowed_to_save tinyint, - is_marking_enabled tinyint, - lock_on_finished tinyint, + is_learner_allowed_to_save TINYINT(1), + is_marking_enabled TINYINT(1), + lock_on_finished TINYINT(1), instructions text, code text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - reflect_instructions varchar(255), - reflect_on_activity smallint, - primary key (uid) -)ENGINE=InnoDB; + content_in_use TINYINT(1), + define_later TINYINT(1), + content_id bigint, + reflect_instructions text, + reflect_on_activity TINYINT(1), + primary key (uid), + UNIQUE KEY content_id (content_id) +); + create table tl_lasprd10_user_modified_spreadsheet ( uid bigint not null auto_increment, user_modified_spreadsheet text, mark_id bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_lasprd10_spreadsheet_mark ( - uid bigint not null auto_increment, - marks varchar(255), - comments text, - date_marks_released datetime, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_tl_lasprd10_user_modified_spreadsheet_1 FOREIGN KEY (mark_id) + REFERENCES tl_lasprd10_spreadsheet_mark (uid) ON DELETE SET NULL ON UPDATE NO ACTION +); + create table tl_lasprd10_session ( uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, - status integer, + status TINYINT(1), spreadsheet_uid bigint, session_id bigint, session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_2065267438_24AA78C530E79035 FOREIGN KEY (spreadsheet_uid) + REFERENCES tl_lasprd10_spreadsheet (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lasprd10_user ( uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), - session_finished smallint, + session_finished TINYINT(1), session_uid bigint, spreadsheet_uid bigint, user_modified_spreadsheet_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -alter table tl_lasprd10_attachment add index FK_NEW_2065267438_1E7009430E79035 (spreadsheet_uid), add constraint FK_NEW_2065267438_1E7009430E79035 foreign key (spreadsheet_uid) references tl_lasprd10_spreadsheet (uid); -alter table tl_lasprd10_spreadsheet add index FK_NEW_2065267438_89093BF758092FB (create_by), add constraint FK_NEW_2065267438_89093BF758092FB foreign key (create_by) references tl_lasprd10_user (uid); -alter table tl_lasprd10_session add index FK_NEW_2065267438_24AA78C530E79035 (spreadsheet_uid), add constraint FK_NEW_2065267438_24AA78C530E79035 foreign key (spreadsheet_uid) references tl_lasprd10_spreadsheet (uid); -alter table tl_lasprd10_user add index FK_NEW_2065267438_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_2065267438_30113BFCEC0D3147 foreign key (session_uid) references tl_lasprd10_session (uid); -alter table tl_lasprd10_user add index FK_NEW_2065267438_30113BFC309ED320 (spreadsheet_uid), add constraint FK_NEW_2065267438_30113BFC309ED320 foreign key (spreadsheet_uid) references tl_lasprd10_spreadsheet (uid); -alter table tl_lasprd10_user add index FK_NEW_2065267438_693580A441F9365D (user_modified_spreadsheet_uid), add constraint FK_NEW_2065267438_693580A441F9365D foreign key (user_modified_spreadsheet_uid) references tl_lasprd10_user_modified_spreadsheet (uid); -alter table tl_lasprd10_user_modified_spreadsheet add index FK_tl_lasprd10_user_modified_spreadsheet_1 (mark_id), add constraint FK_tl_lasprd10_user_modified_spreadsheet_1 foreign key (mark_id) references tl_lasprd10_spreadsheet_mark (uid); + primary key (uid), + CONSTRAINT FK_NEW_2065267438_30113BFC309ED320 FOREIGN KEY (spreadsheet_uid) + REFERENCES tl_lasprd10_spreadsheet (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_2065267438_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_lasprd10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_2065267438_693580A441F9365D FOREIGN KEY (user_modified_spreadsheet_uid) + REFERENCES tl_lasprd10_user_modified_spreadsheet (uid) ON DELETE SET NULL ON UPDATE NO ACTION +); - -INSERT INTO `tl_lasprd10_spreadsheet` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `is_learner_allowed_to_save`, - `is_marking_enabled`, `lock_on_finished`, `instructions`, `code`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, - `content_id`, `reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'Spreadsheet','0','1','0','0','Instructions ','',null,null,0,0,${default_content_id},0); +ALTER TABLE tl_lasprd10_spreadsheet ADD CONSTRAINT FK_NEW_2065267438_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_lasprd10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_lasprd10_spreadsheet (uid, title, is_learner_allowed_to_save, + is_marking_enabled, lock_on_finished, instructions, code,content_in_use, define_later, + content_id, reflect_on_activity) VALUES + (1,'Spreadsheet','1','0','0','Instructions ','',0,0,${default_content_id},0); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_spreadsheet/db/sql/drop_lams_tool_spreadsheet.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/drop_lams_tool_spreadsheet.sql,v diff -u -r1.2 -r1.2.12.1 --- lams_tool_spreadsheet/db/sql/drop_lams_tool_spreadsheet.sql 11 Jul 2008 08:19:58 -0000 1.2 +++ lams_tool_spreadsheet/db/sql/drop_lams_tool_spreadsheet.sql 27 Feb 2017 14:00:38 -0000 1.2.12.1 @@ -1,13 +1,7 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lasprd10_attachment; drop table if exists tl_lasprd10_spreadsheet; drop table if exists tl_lasprd10_user_modified_spreadsheet; drop table if exists tl_lasprd10_spreadsheet_mark; drop table if exists tl_lasprd10_session; drop table if exists tl_lasprd10_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_spreadsheet/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_spreadsheet/db/sql/library_insert.sql 4 Jul 2008 07:40:26 -0000 1.1 +++ lams_tool_spreadsheet/db/sql/library_insert.sql 27 Feb 2017 14:00:38 -0000 1.1.12.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Spreadsheet', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_spreadsheet/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/tool_insert.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_spreadsheet/db/sql/tool_insert.sql 24 Feb 2016 12:35:42 -0000 1.3.2.1 +++ lams_tool_spreadsheet/db/sql/tool_insert.sql 27 Feb 2017 14:00:38 -0000 1.3.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +28,6 @@ 'Spreadsheet Tool', 'spreadsheet', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -49,4 +41,4 @@ 'org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources', NOW(), NOW() -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/build.properties,v diff -u -r1.15 -r1.15.2.1 --- lams_tool_survey/build.properties 30 Jul 2012 18:49:36 -0000 1.15 +++ lams_tool_survey/build.properties 27 Feb 2017 14:00:00 -0000 1.15.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0.3 +min.server.version.number=3.0 signature=lasurv11 -tool.version=20110406 +tool.version=20170101 tool.hide=false tool.short.name=survey \ No newline at end of file Index: lams_tool_survey/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/activity_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_survey/db/sql/activity_insert.sql 16 Mar 2016 12:13:40 -0000 1.5.2.1 +++ lams_tool_survey/db/sql/activity_insert.sql 27 Feb 2017 14:00:00 -0000 1.5.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Survey' , 'Survey' -, 'Survey' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 6 -, NULL -, NULL -, NULL -, NULL , 'tool/lasurv11/images/icon_survey.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.survey.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/create_lams_tool_survey.sql,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_survey/db/sql/create_lams_tool_survey.sql 19 Feb 2012 20:24:32 -0000 1.14 +++ lams_tool_survey/db/sql/create_lams_tool_survey.sql 27 Feb 2017 14:00:00 -0000 1.14.2.1 @@ -1,100 +1,97 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lasurv11_answer; -drop table if exists tl_lasurv11_attachment; -drop table if exists tl_lasurv11_option; -drop table if exists tl_lasurv11_question; -drop table if exists tl_lasurv11_session; -drop table if exists tl_lasurv11_survey; -drop table if exists tl_lasurv11_user; - create table tl_lasurv11_survey ( uid bigint not null auto_increment, title varchar(255), -run_offline smallint, -lock_on_finished smallint, +lock_on_finished TINYINT(1), instructions text, -online_instructions text, -offline_instructions text, submission_deadline datetime, -content_in_use smallint, -define_later smallint, -content_id bigint unique, -reflect_instructions varchar(255), -reflect_on_activity smallint, -show_questions_on_one_page smallint, +content_in_use TINYINT(1), +define_later TINYINT(1), +content_id bigint, +reflect_instructions text, +reflect_on_activity TINYINT(1), +show_questions_on_one_page TINYINT(1), create_date datetime, update_date datetime, create_by bigint, -answer_submit_notify tinyint DEFAULT 0, -primary key (uid) -)ENGINE=InnoDB; +answer_submit_notify TINYINT(1) DEFAULT 0, +show_other_users_answers tinyint(1) NOT NULL DEFAULT 0, +PRIMARY KEY (uid), +UNIQUE KEY content_id (content_id) +); - -create table tl_lasurv11_answer ( +create table tl_lasurv11_session ( uid bigint not null auto_increment, -question_uid bigint, -user_uid bigint, -answer_choices varchar(255), -udpate_date datetime, -answer_text text, -primary key (uid) -)ENGINE=InnoDB; +session_end_date datetime, +session_start_date datetime, +survey_uid bigint, +session_id bigint, +session_name varchar(250), +primary key (uid), +UNIQUE KEY session_id (session_id), +CONSTRAINT FKF08793B9D14146E5 FOREIGN KEY (survey_uid) + REFERENCES tl_lasurv11_survey (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -create table tl_lasurv11_attachment ( +create table tl_lasurv11_user ( uid bigint not null auto_increment, -file_version_id bigint, -file_type varchar(255), -file_name varchar(255), -file_uuid bigint, -create_date datetime, +user_id bigint, +last_name varchar(255), +first_name varchar(255), +login_name varchar(255), +session_uid bigint, survey_uid bigint, -primary key (uid) -)ENGINE=InnoDB; +session_finished TINYINT(1), +response_finalized tinyint(1) NOT NULL DEFAULT 0, +primary key (uid), +CONSTRAINT FK633F25884F803F63 FOREIGN KEY (session_uid) + REFERENCES tl_lasurv11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, +CONSTRAINT FK633F2588D14146E5 FOREIGN KEY (survey_uid) + REFERENCES tl_lasurv11_survey (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -create table tl_lasurv11_option ( -uid bigint not null auto_increment, -description text, -sequence_id integer, -question_uid bigint, -primary key (uid) -)ENGINE=InnoDB; - create table tl_lasurv11_question ( uid bigint not null auto_increment, sequence_id integer, description text, create_by bigint, create_date datetime, question_type smallint, -append_text smallint, -optional smallint, -allow_multiple_answer smallint, +append_text TINYINT(1), +optional TINYINT(1), +allow_multiple_answer TINYINT(1), survey_uid bigint, -primary key (uid) -)ENGINE=InnoDB; +primary key (uid), +CONSTRAINT FK872D4F23D14146E5 FOREIGN KEY (survey_uid) + REFERENCES tl_lasurv11_survey (uid) ON DELETE CASCADE ON UPDATE CASCADE, +CONSTRAINT FK872D4F23E4C99A5F FOREIGN KEY (create_by) + REFERENCES tl_lasurv11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); -create table tl_lasurv11_session ( +create table tl_lasurv11_answer ( uid bigint not null auto_increment, -session_end_date datetime, -session_start_date datetime, -survey_uid bigint, -session_id bigint, -session_name varchar(250), -primary key (uid) -)ENGINE=InnoDB; +question_uid bigint, +user_uid bigint, +answer_choices varchar(255), +udpate_date datetime, +answer_text text, +primary key (uid), +CONSTRAINT FK6DAAFE3B25F3BB77 FOREIGN KEY (question_uid) + REFERENCES tl_lasurv11_question (uid) ON DELETE CASCADE ON UPDATE CASCADE, +CONSTRAINT FK6DAAFE3BB1423DC1 FOREIGN KEY (user_uid) + REFERENCES tl_lasurv11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -create table tl_lasurv11_user ( +create table tl_lasurv11_option ( uid bigint not null auto_increment, -user_id bigint, -last_name varchar(255), -first_name varchar(255), -login_name varchar(255), -session_uid bigint, -survey_uid bigint, -session_finished smallint, -primary key (uid) -)ENGINE=InnoDB; +description text, +sequence_id integer, +question_uid bigint, +primary key (uid), +CONSTRAINT FK85AB46F26966134F FOREIGN KEY (question_uid) + REFERENCES tl_lasurv11_question (uid) ON DELETE CASCADE ON UPDATE CASCADE +); CREATE TABLE tl_lasurv11_conditions ( condition_id BIGINT(20) NOT NULL @@ -104,7 +101,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT SurveyConditionToSurvey FOREIGN KEY (content_uid) REFERENCES tl_lasurv11_survey(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); CREATE TABLE tl_lasurv11_condition_questions ( condition_id BIGINT(20) @@ -114,44 +111,37 @@ REFERENCES tl_lasurv11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT SurveyConditionQuestionToSurveyQuestion FOREIGN KEY (question_uid) REFERENCES tl_lasurv11_question(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; +); -alter table tl_lasurv11_answer add index FK6DAAFE3BB1423DC1 (user_uid), add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid); -alter table tl_lasurv11_answer add index FK6DAAFE3B25F3BB77 (question_uid), add constraint FK6DAAFE3B25F3BB77 foreign key (question_uid) references tl_lasurv11_question (uid); -alter table tl_lasurv11_attachment add index FKD92A9120D14146E5 (survey_uid), add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_option add index FK85AB46F26966134F (question_uid), add constraint FK85AB46F26966134F foreign key (question_uid) references tl_lasurv11_question (uid); -alter table tl_lasurv11_question add index FK872D4F23D14146E5 (survey_uid), add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_question add index FK872D4F23E4C99A5F (create_by), add constraint FK872D4F23E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); -alter table tl_lasurv11_session add index FKF08793B9D14146E5 (survey_uid), add constraint FKF08793B9D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); -alter table tl_lasurv11_survey add index FK8CC465D7E4C99A5F (create_by), add constraint FK8CC465D7E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid); -alter table tl_lasurv11_user add index FK633F25884F803F63 (session_uid), add constraint FK633F25884F803F63 foreign key (session_uid) references tl_lasurv11_session (uid); -alter table tl_lasurv11_user add index FK633F2588D14146E5 (survey_uid), add constraint FK633F2588D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid); - - -INSERT INTO `tl_lasurv11_survey` (`uid`, `create_date`, `update_date`, `create_by`, `title`, - `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, - `content_in_use`, `define_later`, `content_id`,`show_questions_on_one_page`,`reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'Survey','0','1','Instructions',null,null,0,0,${default_content_id},1,0); +ALTER TABLE tl_lasurv11_survey ADD CONSTRAINT FK8CC465D7E4C99A5F FOREIGN KEY (create_by) + REFERENCES tl_lasurv11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_lasurv11_survey (uid, title, + lock_on_finished, instructions, + content_in_use, define_later, content_id,show_questions_on_one_page,reflect_on_activity) VALUES + (1,'Survey','1','Instructions',0,0,${default_content_id},1,0); -INSERT INTO `tl_lasurv11_question` (`uid`, `sequence_id`, `description`, `create_by`, `create_date`, `question_type`, `append_text`, `optional`, `allow_multiple_answer`, `survey_uid`) VALUES - (1,1,'Sample Multiple choice - only one response allowed?',null,NOW(),1,0,0,0,1); -INSERT INTO `tl_lasurv11_question` (`uid`, `sequence_id`, `description`, `create_by`, `create_date`, `question_type`, `append_text`, `optional`, `allow_multiple_answer`, `survey_uid`) VALUES - (2,2,'Sample Multiple choice - multiple response allowed?',null,NOW(),2,0,0,1,1); -INSERT INTO `tl_lasurv11_question` (`uid`, `sequence_id`, `description`, `create_by`, `create_date`, `question_type`, `append_text`, `optional`, `allow_multiple_answer`, `survey_uid`) VALUES - (3,3,'Sample Free text question?',null,NOW(),3,0,0,0,1); +INSERT INTO tl_lasurv11_question (uid, sequence_id, description,create_date, question_type, append_text, optional, allow_multiple_answer, survey_uid) VALUES + (1,1,'Sample Multiple choice - only one response allowed?',NOW(),1,0,0,0,1); +INSERT INTO tl_lasurv11_question (uid, sequence_id, description,create_date, question_type, append_text, optional, allow_multiple_answer, survey_uid) VALUES + (2,2,'Sample Multiple choice - multiple response allowed?',NOW(),2,0,0,1,1); +INSERT INTO tl_lasurv11_question (uid, sequence_id, description, create_date, question_type, append_text, optional, allow_multiple_answer, survey_uid) VALUES + (3,3,'Sample Free text question?',NOW(),3,0,0,0,1); -INSERT INTO `tl_lasurv11_option` (`uid`, `description`, `sequence_id`, `question_uid`) VALUES +INSERT INTO tl_lasurv11_option (uid, description, sequence_id, question_uid) VALUES (1,'Option 1',0,1); -INSERT INTO `tl_lasurv11_option` (`uid`, `description`, `sequence_id`, `question_uid`) VALUES +INSERT INTO tl_lasurv11_option (uid, description, sequence_id, question_uid) VALUES (2,'Option 2',1,1); -INSERT INTO `tl_lasurv11_option` (`uid`, `description`, `sequence_id`, `question_uid`) VALUES +INSERT INTO tl_lasurv11_option (uid, description, sequence_id, question_uid) VALUES (3,'Option 3',2,1); -INSERT INTO `tl_lasurv11_option` (`uid`, `description`, `sequence_id`, `question_uid`) VALUES +INSERT INTO tl_lasurv11_option (uid, description, sequence_id, question_uid) VALUES (4,'Option 1',0,2); -INSERT INTO `tl_lasurv11_option` (`uid`, `description`, `sequence_id`, `question_uid`) VALUES +INSERT INTO tl_lasurv11_option (uid, description, sequence_id, question_uid) VALUES (5,'Option 2',1,2); -INSERT INTO `tl_lasurv11_option` (`uid`, `description`, `sequence_id`, `question_uid`) VALUES +INSERT INTO tl_lasurv11_option (uid, description, sequence_id, question_uid) VALUES (6,'Option 3',2,2); -SET FOREIGN_KEY_CHECKS=1; + +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_survey/db/sql/drop_lams_tool_survey.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/drop_lams_tool_survey.sql,v diff -u -r1.2 -r1.2.12.1 --- lams_tool_survey/db/sql/drop_lams_tool_survey.sql 22 Oct 2008 00:11:48 -0000 1.2 +++ lams_tool_survey/db/sql/drop_lams_tool_survey.sql 27 Feb 2017 14:00:00 -0000 1.2.12.1 @@ -1,16 +1,9 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lasurv11_attachment; -drop table if exists tl_lasurv11_item_instruction; drop table if exists tl_lasurv11_survey; -drop table if exists tl_lasurv11_survey_item; -drop table if exists tl_lasurv11_item_log; +drop table if exists tl_lasurv11_option; +drop table if exists tl_lasurv11_question; drop table if exists tl_lasurv11_session; drop table if exists tl_lasurv11_user; drop table if exists tl_lasurv11_condition_questions; drop table if exists tl_lasurv11_conditions; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_survey/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/library_insert.sql,v diff -u -r1.2 -r1.2.14.1 --- lams_tool_survey/db/sql/library_insert.sql 21 Sep 2006 07:46:41 -0000 1.2 +++ lams_tool_survey/db/sql/library_insert.sql 27 Feb 2017 14:00:00 -0000 1.2.14.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Survey', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `lams_tool_survey/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/tool_insert.sql,v diff -u -r1.12.2.1 -r1.12.2.2 --- lams_tool_survey/db/sql/tool_insert.sql 24 Feb 2016 12:35:29 -0000 1.12.2.1 +++ lams_tool_survey/db/sql/tool_insert.sql 27 Feb 2017 14:00:00 -0000 1.12.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -35,8 +29,6 @@ 'Survey', 'survey', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +43,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/build.properties,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_task/build.properties 30 Jul 2012 18:52:59 -0000 1.5 +++ lams_tool_task/build.properties 27 Feb 2017 14:00:10 -0000 1.5.2.1 @@ -1,7 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=latask10 -tool.version=20110510 +tool.version=20170101 tool.hide=false tool.short.name=taskList \ No newline at end of file Index: lams_tool_task/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/activity_insert.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_task/db/sql/activity_insert.sql 16 Mar 2016 12:12:48 -0000 1.2.2.1 +++ lams_tool_task/db/sql/activity_insert.sql 27 Feb 2017 14:00:10 -0000 1.2.2.2 @@ -1,78 +1,30 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 11:08:32 -# INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'TaskList' , 'TaskList' -, 'TaskList' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 4 -, NULL -, NULL -, NULL -, NULL , 'tool/latask10/images/icon_taskList.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.taskList.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/create_lams_tool_taskList.sql,v diff -u -r1.18 -r1.18.2.1 --- lams_tool_task/db/sql/create_lams_tool_taskList.sql 4 Feb 2014 23:22:19 -0000 1.18 +++ lams_tool_task/db/sql/create_lams_tool_taskList.sql 27 Feb 2017 14:00:10 -0000 1.18.2.1 @@ -1,59 +1,58 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_latask10_attachment; -drop table if exists tl_latask10_condition; -drop table if exists tl_latask10_condition_tl_item; -drop table if exists tl_latask10_tasklist; -drop table if exists tl_latask10_tasklist_item; -drop table if exists tl_latask10_tasklist_item_visit_log; -drop table if exists tl_latask10_item_attachment; -drop table if exists tl_latask10_item_comment; -drop table if exists tl_latask10_session; -drop table if exists tl_latask10_user; -create table tl_latask10_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - taskList_uid bigint, - primary key (uid) -)ENGINE=InnoDB; -create table tl_latask10_condition ( - condition_uid bigint not null auto_increment, - sequence_id integer, - taskList_uid bigint, - name varchar(255), - primary key (condition_uid) -)ENGINE=InnoDB; -create table tl_latask10_condition_tl_item ( - uid bigint not null, - condition_uid bigint not null, - primary key (uid, condition_uid) -)ENGINE=InnoDB; + create table tl_latask10_tasklist ( uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), - run_offline tinyint, instructions text, - online_instructions text, - offline_instructions text, - content_in_use tinyint, - define_later tinyint, - content_id bigint unique, - lock_when_finished tinyint, - is_sequential_order tinyint, + content_in_use TINYINT(1), + define_later TINYINT(1), + content_id bigint, + lock_when_finished TINYINT(1), + is_sequential_order TINYINT(1), minimum_number_tasks integer, - allow_contribute_tasks tinyint, - is_monitor_verification_required tinyint, - reflect_instructions varchar(255), - reflect_on_activity smallint, - submission_deadline datetime DEFAULT NULL, - primary key (uid) -)ENGINE=InnoDB; + allow_contribute_tasks TINYINT(1), + is_monitor_verification_required TINYINT(1), + reflect_instructions text, + reflect_on_activity TINYINT(1), + submission_deadline datetime, + primary key (uid), + UNIQUE KEY content_id (content_id) +); + +create table tl_latask10_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status TINYINT(1), + taskList_uid bigint, + session_id bigint, + session_name varchar(250), + primary key (uid), + UNIQUE KEY session_id (session_id), + CONSTRAINT FK_NEW_174079138_24AA78C530E79035 FOREIGN KEY (taskList_uid) + REFERENCES tl_latask10_tasklist (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_latask10_user ( + uid bigint not null auto_increment, + user_id bigint, + last_name varchar(255), + first_name varchar(255), + login_name varchar(255), + session_finished TINYINT(1), + session_uid bigint, + taskList_uid bigint, + is_verified_by_monitor TINYINT(1), + primary key (uid), + CONSTRAINT FK_NEW_174079138_30113BFC309ED320 FOREIGN KEY (taskList_uid) + REFERENCES tl_latask10_tasklist (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_174079138_30113BFCEC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_latask10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_latask10_tasklist_item ( uid bigint not null auto_increment, sequence_id integer, @@ -63,29 +62,41 @@ title varchar(255), create_by bigint, create_date datetime, - create_by_author tinyint, - is_required tinyint, - is_comments_allowed tinyint, - is_comments_required tinyint, - is_files_allowed tinyint, - is_files_required tinyint, - is_comments_files_allowed tinyint, - show_comments_to_all tinyint, - is_child_task tinyint, + create_by_author TINYINT(1), + is_required TINYINT(1), + is_comments_allowed TINYINT(1), + is_comments_required TINYINT(1), + is_files_allowed TINYINT(1), + is_files_required TINYINT(1), + is_comments_files_allowed TINYINT(1), + show_comments_to_all TINYINT(1), + is_child_task TINYINT(1), parent_task_name varchar(255), taskList_uid bigint, session_uid bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_174079138_F52D1F9330E79035 FOREIGN KEY (taskList_uid) + REFERENCES tl_latask10_tasklist (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_174079138_F52D1F93758092FB FOREIGN KEY (create_by) + REFERENCES tl_latask10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, + CONSTRAINT FK_NEW_174079138_F52D1F93EC0D3147 FOREIGN KEY (session_uid) + REFERENCES tl_latask10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_latask10_item_log ( uid bigint not null auto_increment, access_date datetime, taskList_item_uid bigint, user_uid bigint, - complete tinyint, + complete TINYINT(1), session_id bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_NEW_174079138_693580A438BF8DFE FOREIGN KEY (taskList_item_uid) + REFERENCES tl_latask10_tasklist_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_NEW_174079138_693580A441F9365D FOREIGN KEY (user_uid) + REFERENCES tl_latask10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_latask10_item_attachment ( uid bigint not null auto_increment, file_version_id bigint, @@ -95,65 +106,58 @@ create_date datetime, taskList_item_uid bigint, create_by bigint, - primary key (uid) -)ENGINE=InnoDB; + primary key (uid), + CONSTRAINT FK_tl_latask10_item_attachment_1 FOREIGN KEY (taskList_item_uid) + REFERENCES tl_latask10_tasklist_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_latask10_item_attachment_2 FOREIGN KEY (create_by) + REFERENCES tl_latask10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); + create table tl_latask10_item_comment ( uid bigint not null auto_increment, comment text, taskList_item_uid bigint, create_by bigint, create_date datetime, - primary key (uid) -)ENGINE=InnoDB; -create table tl_latask10_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, + primary key (uid), + CONSTRAINT FK_tl_latask10_item_comment_2 FOREIGN KEY (create_by) + REFERENCES tl_latask10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_latask10_item_comment_3 FOREIGN KEY (taskList_item_uid) + REFERENCES tl_latask10_tasklist_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + +create table tl_latask10_condition ( + condition_uid bigint not null auto_increment, + sequence_id integer, taskList_uid bigint, - session_id bigint, - session_name varchar(250), - primary key (uid) -)ENGINE=InnoDB; -create table tl_latask10_user ( - uid bigint not null auto_increment, - user_id bigint, - last_name varchar(255), - first_name varchar(255), - login_name varchar(255), - session_finished smallint, - session_uid bigint, - taskList_uid bigint, - is_verified_by_monitor tinyint, - primary key (uid) -)ENGINE=InnoDB; -alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_tasklist (uid); -alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_tasklist (uid); -alter table tl_latask10_condition_tl_item add index FK_tl_latask10_tasklist_item_condition_1 (condition_uid), add constraint FK_tl_latask10_tasklist_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid); -alter table tl_latask10_condition_tl_item add index FK_tl_latask10_tasklist_item_condition_2 (uid), add constraint FK_tl_latask10_tasklist_item_condition_2 foreign key (uid) references tl_latask10_tasklist_item (uid); -alter table tl_latask10_tasklist add index FK_NEW_174079138_89093BF758092FB (create_by), add constraint FK_NEW_174079138_89093BF758092FB foreign key (create_by) references tl_latask10_user (uid); -alter table tl_latask10_tasklist_item add index FK_NEW_174079138_F52D1F93758092FB (create_by), add constraint FK_NEW_174079138_F52D1F93758092FB foreign key (create_by) references tl_latask10_user (uid); -alter table tl_latask10_tasklist_item add index FK_NEW_174079138_F52D1F9330E79035 (taskList_uid), add constraint FK_NEW_174079138_F52D1F9330E79035 foreign key (taskList_uid) references tl_latask10_tasklist (uid); -alter table tl_latask10_tasklist_item add index FK_NEW_174079138_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_174079138_F52D1F93EC0D3147 foreign key (session_uid) references tl_latask10_session (uid); -alter table tl_latask10_item_log add index FK_NEW_174079138_693580A438BF8DFE (taskList_item_uid), add constraint FK_NEW_174079138_693580A438BF8DFE foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid); -alter table tl_latask10_item_log add index FK_NEW_174079138_693580A441F9365D (user_uid), add constraint FK_NEW_174079138_693580A441F9365D foreign key (user_uid) references tl_latask10_user (uid); -alter table tl_latask10_item_attachment add index FK_tl_latask10_item_attachment_1 (taskList_item_uid), add constraint FK_tl_latask10_item_attachment_1 foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid); -alter table tl_latask10_item_attachment add index FK_tl_latask10_item_attachment_2 (create_by), add constraint FK_tl_latask10_item_attachment_2 foreign key (create_by) references tl_latask10_user (uid); -alter table tl_latask10_item_comment add index FK_tl_latask10_item_comment_3 (taskList_item_uid), add constraint FK_tl_latask10_item_comment_3 foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid); -alter table tl_latask10_item_comment add index FK_tl_latask10_item_comment_2 (create_by), add constraint FK_tl_latask10_item_comment_2 foreign key (create_by) references tl_latask10_user (uid); -alter table tl_latask10_session add index FK_NEW_174079138_24AA78C530E79035 (taskList_uid), add constraint FK_NEW_174079138_24AA78C530E79035 foreign key (taskList_uid) references tl_latask10_tasklist (uid); -alter table tl_latask10_user add index FK_NEW_174079138_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_174079138_30113BFCEC0D3147 foreign key (session_uid) references tl_latask10_session (uid); -alter table tl_latask10_user add index FK_NEW_174079138_30113BFC309ED320 (taskList_uid), add constraint FK_NEW_174079138_30113BFC309ED320 foreign key (taskList_uid) references tl_latask10_tasklist (uid); + name varchar(255), + primary key (condition_uid), + CONSTRAINT FK_tl_latask10_condition_1 FOREIGN KEY (taskList_uid) + REFERENCES tl_latask10_tasklist (uid) ON DELETE CASCADE ON UPDATE CASCADE +); +create table tl_latask10_condition_tl_item ( + uid bigint not null, + condition_uid bigint not null, + primary key (uid, condition_uid), + CONSTRAINT FK_tl_latask10_tasklist_item_condition_1 FOREIGN KEY (condition_uid) + REFERENCES tl_latask10_condition (condition_uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_tl_latask10_tasklist_item_condition_2 FOREIGN KEY (uid) + REFERENCES tl_latask10_tasklist_item (uid) ON DELETE CASCADE ON UPDATE CASCADE +); -INSERT INTO `tl_latask10_tasklist` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `instructions`, - `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `lock_when_finished`, - `minimum_number_tasks`, `is_sequential_order`, `allow_contribute_tasks`, `is_monitor_verification_required`, - `reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'Task List','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0); +ALTER TABLE tl_latask10_tasklist ADD CONSTRAINT FK_NEW_174079138_89093BF758092FB FOREIGN KEY (create_by) + REFERENCES tl_latask10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + +INSERT INTO tl_latask10_tasklist (uid, title,instructions, + content_in_use, define_later, content_id, lock_when_finished, + minimum_number_tasks, is_sequential_order, allow_contribute_tasks, is_monitor_verification_required, + reflect_on_activity) VALUES + (1,'Task List','Instructions ',0,0,${default_content_id},0,0,0,0,0,0); -INSERT INTO `tl_latask10_tasklist_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_required`, `is_comments_allowed`, `is_comments_required`, `is_files_allowed`, `is_files_required`, `is_comments_files_allowed`, `show_comments_to_all`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES - (1,1,NULL,NULL,NULL,'Task number 1',null,NOW(),1,0,0,0,0,0,0,1,0,NULL,1,NULL); +INSERT INTO tl_latask10_tasklist_item (uid, sequence_id, title, create_date, create_by_author, is_required, is_comments_allowed, is_comments_required, is_files_allowed, is_files_required, is_comments_files_allowed, show_comments_to_all, is_child_task, taskList_uid) VALUES + (1,1,'Task number 1',NOW(),1,0,0,0,0,0,0,1,0,1); -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_task/db/sql/drop_lams_tool_taskList.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/drop_lams_tool_taskList.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_task/db/sql/drop_lams_tool_taskList.sql 4 Feb 2014 23:22:19 -0000 1.3 +++ lams_tool_task/db/sql/drop_lams_tool_taskList.sql 27 Feb 2017 14:00:10 -0000 1.3.2.1 @@ -1,15 +1,11 @@ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_latask10_attachment; +drop table if exists tl_latask10_condition; +drop table if exists tl_latask10_condition_tl_item; drop table if exists tl_latask10_tasklist; drop table if exists tl_latask10_tasklist_item; drop table if exists tl_latask10_item_log; drop table if exists tl_latask10_item_attachment; drop table if exists tl_latask10_item_comment; drop table if exists tl_latask10_session; drop table if exists tl_latask10_user; -SET FOREIGN_KEY_CHECKS=1; - - - - - +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_task/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/library_insert.sql,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_task/db/sql/library_insert.sql 28 Feb 2008 03:50:17 -0000 1.1 +++ lams_tool_task/db/sql/library_insert.sql 27 Feb 2017 14:00:10 -0000 1.1.12.1 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:50:55 -# INSERT INTO lams_learning_library ( description, @@ -15,4 +11,4 @@ 'Share taskList', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.12.2.1 refers to a dead (removed) revision in file `lams_tool_task/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/tool_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_task/db/sql/tool_insert.sql 24 Feb 2016 12:35:20 -0000 1.5.2.1 +++ lams_tool_task/db/sql/tool_insert.sql 27 Feb 2017 14:00:10 -0000 1.5.2.2 @@ -1,7 +1,3 @@ -# Connection: ROOT LOCAL -# Host: localhost -# Saved: 2005-04-07 10:42:43 -# INSERT INTO lams_tool ( tool_signature, @@ -10,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -36,8 +30,6 @@ 'Shared TaskList', 'sharedtaskList', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -53,4 +45,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/build.properties,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_wiki/build.properties 21 Sep 2016 08:16:13 -0000 1.5.2.1 +++ lams_tool_wiki/build.properties 27 Feb 2017 14:00:30 -0000 1.5.2.2 @@ -1,8 +1,7 @@ # Minimum compatible version of server -min.server.version.number=2.0 +min.server.version.number=3.0 signature=lawiki10 -tool.version=20120315 -tool.version=20160919 +tool.version=20170101 tool.hide=false tool.short.name=wiki \ No newline at end of file Index: lams_tool_wiki/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/activity_insert.sql,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_wiki/db/sql/activity_insert.sql 11 May 2016 07:37:41 -0000 1.3.2.2 +++ lams_tool_wiki/db/sql/activity_insert.sql 27 Feb 2017 14:00:30 -0000 1.3.2.3 @@ -1,76 +1,30 @@ - - INSERT INTO lams_learning_activity ( -activity_ui_id -, description + description , title , help_text -, xcoord -, ycoord -, parent_activity_id -, parent_ui_id , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag -, grouping_id -, grouping_ui_id -, order_id -, define_later_flag -, learning_design_id , learning_library_id , create_date_time -, run_offline_flag -, max_number_of_options -, min_number_of_options -, options_instructions , tool_id -, tool_content_id , activity_category_id -, gate_activity_level_id -, gate_open_flag -, gate_start_time_offset -, gate_end_time_offset , library_activity_ui_image -, create_grouping_id -, create_grouping_ui_id -, library_activity_id , language_file ) VALUES ( -NULL + 'Wiki Tool' , 'Wiki Tool' -, 'Wiki Tool' , 'Put some help text here.' -, NULL -, NULL -, NULL -, NULL , 1 , 2 , 0 -, NULL -, NULL -, NULL -, 0 -, NULL , ${learning_library_id} , NOW() -, 0 -, NULL -, NULL -, NULL , ${tool_id} -, NULL , 2 -, NULL -, NULL -, NULL -, NULL , 'tool/lawiki10/images/icon_wiki.svg' -, NULL -, NULL -, NULL , 'org.lamsfoundation.lams.tool.wiki.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_wiki/db/sql/create_lams_tool_wiki.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/create_lams_tool_wiki.sql,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_wiki/db/sql/create_lams_tool_wiki.sql 21 Sep 2016 08:07:00 -0000 1.11.2.2 +++ lams_tool_wiki/db/sql/create_lams_tool_wiki.sql 27 Feb 2017 14:00:30 -0000 1.11.2.3 @@ -1,16 +1,59 @@ - - SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_lawiki10_attachment; -drop table if exists tl_lawiki10_session; -drop table if exists tl_lawiki10_user; -drop table if exists tl_lawiki10_wiki; -drop table if exists tl_lawiki10_wiki_page; -drop table if exists tl_lawiki10_wiki_page_content; -create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid))ENGINE=InnoDB; -create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid))ENGINE=InnoDB; -create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid))ENGINE=InnoDB; -create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint,submission_deadline datetime default null, primary key (uid))ENGINE=InnoDB; + +CREATE TABLE tl_lawiki10_wiki ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + create_date datetime, + update_date datetime, + create_by bigint(20), + title varchar(255), + instructions mediumtext, + lock_on_finished bit(1), + allow_learner_create_pages bit(1), + allow_learner_insert_links bit(1), + allow_learner_attach_images bit(1), + notify_updates bit(1), + reflect_on_activity bit(1), + reflect_instructions mediumtext, + minimum_edits int(11), + maximum_edits int(11), + content_in_use bit(1), + define_later bit(1), + tool_content_id bigint(20), + wiki_main_page_uid bigint(20), + submission_deadline datetime, + PRIMARY KEY (uid) +); + +CREATE TABLE tl_lawiki10_session ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + session_end_date datetime, + session_start_date datetime, + status int(11), + session_id bigint(20), + session_name varchar(250), + wiki_uid bigint(20), + wiki_main_page_uid bigint(20), + PRIMARY KEY (uid), + UNIQUE KEY (session_id), + CONSTRAINT FKF01D63C260B3B03B FOREIGN KEY (wiki_uid) + REFERENCES tl_lawiki10_wiki (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + + CREATE TABLE tl_lawiki10_user ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + user_id bigint(20), + last_name varchar(255), + login_name varchar(255), + first_name varchar(255), + finishedActivity bit(1), + wiki_session_uid bigint(20), + entry_uid bigint(20), + wiki_edits int(11), + PRIMARY KEY (uid), + CONSTRAINT FKED5D7A1FD8004954 FOREIGN KEY (wiki_session_uid) + REFERENCES tl_lawiki10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE +); + create table tl_lawiki10_wiki_page ( uid bigint not null auto_increment, wiki_uid bigint, @@ -21,33 +64,43 @@ added_by bigint, wiki_session_uid bigint, primary key (uid), - unique key wiki_unique_key (wiki_uid, title, wiki_session_uid) -)ENGINE=InnoDB; + unique key wiki_unique_key (wiki_uid, title, wiki_session_uid), + CONSTRAINT wiki_page_fk_1 FOREIGN KEY (wiki_session_uid) + REFERENCES tl_lawiki10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT wiki_page_fk_2 FOREIGN KEY (wiki_uid) + REFERENCES tl_lawiki10_wiki (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT wiki_page_fk_3 FOREIGN KEY (added_by) + REFERENCES tl_lawiki10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); -create table tl_lawiki10_wiki_page_content (uid bigint not null auto_increment, wiki_page_uid bigint, body text, editor bigint, edit_date datetime, version bigint, primary key (uid))ENGINE=InnoDB; +CREATE TABLE tl_lawiki10_wiki_page_content ( + uid bigint(20) NOT NULL AUTO_INCREMENT, + wiki_page_uid bigint(20), + body mediumtext, + editor bigint(20), + edit_date datetime, + version bigint(20), + PRIMARY KEY (uid), + CONSTRAINT FK528051242D44CCF8 FOREIGN KEY (wiki_page_uid) + REFERENCES tl_lawiki10_wiki_page (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK528051243233D952 FOREIGN KEY (editor) + REFERENCES tl_lawiki10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE +); - -alter table tl_lawiki10_attachment add index FK9406D87760B3B03B (wiki_uid), add constraint FK9406D87760B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid); -alter table tl_lawiki10_session add index FKF01D63C260B3B03B (wiki_uid), add constraint FKF01D63C260B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid); -alter table tl_lawiki10_session add index FKF01D63C2A3FF7EC0 (wiki_main_page_uid), add constraint FKF01D63C2A3FF7EC0 foreign key (wiki_main_page_uid) references tl_lawiki10_wiki_page (uid); -alter table tl_lawiki10_user add index FKED5D7A1FD8004954 (wiki_session_uid), add constraint FKED5D7A1FD8004954 foreign key (wiki_session_uid) references tl_lawiki10_session (uid); -alter table tl_lawiki10_wiki add index FKED5E3E04A3FF7EC0 (wiki_main_page_uid), add constraint FKED5E3E04A3FF7EC0 foreign key (wiki_main_page_uid) references tl_lawiki10_wiki_page (uid); -alter table tl_lawiki10_wiki_page add index wiki_page_index_1 (wiki_session_uid), add constraint wiki_page_fk_1 foreign key (wiki_session_uid) references tl_lawiki10_session (uid); -alter table tl_lawiki10_wiki_page add index wiki_page_index_2 (wiki_uid), add constraint wiki_page_fk_2 foreign key (wiki_uid) references tl_lawiki10_wiki (uid); -alter table tl_lawiki10_wiki_page add index wiki_page_index_3 (added_by), add constraint wiki_page_fk_3 foreign key (added_by) references tl_lawiki10_user (uid); -alter table tl_lawiki10_wiki_page add index wiki_page_index_4 (wiki_current_content), add constraint wiki_page_fk_4 foreign key (wiki_current_content) references tl_lawiki10_wiki_page_content (uid); -alter table tl_lawiki10_wiki_page_content add index FK528051242D44CCF8 (wiki_page_uid), add constraint FK528051242D44CCF8 foreign key (wiki_page_uid) references tl_lawiki10_wiki_page (uid); -alter table tl_lawiki10_wiki_page_content add index FK528051243233D952 (editor), add constraint FK528051243233D952 foreign key (editor) references tl_lawiki10_user (uid); - +ALTER TABLE tl_lawiki10_wiki ADD CONSTRAINT FKED5E3E04A3FF7EC0 FOREIGN KEY (wiki_main_page_uid) + REFERENCES tl_lawiki10_wiki_page (uid) ON DELETE SET NULL ON UPDATE CASCADE; +ALTER TABLE tl_lawiki10_session ADD CONSTRAINT FKF01D63C2A3FF7EC0 FOREIGN KEY (wiki_main_page_uid) + REFERENCES tl_lawiki10_wiki_page (uid) ON DELETE SET NULL ON UPDATE CASCADE; +ALTER TABLE tl_lawiki10_wiki_page ADD CONSTRAINT wiki_page_fk_4 FOREIGN KEY (wiki_current_content) + REFERENCES tl_lawiki10_wiki_page_content (uid) ON DELETE SET NULL ON UPDATE CASCADE; + + INSERT INTO tl_lawiki10_wiki ( title, instructions, - online_instructions, - offline_instructions, tool_content_id, - run_offline, lock_on_finished, content_in_use, define_later, @@ -64,13 +117,10 @@ ( "Wiki", "Instructions", - "", - "", ${default_content_id}, 0, 0, 0, - 0, 1, 1, 1, @@ -111,4 +161,4 @@ UPDATE tl_lawiki10_wiki SET wiki_main_page_uid=1 where uid=1; -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_wiki/db/sql/drop_lams_tool_wiki.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/drop_lams_tool_wiki.sql,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_wiki/db/sql/drop_lams_tool_wiki.sql 11 May 2016 07:37:41 -0000 1.1.12.1 +++ lams_tool_wiki/db/sql/drop_lams_tool_wiki.sql 27 Feb 2017 14:00:30 -0000 1.1.12.2 @@ -1,13 +1,8 @@ - - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lawiki10_user; DROP TABLE IF EXISTS tl_lawiki10_attachment; DROP TABLE IF EXISTS tl_lawiki10_session; DROP TABLE IF EXISTS tl_lawiki10_wiki; -SET FOREIGN_KEY_CHECKS=1; - - - - - +DROP TABLE IF EXISTS tl_lawiki10_wiki_page; +DROP TABLE IF EXISTS tl_lawiki10_wiki_page_content; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_wiki/db/sql/library_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/library_insert.sql,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_wiki/db/sql/library_insert.sql 11 May 2016 07:37:41 -0000 1.1.12.1 +++ lams_tool_wiki/db/sql/library_insert.sql 27 Feb 2017 14:00:30 -0000 1.1.12.2 @@ -1,5 +1,3 @@ - - INSERT INTO lams_learning_library ( description, @@ -13,4 +11,4 @@ 'Wiki', 0, NOW() -) +) \ No newline at end of file Fisheye: Tag 1.5.12.2 refers to a dead (removed) revision in file `lams_tool_wiki/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/tool_insert.sql,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_wiki/db/sql/tool_insert.sql 11 May 2016 07:37:41 -0000 1.5.2.2 +++ lams_tool_wiki/db/sql/tool_insert.sql 27 Feb 2017 14:00:30 -0000 1.5.2.3 @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -8,8 +6,6 @@ description, tool_identifier, tool_version, -learning_library_id, -default_tool_content_id, valid_flag, grouping_support_type_id, supports_run_offline_flag, @@ -34,8 +30,6 @@ 'Wiki', 'wiki', '@tool_version@', -NULL, -NULL, 0, 2, 1, @@ -51,4 +45,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff?