Index: lams_tool_assessment/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_assessment/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=laasse10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=assessment Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql (.../create_lams_tool_assessment.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql (.../create_lams_tool_assessment.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -10,11 +10,12 @@ time_limit integer DEFAULT 0, attempts_allowed integer DEFAULT 1, passing_mark integer DEFAULT 0, - instructions text, + instructions MEDIUMTEXT, define_later tinyint(1), content_id bigint, allow_question_feedback tinyint(1), allow_overall_feedback tinyint(1), + allow_disclose_answers TINYINT(1) DEFAULT 0, allow_right_answers tinyint(1), allow_wrong_answers tinyint(1), allow_grades_after_attempt tinyint(1), @@ -24,9 +25,10 @@ shuffled tinyint(1), attempt_completion_notify tinyint(1) DEFAULT 0, reflect_on_activity bit(1) DEFAULT 0, - reflect_instructions mediumtext, + reflect_instructions MEDIUMTEXT, numbered tinyint(1) DEFAULT 1, use_select_leader_tool_ouput tinyint(1) NOT NULL DEFAULT 0, + enable_confidence_levels TINYINT(1) NOT NULL DEFAULT 0, PRIMARY KEY (uid), UNIQUE KEY content_id (content_id) ); @@ -67,34 +69,34 @@ uid bigint not null auto_increment, question_type smallint, title varchar(255), - question text, + question MEDIUMTEXT, sequence_id integer, default_grade integer DEFAULT 1, penalty_factor float DEFAULT 0, - general_feedback text, - feedback text, + general_feedback MEDIUMTEXT, + feedback MEDIUMTEXT, multiple_answers_allowed tinyint DEFAULT 0, - feedback_on_correct text, - feedback_on_partially_correct text, - feedback_on_incorrect text, + feedback_on_correct MEDIUMTEXT, + feedback_on_partially_correct MEDIUMTEXT, + feedback_on_incorrect MEDIUMTEXT, 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, 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, + question_hash CHAR(40), + correct_answers_disclosed TINYINT(1) DEFAULT 0, + groups_answers_disclosed TINYINT(1) DEFAULT 0, + prefix_answers_with_letters 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 ); @@ -119,12 +121,12 @@ uid bigint not null unique auto_increment, question_uid bigint, sequence_id integer, - question text, - option_string text, + question MEDIUMTEXT, + option_string MEDIUMTEXT, option_float float, accepted_error float, grade float, - feedback text, + feedback MEDIUMTEXT, correct tinyint(1) NOT NULL DEFAULT 0, primary key (uid), CONSTRAINT FK_tl_laasse10_question_option_1 FOREIGN KEY (question_uid) @@ -136,7 +138,7 @@ assessment_uid bigint, sequence_id integer, grade_boundary integer, - feedback text, + feedback MEDIUMTEXT, 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 @@ -161,9 +163,10 @@ session_id bigint, maximum_grade integer, grade float, - latest tinyint(1) DEFAULT 0, + latest tinyint(1) DEFAULT NULL, time_limit_launched_date datetime, primary key (uid), + UNIQUE KEY `UQ_tl_laasse10_assessment_result_5` (`assessment_uid`,`user_uid`,`latest`), 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) @@ -174,14 +177,15 @@ uid bigint not null auto_increment, assessment_question_uid bigint, result_uid bigint, - answer_string text, + answer_string MEDIUMTEXT, answer_float float, answer_boolean tinyint(1), submitted_option_uid bigint, mark float, penalty float, finish_date datetime, max_mark float, + confidence_level INT(11) NOT NULL DEFAULT 0, 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, Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130216.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20131118.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140101.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140428.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140612.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140707.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150706.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150928.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20151204.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20161130.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,208 @@ +-- SQL statements to update to LAMS 2.3.6 + +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; + +----------------------Put all sql statements below here------------------------- + +-- patch20130216.sql +-- LDEV-2953 Add notebook option after learners finish Assessment +ALTER TABLE tl_laasse10_assessment ADD COLUMN reflect_on_activity BIT DEFAULT false; +ALTER TABLE tl_laasse10_assessment ADD COLUMN reflect_instructions TEXT; + +-- patch20130611.sql +-- LDEV-3048 Make question numbering optional +ALTER TABLE tl_laasse10_assessment ADD COLUMN numbered tinyint DEFAULT true; + +-- patch20131118.sql +-- LDEV-3151 Display max mark correctly for question +ALTER TABLE tl_laasse10_question_result ADD COLUMN max_mark FLOAT; + +-- patch20140101.sql +-- LDEV-3155 adding all the leader aware tools (lamc,assessment,qa) to regular LAMS +ALTER TABLE tl_laasse10_assessment ADD COLUMN use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE tl_laasse10_session ADD COLUMN group_leader_uid BIGINT; +ALTER TABLE tl_laasse10_session ADD INDEX FK_laasse10_session_1 (group_leader_uid), ADD CONSTRAINT tl_laasse10_session FOREIGN KEY (group_leader_uid) REFERENCES tl_laasse10_user (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +-- Adding a constraint to the assessment user table so no same user_id and session_id can be repetead +-- (Please, note there are some duplicate users exist (their session_uid is null), they got formed when techers created questions in authoring. It's required to keep track of questions' authors.) +ALTER TABLE tl_laasse10_user ADD UNIQUE INDEX(user_id, session_uid); + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_laasse10_assessment DROP COLUMN online_instructions; +ALTER TABLE tl_laasse10_assessment DROP COLUMN offline_instructions; +ALTER TABLE tl_laasse10_assessment DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_laasse10_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laasse10'; + +-- patch20140428.sql +-- LDEV-3224 Ability to change, add, remove questions even after student have reached it +ALTER TABLE tl_laasse10_assessment DROP COLUMN content_in_use; + +UPDATE lams_tool SET tool_version='20140428' WHERE tool_signature='laasse10'; + +-- patch20140612.sql +-- LDEV-3249 Removing old redundant question answers that had left from the times when autopatch created new question answers on each save +DELETE tl_laasse10_option_answer.* FROM tl_laasse10_question_result, tl_laasse10_option_answer + WHERE tl_laasse10_question_result.uid = tl_laasse10_option_answer.question_result_uid + AND tl_laasse10_question_result.result_uid IS NULL; +DELETE FROM tl_laasse10_question_result where result_uid IS NULL; + +-- patch20140707.sql +-- LDEV-3265 Ability to set questions required to be answered +ALTER TABLE tl_laasse10_assessment_question ADD COLUMN answer_required TINYINT(1) NOT NULL DEFAULT 0; + +-- LDEV-3263 Add support for renaming field names on sequence import +UPDATE lams_tool SET tool_version='20140707' WHERE tool_signature='laasse10'; + +-- patch20140723.sql +-- LDEV- +ALTER TABLE tl_laasse10_assessment_question ADD COLUMN max_words_limit integer DEFAULT 0; +ALTER TABLE tl_laasse10_assessment_question ADD COLUMN min_words_limit integer DEFAULT 0; + +-- patch20150629.sql +-- LDEV-3489 New question type for marks hedging +ALTER TABLE tl_laasse10_question_option ADD COLUMN correct TINYINT(1) NOT NULL DEFAULT 0; + +-- patch20150706.sql +-- LDEV-3492 Change behaviour results in MCQ question type with multiple answers in assessment +ALTER TABLE tl_laasse10_assessment_question ADD COLUMN incorrect_answer_nullifies_mark TINYINT(1) NOT NULL DEFAULT 0; + +-- patch20150731.sql +-- LDEV-3522 Add justification textareas to the hedging marks question type +ALTER TABLE tl_laasse10_assessment_question ADD COLUMN hedging_justification_enabled TINYINT(1) NOT NULL DEFAULT 0; + +-- patch20150928.sql +-- LDEV-3564 session_id must be unique +ALTER TABLE tl_laasse10_session ADD UNIQUE (session_id); + +-- patch20151204.sql +-- LDEV-3627 Improve Assessment tool's monitor paging +ALTER TABLE tl_laasse10_assessment_result ADD COLUMN latest TINYINT(1) DEFAULT 0; + +UPDATE tl_laasse10_assessment_result result + JOIN + ( SELECT user_uid, MAX(start_date) AS max_date + FROM tl_laasse10_assessment_result + GROUP BY user_uid + ) AS c + ON result.user_uid = c.user_uid + AND result.start_date = c.max_date +SET + result.latest = 1; + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_laasse10_assessment_overall_feedback DROP FOREIGN KEY FK_tl_laasse10_assessment_overall_feedback_1; +ALTER TABLE tl_laasse10_assessment_overall_feedback ADD CONSTRAINT FK_tl_laasse10_assessment_overall_feedback_1 FOREIGN KEY (`assessment_uid`) +REFERENCES `tl_laasse10_assessment` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_assessment_question DROP FOREIGN KEY FK_NEW_1720029621_F52D1F9330E79035; +ALTER TABLE tl_laasse10_assessment_question ADD CONSTRAINT FK_NEW_1720029621_F52D1F9330E79035 FOREIGN KEY (`assessment_uid`) +REFERENCES `tl_laasse10_assessment` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laasse10_assessment_question DROP FOREIGN KEY FK_NEW_1720029621_F52D1F93758092FB; +ALTER TABLE tl_laasse10_assessment_question ADD CONSTRAINT FK_NEW_1720029621_F52D1F93758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_laasse10_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laasse10_assessment_question DROP FOREIGN KEY FK_NEW_1720029621_F52D1F93EC0D3147; +ALTER TABLE tl_laasse10_assessment_question ADD CONSTRAINT FK_NEW_1720029621_F52D1F93EC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_laasse10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_assessment_result DROP FOREIGN KEY FK_tl_laasse10_assessment_result_2; +ALTER TABLE tl_laasse10_assessment_result ADD CONSTRAINT FK_tl_laasse10_assessment_result_2 FOREIGN KEY (`user_uid`) +REFERENCES `tl_laasse10_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laasse10_assessment_result DROP FOREIGN KEY FK_tl_laasse10_assessment_result_3; +ALTER TABLE tl_laasse10_assessment_result ADD CONSTRAINT FK_tl_laasse10_assessment_result_3 FOREIGN KEY (`assessment_uid`) +REFERENCES `tl_laasse10_assessment` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_assessment_unit DROP FOREIGN KEY FK_tl_laasse10_assessment_unit_1; +ALTER TABLE tl_laasse10_assessment_unit ADD CONSTRAINT FK_tl_laasse10_assessment_unit_1 FOREIGN KEY (`question_uid`) +REFERENCES `tl_laasse10_assessment_question` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_question_option DROP FOREIGN KEY FK_tl_laasse10_question_option_1; +ALTER TABLE tl_laasse10_question_option ADD CONSTRAINT FK_tl_laasse10_question_option_1 FOREIGN KEY (`question_uid`) +REFERENCES `tl_laasse10_assessment_question` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_question_result DROP FOREIGN KEY FK_tl_laasse10_question_result_1; +ALTER TABLE tl_laasse10_question_result ADD CONSTRAINT FK_tl_laasse10_question_result_1 FOREIGN KEY (`result_uid`) +REFERENCES `tl_laasse10_assessment_result` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laasse10_question_result DROP FOREIGN KEY FK_NEW_1720029621_693580A438BF8DFE; +ALTER TABLE tl_laasse10_question_result ADD CONSTRAINT FK_NEW_1720029621_693580A438BF8DFE FOREIGN KEY (`assessment_question_uid`) +REFERENCES `tl_laasse10_assessment_question` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_option_answer DROP FOREIGN KEY FK_tl_laasse10_option_answer_1; +ALTER TABLE tl_laasse10_option_answer ADD CONSTRAINT FK_tl_laasse10_option_answer_1 FOREIGN KEY (`question_result_uid`) +REFERENCES `tl_laasse10_question_result` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_question_reference DROP FOREIGN KEY FK_tl_laasse10_question_reference_1; +ALTER TABLE tl_laasse10_question_reference ADD CONSTRAINT FK_tl_laasse10_question_reference_1 FOREIGN KEY (`question_uid`) +REFERENCES `tl_laasse10_assessment_question` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laasse10_question_reference DROP FOREIGN KEY FK_tl_laasse10_question_reference_2; +ALTER TABLE tl_laasse10_question_reference ADD CONSTRAINT FK_tl_laasse10_question_reference_2 FOREIGN KEY (`assessment_uid`) +REFERENCES `tl_laasse10_assessment` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_user DROP FOREIGN KEY FK_NEW_1720029621_30113BFC309ED320; +ALTER TABLE tl_laasse10_user ADD CONSTRAINT FK_NEW_1720029621_30113BFC309ED320 FOREIGN KEY (`assessment_uid`) +REFERENCES `tl_laasse10_assessment` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laasse10_user DROP FOREIGN KEY FK_NEW_1720029621_30113BFCEC0D3147; +ALTER TABLE tl_laasse10_user ADD CONSTRAINT FK_NEW_1720029621_30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_laasse10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_session DROP FOREIGN KEY FK_NEW_1720029621_24AA78C530E79035; +ALTER TABLE tl_laasse10_session ADD CONSTRAINT FK_NEW_1720029621_24AA78C530E79035 FOREIGN KEY (`assessment_uid`) +REFERENCES `tl_laasse10_assessment` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laasse10_assessment DROP FOREIGN KEY FK_NEW_1720029621_89093BF758092FB; +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; + +-- patch20161130.sql +-- LDEV-3801 keep the time limit start time in DB +ALTER TABLE tl_laasse10_assessment_result ADD COLUMN time_limit_launched_date datetime; + +-- LDEV-4180 +ALTER TABLE tl_laasse10_assessment MODIFY COLUMN allow_question_feedback tinyint(1), + MODIFY COLUMN allow_overall_feedback tinyint(1), + MODIFY COLUMN allow_right_answers tinyint(1), + MODIFY COLUMN allow_wrong_answers tinyint(1), + MODIFY COLUMN allow_grades_after_attempt tinyint(1), + MODIFY COLUMN allow_history_responses tinyint(1), + MODIFY COLUMN display_summary tinyint(1), + MODIFY COLUMN shuffled tinyint(1), + MODIFY COLUMN attempt_completion_notify tinyint(1) DEFAULT 0, + MODIFY COLUMN numbered tinyint(1) DEFAULT 1; + +ALTER TABLE tl_laasse10_assessment_question MODIFY COLUMN shuffle tinyint(1), + MODIFY COLUMN case_sensitive tinyint(1), + MODIFY COLUMN correct_answer tinyint(1) DEFAULT 0, + MODIFY COLUMN allow_rich_editor tinyint(1) DEFAULT 0; + +ALTER TABLE tl_laasse10_question_reference MODIFY COLUMN random_question tinyint(1) DEFAULT 0; + + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='laasse10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='laasse10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_chat/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_chat/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=lachat11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=chat Index: lams_tool_chat/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_chat/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -32,12 +32,12 @@ '@tool_version@', 0, 2, -'tool/lachat11/learning.do?mode=learner', -'tool/lachat11/learning.do?mode=author', -'tool/lachat11/learning.do?mode=teacher', -'tool/lachat11/authoring.do', -'tool/lachat11/monitoring.do', -'tool/lachat11/pedagogicalPlanner.do', +'tool/lachat11/learning/learning.do?mode=learner', +'tool/lachat11/learning/learning.do?mode=author', +'tool/lachat11/learning/learning.do?mode=teacher', +'tool/lachat11/authoring/authoring.do', +'tool/lachat11/monitoring/monitoring.do', +'tool/lachat11/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lachat11', 'org.lamsfoundation.lams.tool.chat.ApplicationResources', NOW(), Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20121024.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,60 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20121024.sql +ALTER TABLE tl_lachat11_user DROP COLUMN jabber_id, + CHANGE COLUMN jabber_nickname nickname varchar(255), + ADD COLUMN last_presence datetime; + +ALTER TABLE tl_lachat11_session DROP COLUMN jabber_room, + DROP COLUMN room_created; + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lachat11_chat DROP COLUMN online_instructions; +ALTER TABLE tl_lachat11_chat DROP COLUMN offline_instructions; +ALTER TABLE tl_lachat11_chat DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lachat11_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lachat11'; + +-- patch20150930.sql +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lachat11_session ADD UNIQUE (session_id); + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lachat11_message DROP FOREIGN KEY FKCC08C1DC2AF61E05; +ALTER TABLE tl_lachat11_message ADD CONSTRAINT FKCC08C1DC2AF61E05 FOREIGN KEY (`to_user_uid`) +REFERENCES `tl_lachat11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lachat11_message DROP FOREIGN KEY FKCC08C1DC9C8469FC; +ALTER TABLE tl_lachat11_message ADD CONSTRAINT FKCC08C1DC9C8469FC FOREIGN KEY (`chat_session_uid`) +REFERENCES `tl_lachat11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lachat11_message DROP FOREIGN KEY FKCC08C1DCCF3BF9B6; +ALTER TABLE tl_lachat11_message ADD CONSTRAINT FKCC08C1DCCF3BF9B6 FOREIGN KEY (`from_user_uid`) +REFERENCES `tl_lachat11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lachat11_session DROP FOREIGN KEY FK96E446B1A3926E3; +ALTER TABLE tl_lachat11_session ADD CONSTRAINT FK96E446B1A3926E3 FOREIGN KEY (`chat_uid`) +REFERENCES `tl_lachat11_chat` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lachat11_user DROP FOREIGN KEY FK4EB82169C8469FC; +ALTER TABLE tl_lachat11_user ADD CONSTRAINT FK4EB82169C8469FC FOREIGN KEY (`chat_session_uid`) +REFERENCES `tl_lachat11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lachat11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lachat11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_daco/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_daco/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=ladaco10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=daco Index: lams_tool_daco/db/sql/create_lams_tool_daco.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_daco/db/sql/create_lams_tool_daco.sql (.../create_lams_tool_daco.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/db/sql/create_lams_tool_daco.sql (.../create_lams_tool_daco.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -9,11 +9,11 @@ lock_on_finished tinyint(1) DEFAULT 0, min_records tinyint unsigned DEFAULT 0, max_records tinyint unsigned DEFAULT 0, - instructions text, + instructions MEDIUMTEXT, content_in_use tinyint(1) DEFAULT 0, define_later tinyint(1) DEFAULT 0, content_id bigint, - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity tinyint(1), learner_entry_notify tinyint(1) DEFAULT 0, record_submit_notify tinyint(1) DEFAULT 0, @@ -37,7 +37,7 @@ CREATE TABLE tl_ladaco10_questions ( uid bigint NOT NULL UNIQUE auto_increment, - description text, + description MEDIUMTEXT, create_by bigint, create_date datetime , is_required tinyint(1) DEFAULT 0, @@ -88,7 +88,7 @@ user_uid bigint, question_uid bigint, record_id smallint unsigned, - answer text, + answer MEDIUMTEXT, file_type varchar(255), file_name varchar(255), file_uuid bigint, Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20160927.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,88 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_ladaco10_contents DROP COLUMN online_instructions; +ALTER TABLE tl_ladaco10_contents DROP COLUMN offline_instructions; +ALTER TABLE tl_ladaco10_contents DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_ladaco10_attachments; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='ladaco10'; + +-- patch20150217.sql +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_ladaco10_contents MODIFY COLUMN reflect_instructions text; + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_ladaco10_answer_options DROP FOREIGN KEY tl_ladaco10_answer_options_ibfk_1; +ALTER TABLE tl_ladaco10_answer_options ADD CONSTRAINT tl_ladaco10_answer_options_ibfk_1 FOREIGN KEY (`question_uid`) +REFERENCES `tl_ladaco10_questions` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_ladaco10_contents DROP FOREIGN KEY DacoToUser; +ALTER TABLE tl_ladaco10_contents ADD CONSTRAINT DacoToUser FOREIGN KEY (`create_by`) +REFERENCES `tl_ladaco10_users` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + + +ALTER TABLE tl_ladaco10_questions DROP FOREIGN KEY QuestionToDaco; +ALTER TABLE tl_ladaco10_questions ADD CONSTRAINT QuestionToDaco FOREIGN KEY (`content_uid`) +REFERENCES `tl_ladaco10_contents` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_ladaco10_questions DROP FOREIGN KEY QuestionToUser; +ALTER TABLE tl_ladaco10_questions ADD CONSTRAINT QuestionToUser FOREIGN KEY (`create_by`) +REFERENCES `tl_ladaco10_users` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_ladaco10_questions DROP FOREIGN KEY tl_ladaco10_questions_ibfk_1; +ALTER TABLE tl_ladaco10_questions ADD CONSTRAINT tl_ladaco10_questions_ibfk_1 FOREIGN KEY (`session_uid`) +REFERENCES `tl_ladaco10_sessions` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_ladaco10_sessions DROP FOREIGN KEY SessionToDaco; +ALTER TABLE tl_ladaco10_sessions ADD CONSTRAINT SessionToDaco FOREIGN KEY (`content_uid`) +REFERENCES `tl_ladaco10_contents` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_ladaco10_users DROP FOREIGN KEY UserToSession; +ALTER TABLE tl_ladaco10_users ADD CONSTRAINT UserToSession FOREIGN KEY (`session_uid`) +REFERENCES `tl_ladaco10_sessions` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_ladaco10_answers DROP FOREIGN KEY AnswerToUser; +ALTER TABLE tl_ladaco10_answers ADD CONSTRAINT AnswerToUser FOREIGN KEY (`user_uid`) +REFERENCES `tl_ladaco10_users` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_ladaco10_answers DROP FOREIGN KEY AnswerToQuestion; +ALTER TABLE tl_ladaco10_answers ADD CONSTRAINT AnswerToQuestion FOREIGN KEY (`question_uid`) +REFERENCES `tl_ladaco10_questions` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20160927.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_ladaco10_users DROP FOREIGN KEY UserToDaco; +ALTER TABLE tl_ladaco10_users ADD CONSTRAINT UserToDaco FOREIGN KEY (content_uid) +REFERENCES tl_ladaco10_contents (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20170101.sql +-- LDEV-4180 +ALTER TABLE tl_ladaco10_contents MODIFY COLUMN lock_on_finished TINYINT(1) DEFAULT 0, + MODIFY COLUMN content_in_use TINYINT(1) DEFAULT 0, + MODIFY COLUMN define_later TINYINT(1) DEFAULT 0, + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN learner_entry_notify TINYINT(1) DEFAULT 0, + MODIFY COLUMN record_submit_notify TINYINT(1) DEFAULT 0; + +ALTER TABLE tl_ladaco10_questions MODIFY COLUMN is_required tinyint(1) DEFAULT 0; + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='ladaco10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='ladaco10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_doku/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_doku/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=ladoku11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=dokumaran Index: lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql (.../create_lams_tool_dokumaran.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql (.../create_lams_tool_dokumaran.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -10,7 +10,7 @@ create_by bigint, title varchar(255), lock_on_finished tinyint, - instructions text, + instructions MEDIUMTEXT, content_in_use tinyint, define_later tinyint, content_id bigint unique, @@ -19,8 +19,10 @@ shared_pad_id varchar(255), use_select_leader_tool_ouput tinyint, allow_multiple_leaders tinyint, - reflect_instructions TEXT, + reflect_instructions MEDIUMTEXT, reflect_on_activity smallint, + time_limit integer DEFAULT 0, + time_limit_launched_date datetime, primary key (uid) )ENGINE=InnoDB; CREATE TABLE tl_ladoku11_session ( Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='ladoku11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_forum/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_forum/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lafrum11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=forum \ No newline at end of file Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_forum/db/sql/create_lams_tool_forum.sql (.../create_lams_tool_forum.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_forum/db/sql/create_lams_tool_forum.sql (.../create_lams_tool_forum.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -8,7 +8,7 @@ title varchar(255), allow_anonym tinyint(1), lock_on_finished tinyint(1), - instructions text, + instructions MEDIUMTEXT, content_in_use tinyint(1), define_later tinyint(1), content_id bigint, @@ -21,7 +21,7 @@ minimum_reply integer, limited_of_chars integer, limited_input_flag tinyint(1), - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity tinyint(1), notify_learners_on_forum_posting tinyint(1) DEFAULT 0, notify_teachers_on_forum_posting tinyint(1) DEFAULT 0, @@ -37,7 +37,6 @@ 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, @@ -67,8 +66,7 @@ create table tl_lafrum11_report ( uid bigint not null auto_increment, - comment text, - release_date datetime, + comment MEDIUMTEXT, mark float, primary key (uid) ); @@ -81,7 +79,7 @@ create_by bigint, modified_by bigint, subject varchar(255), - body text, + body MEDIUMTEXT, sequence_id integer, is_authored tinyint(1), is_anonymous tinyint(1), @@ -132,7 +130,7 @@ REFERENCES tl_lafrum11_forum_user (uid) , INDEX (message_id) , CONSTRAINT FK_tl_lafrum11_message_rating_2 FOREIGN KEY (message_id) - REFERENCES tl_lafrum11_message (uid) + REFERENCES tl_lafrum11_message (uid) ON DELETE CASCADE ON UPDATE CASCADE ); CREATE TABLE tl_lafrum11_conditions ( @@ -197,4 +195,14 @@ 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); +CREATE TABLE tl_lafrum11_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_lafrum11_configuration (config_key, config_value) VALUES ('keepLearnerContent', 'false'); + SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -35,8 +35,8 @@ 'tool/lafrum11/learning/viewForum.do?mode=learner', 'tool/lafrum11/learning/viewForum.do?mode=author', 'tool/lafrum11/learning/viewForum.do?mode=teacher', -'tool/lafrum11/authoring.do', -'tool/lafrum11/monitoring.do', +'tool/lafrum11/authoring/authoring.do', +'tool/lafrum11/monitoring/monitoring.do', 'tool/lafrum11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lafrum11', 'org.lamsfoundation.lams.tool.forum.ApplicationResources', Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20141216.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150224.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150225.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150226.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150227.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150228.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20160213.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,411 @@ +-- This patch file CANNOT be run as is or the Stored Procedure based thread id updates will fail. +-- The updates have been broken into a serious of batches - Batch 1 through Batch 7. Please +-- run each batch separately. + +-- They were designed to be run via auto update but the code should also work pasted into a +-- SQL management tool. The Stored Procedures are in Batches 3, 4 and 5. If you are using MySQL +-- Workbench you will need to create them using the Stored Procedure window (go to the Stored +-- Procedures list under the table list and do Create Stored Procedure). + +-- Batch 2 alters the table to add the new thread_message_uid. Batches 3, 4 and 5 set up the +-- stored procs that will update the existing data to use the new thread_message_uid. +-- Batch 6 runs the stored procs to update the data and then cleans up the temporary data and +-- stored procedures. Batch 2 (adding the column) should only be done once. +-- Batches 3 thru 6 can be redone but all fourneed to be redone in order, as Batch 6 drops +-- the stored procedures created in 3, 4 and 5. + +-- Batch 1 -------------------------------------------------------------------- +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- --------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lafrum11_forum DROP COLUMN online_instructions; +ALTER TABLE tl_lafrum11_forum DROP COLUMN offline_instructions; +ALTER TABLE tl_lafrum11_forum DROP COLUMN run_offline; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lafrum11'; + +-- patch20141216.sql +-- LDEV-3395 Implement a minimum number of characters for forum postings +ALTER TABLE tl_lafrum11_forum ADD COLUMN min_characters integer DEFAULT 0; +ALTER TABLE tl_lafrum11_forum ADD COLUMN limited_min_characters tinyint DEFAULT 0; + +UPDATE lams_tool SET tool_version='20141216' WHERE tool_signature='lafrum11'; + +-- patch20150217.sql +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_lafrum11_forum MODIFY COLUMN reflect_instructions text; + +-- --------------------Put all sql statements above here------------------------- +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS = 1; + +-- End of Batch 1 -------------------------------------------------------------- + +-- Batch 2 -------------------------------------------------------------------- +-- This is the start of the tricky updates. They were originally 5 patch files - +-- patch20150224 thru patch20150228, all for LDEV-3443. + +-- patch20150224.sql + +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS = 0; + +-- --------------------Put all sql statements below here------------------------- + +ALTER TABLE `tl_lafrum11_message_seq` +ADD COLUMN `thread_message_uid` BIGINT(20) DEFAULT NULL, +ADD INDEX `fkfrum11mseqthread` (`thread_message_uid` ASC); +ALTER TABLE `tl_lafrum11_message_seq` +ADD CONSTRAINT `fkfrum11mseqthread` + FOREIGN KEY (`thread_message_uid`) + REFERENCES `tl_lafrum11_message` (`uid`) + ON DELETE RESTRICT + ON UPDATE RESTRICT; + +-- --------------------Put all sql statements above here------------------------- +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS = 1; + +-- End of Batch 2 -------------------------------------------------------------- + +-- Batch 3 -------------------------------------------------------------------- + +-- patch20150225.sql +-- This stored proc is a generic stored proc that can be used to emulate +-- the WITH RECURSIVE feature not found in MySQL. +-- From http://guilhembichot.blogspot.co.uk/2013/11/with-recursive-and-mysql.html + +CREATE PROCEDURE `with_emulator`( +recursive_table varchar(100), +initial_SELECT text, +recursive_SELECT text, +final_SELECT text, +max_recursion int unsigned, +create_table_options text +) +BEGIN + declare new_rows int unsigned; + declare show_progress int default 0; + declare recursive_table_next varchar(120); + declare recursive_table_union varchar(120); + declare recursive_table_tmp varchar(120); + set recursive_table_next = concat(recursive_table, "_next"); + set recursive_table_union = concat(recursive_table, "_union"); + set recursive_table_tmp = concat(recursive_table, "_tmp"); + SET @str = + CONCAT("CREATE TEMPORARY TABLE ", recursive_table, " ", + create_table_options, " AS ", initial_SELECT); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("CREATE TEMPORARY TABLE ", recursive_table_union, " LIKE ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("CREATE TEMPORARY TABLE ", recursive_table_next, " LIKE ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; + if max_recursion = 0 then + set max_recursion = 100; + end if; + recursion: repeat + SET @str = + CONCAT("INSERT INTO ", recursive_table_union, " SELECT * FROM ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; + set max_recursion = max_recursion - 1; + if not max_recursion then + if show_progress then + select concat("max recursion exceeded"); + end if; + leave recursion; + end if; + SET @str = + CONCAT("INSERT INTO ", recursive_table_next, " ", recursive_SELECT); + PREPARE stmt FROM @str; + EXECUTE stmt; + select row_count() into new_rows; + if show_progress then + select concat(new_rows, " new rows found"); + end if; + if not new_rows then + leave recursion; + end if; + SET @str = + CONCAT("ALTER TABLE ", recursive_table, " RENAME ", recursive_table_tmp); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("ALTER TABLE ", recursive_table_next, " RENAME ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("ALTER TABLE ", recursive_table_tmp, " RENAME ", recursive_table_next); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("TRUNCATE TABLE ", recursive_table_next); + PREPARE stmt FROM @str; + EXECUTE stmt; + until 0 end repeat; + SET @str = + CONCAT("DROP TEMPORARY TABLE ", recursive_table_next, ", ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("ALTER TABLE ", recursive_table_union, " RENAME ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = final_SELECT; + PREPARE stmt FROM @str; + EXECUTE stmt; + SET @str = + CONCAT("DROP TEMPORARY TABLE ", recursive_table); + PREPARE stmt FROM @str; + EXECUTE stmt; +END; + +-- End of Batch 3 -------------------------------------------------------------- + +-- Batch 4 -------------------------------------------------------------------- + +-- patch20150226.sql +CREATE PROCEDURE `tl_lafrum11_get_all_thread_message_uids_tmp`() +BEGIN + +PREPARE stmt FROM "drop temporary table if exists tl_lafrum11_thread_message_uid_tmp"; +EXECUTE stmt; + +CALL with_emulator( + +"tl_lafrum11_recursive_tmp", + +"select seq.uid as seq_uid, seq.root_message_uid as topic_uid, +seq.message_uid as msg_uid, seq.message_level as message_level, m.body as body, +m.parent_uid as parent_uid, m.uid as thread_uid +from tl_lafrum11_message_seq seq join tl_lafrum11_message m +where seq.message_level = 1 and seq.message_uid = m.uid; ", + +"select chdseq.uid as seq_uid, chdseq.root_message_uid as topic_uid, +chdseq.message_uid as msg_uid, chdseq.message_level as message_level, chdm.body as body, +chdm.parent_uid as parent_uid, tm.thread_uid as thread_uid +from tl_lafrum11_recursive_tmp tm +join tl_lafrum11_message_seq chdseq +join tl_lafrum11_message chdm +where tm.msg_uid = chdm.parent_uid and chdseq.message_uid = chdm.uid;", + +"create temporary table tl_lafrum11_thread_message_uid_tmp as +(select thread_uid, seq_uid from tl_lafrum11_recursive_tmp order by thread_uid)", + +1000, + +"" +); + +END; + +-- End of Batch 4 -------------------------------------------------------------- + +-- Batch 5 -------------------------------------------------------------------- + +-- patch20150227.sql + +CREATE PROCEDURE `tl_lafrum11_set_all_thread_message_uids_tmp`() +BEGIN + +declare v_finished int default 0; +declare v_thread_uid bigint(20); +declare v_seq_uid bigint(20); + +DECLARE thread_cursor CURSOR FOR + SELECT thread_uid, seq_uid FROM tl_lafrum11_thread_message_uid_tmp; + +DECLARE CONTINUE HANDLER + FOR NOT FOUND SET v_finished = 1; + +OPEN thread_cursor; + +get_thread: LOOP + + FETCH thread_cursor INTO v_thread_uid, v_seq_uid ; + + IF v_finished = 1 THEN + LEAVE get_thread; + END IF; + + update tl_lafrum11_message_seq set thread_message_uid = v_thread_uid where uid = v_seq_uid; + +END LOOP get_thread; + +CLOSE thread_cursor; + +END; + +-- End of Batch 5 -------------------------------------------------------------- + +-- Batch 6 -------------------------------------------------------------------- + +-- patch20150228.sql +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS = 0; + +-- --------------------Put all sql statements below here------------------------- + +call tl_lafrum11_get_all_thread_message_uids_tmp(); +call tl_lafrum11_set_all_thread_message_uids_tmp(); + +drop procedure if exists with_emulator; +drop procedure if exists tl_lafrum11_set_all_thread_message_uids_tmp; +drop procedure if exists tl_lafrum11_get_all_thread_message_uids_tmp; + +drop temporary table if exists tl_lafrum11_thread_message_uid_tmp; +drop temporary table if exists tl_lafrum11_recursive_tmp; + + +-- --------------------Put all sql statements above here------------------------- +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS = 1; + +-- End of Batch 6 -------------------------------------------------------------- +-- End of thread id addition patches. All the rest of the updates should be able +-- to be run in one go. + +-- Batch 7 -------------------------------------------------------------------- +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- --------------------Put all sql statements below here------------------------- + +-- patch20150930.sql +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lafrum11_tool_session ADD UNIQUE (session_id); + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lafrum11_attachment DROP FOREIGN KEY FK389AD9A2131CE31E; +ALTER TABLE tl_lafrum11_attachment ADD CONSTRAINT FK389AD9A2131CE31E FOREIGN KEY (`forum_uid`) +REFERENCES `tl_lafrum11_forum` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_attachment DROP FOREIGN KEY FK389AD9A2FE939F2A; +ALTER TABLE tl_lafrum11_attachment ADD CONSTRAINT FK389AD9A2FE939F2A FOREIGN KEY (`message_uid`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lafrum11_forum DROP FOREIGN KEY FK87917942E42F4351; +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_rating DROP FOREIGN KEY FK_tl_lafrum11_message_rating_1; +ALTER TABLE tl_lafrum11_message_rating ADD CONSTRAINT FK_tl_lafrum11_message_rating_1 FOREIGN KEY (`user_id`) +REFERENCES `tl_lafrum11_forum_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message_rating DROP FOREIGN KEY FK_tl_lafrum11_message_rating_2; +ALTER TABLE tl_lafrum11_message_rating ADD CONSTRAINT FK_tl_lafrum11_message_rating_2 FOREIGN KEY (`message_id`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lafrum11_message_seq DROP FOREIGN KEY FKD2C71F8845213B4D; +ALTER TABLE tl_lafrum11_message_seq ADD CONSTRAINT FKD2C71F8845213B4D FOREIGN KEY (`root_message_uid`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message_seq DROP FOREIGN KEY FKD2C71F88FE939F2A; +ALTER TABLE tl_lafrum11_message_seq ADD CONSTRAINT FKD2C71F88FE939F2A FOREIGN KEY (`message_uid`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message_seq DROP FOREIGN KEY fkfrum11mseqthread; +ALTER TABLE tl_lafrum11_message_seq ADD CONSTRAINT fkfrum11mseqthread FOREIGN KEY (`thread_message_uid`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lafrum11_message DROP FOREIGN KEY FK4A6067E8647A7264; +ALTER TABLE tl_lafrum11_message ADD CONSTRAINT FK4A6067E8647A7264 FOREIGN KEY (`modified_by`) +REFERENCES `tl_lafrum11_forum_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message DROP FOREIGN KEY FK4A6067E8E42F4351; +ALTER TABLE tl_lafrum11_message ADD CONSTRAINT FK4A6067E8E42F4351 FOREIGN KEY (`create_by`) +REFERENCES `tl_lafrum11_forum_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message DROP FOREIGN KEY FK4A6067E824089E4D; +ALTER TABLE tl_lafrum11_message ADD CONSTRAINT FK4A6067E824089E4D FOREIGN KEY (`parent_uid`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message DROP FOREIGN KEY FK4A6067E8131CE31E; +ALTER TABLE tl_lafrum11_message ADD CONSTRAINT FK4A6067E8131CE31E FOREIGN KEY (`forum_uid`) +REFERENCES `tl_lafrum11_forum` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_message DROP FOREIGN KEY FK4A6067E89357B45B; +ALTER TABLE tl_lafrum11_message ADD CONSTRAINT FK4A6067E89357B45B FOREIGN KEY (`forum_session_uid`) +REFERENCES `tl_lafrum11_tool_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lafrum11_tool_session DROP FOREIGN KEY FK5A04D7AE131CE31E; +ALTER TABLE tl_lafrum11_tool_session ADD CONSTRAINT FK5A04D7AE131CE31E FOREIGN KEY (`forum_uid`) +REFERENCES `tl_lafrum11_forum` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lafrum11_timestamp DROP FOREIGN KEY ForumUserFK; +ALTER TABLE tl_lafrum11_timestamp ADD CONSTRAINT ForumUserFK FOREIGN KEY (`forum_user_uid`) +REFERENCES `tl_lafrum11_forum_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lafrum11_timestamp DROP FOREIGN KEY MessageFK; +ALTER TABLE tl_lafrum11_timestamp ADD CONSTRAINT MessageFK FOREIGN KEY (`message_uid`) +REFERENCES `tl_lafrum11_message` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lafrum11_forum_user DROP FOREIGN KEY FK7B83A4A85F0116B6; +ALTER TABLE tl_lafrum11_forum_user ADD CONSTRAINT FK7B83A4A85F0116B6 FOREIGN KEY (`session_id`) +REFERENCES `tl_lafrum11_tool_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20160213.sql +-- LDEV-4218 Display messages as created in monitoring using a colour +ALTER TABLE tl_lafrum11_message ADD COLUMN is_monitor SMALLINT(6) DEFAULT 0; + +-- patch20170101.sql +-- LDEV-4180 +ALTER TABLE tl_lafrum11_forum MODIFY COLUMN allow_anonym TINYINT(1), + MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN allow_edit TINYINT(1), + MODIFY COLUMN allow_rich_editor TINYINT(1), + MODIFY COLUMN allow_new_topic TINYINT(1), + MODIFY COLUMN allow_upload TINYINT(1), + MODIFY COLUMN allow_rate_messages TINYINT(1), + MODIFY COLUMN limited_input_flag TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN notify_learners_on_forum_posting tinyint(1) DEFAULT 0, + MODIFY COLUMN notify_teachers_on_forum_posting tinyint(1) DEFAULT 0, + MODIFY COLUMN mark_release_notify tinyint(1) DEFAULT 0, + MODIFY COLUMN limited_min_characters tinyint(1) DEFAULT 0; + +ALTER TABLE tl_lafrum11_forum_user MODIFY COLUMN session_finished TINYINT(1); + +ALTER TABLE tl_lafrum11_message MODIFY COLUMN is_authored TINYINT(1), + MODIFY COLUMN is_anonymous TINYINT(1), + MODIFY COLUMN hide_flag TINYINT(1), + MODIFY COLUMN is_monitor TINYINT(1) DEFAULT 0; + +ALTER TABLE tl_lafrum11_tool_session MODIFY COLUMN mark_released TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lafrum11'; + +-- --------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; + +-- End of Batch 7 -------------------------------------------------------------- Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lafrum11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_images/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_images/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=laimag10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=imageGallery Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -7,14 +7,14 @@ create_by bigint, title varchar(255), lock_on_finished tinyint(1), - instructions text, + instructions MEDIUMTEXT, next_image_title bigint, 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_instructions MEDIUMTEXT, reflect_on_activity tinyint(1), allow_rank tinyint(1), image_submit_notify tinyint(1) DEFAULT 0, @@ -56,7 +56,7 @@ create table tl_laimag10_imagegallery_item ( uid bigint not null auto_increment, - description text, + description MEDIUMTEXT, title varchar(255), create_by bigint, create_date datetime, @@ -71,8 +71,6 @@ medium_image_width integer, medium_image_height integer, thumbnail_file_uuid bigint, - file_version_id bigint, - file_type varchar(255), file_name varchar(255), primary key (uid), CONSTRAINT FK_NEW_1821149711_F52D1F9330E79035 FOREIGN KEY (imageGallery_uid) Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150416.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20151006.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,166 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3123 Make all DB tables names to be lowercase +SELECT DATABASE() INTO @db_name FROM DUAL; + +SELECT Count(*) +INTO @exists +FROM information_schema.tables +WHERE table_schema = @db_name + AND table_type = 'BASE TABLE' + AND BINARY table_name = 'tl_laimag10_imageGallery'; + +SET @query = If(@exists>0, + 'RENAME TABLE tl_laimag10_imageGallery TO tl_laimag10_imagegallery', + 'SELECT \'nothing to rename\' status'); + +PREPARE stmt FROM @query; + +EXECUTE stmt; + + +SELECT Count(*) +INTO @exists +FROM information_schema.tables +WHERE table_schema = @db_name + AND table_type = 'BASE TABLE' + AND BINARY table_name = 'tl_laimag10_imageGallery_item'; + +SET @query = If(@exists>0, + 'RENAME TABLE tl_laimag10_imageGallery_item TO tl_laimag10_imagegallery_item', + 'SELECT \'nothing to rename\' status'); + +PREPARE stmt FROM @query; + +EXECUTE stmt; + + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_laimag10_imagegallery DROP COLUMN online_instructions; +ALTER TABLE tl_laimag10_imagegallery DROP COLUMN offline_instructions; +ALTER TABLE tl_laimag10_imagegallery DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_laimag10_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laimag10'; + +-- patch20150217.sql +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_laimag10_imagegallery MODIFY COLUMN reflect_instructions text; + +-- patch20150416.sql +-- LDEV-3450 Set max and min rates limits +ALTER TABLE tl_laimag10_imagegallery ADD COLUMN minimum_rates integer DEFAULT 0; +ALTER TABLE tl_laimag10_imagegallery ADD COLUMN maximum_rates integer DEFAULT 0; + +UPDATE lams_tool SET tool_version='20150416' WHERE tool_signature='laimag10'; + +-- patch20150930.sql +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_laimag10_session ADD UNIQUE (session_id); + +-- patch20151006.sql +-- LDEV-3568 Move old rating data into the new DB model +INSERT INTO lams_rating_criteria (rating_criteria_type_id, comments_enabled, order_id, tool_content_id) +SELECT 3, true, 0, content_id +FROM tl_laimag10_imagegallery WHERE allow_comment_images=TRUE; + +INSERT INTO lams_rating_comment (rating_criteria_id, item_id, user_id, comment) +SELECT criteria.rating_criteria_id, comment.imageGallery_item_uid, comment.create_by, comment.comment +FROM tl_laimag10_image_comment comment, tl_laimag10_imagegallery_item image, tl_laimag10_imagegallery imagegallery, lams_rating_criteria criteria + WHERE image.uid=comment.imageGallery_item_uid AND imagegallery.uid=image.imageGallery_uid AND imagegallery.content_id=criteria.tool_content_id AND criteria.order_id=0; + + +INSERT INTO lams_rating_criteria (title, rating_criteria_type_id, comments_enabled, order_id, tool_content_id) +SELECT "Rating", 3, false, 1, content_id +FROM tl_laimag10_imagegallery WHERE allow_rank=TRUE; + +INSERT INTO lams_rating (rating_criteria_id, item_id, user_id, rating) +SELECT criteria.rating_criteria_id, rating.imageGallery_item_uid, rating.create_by, rating.rating +FROM tl_laimag10_image_rating rating, tl_laimag10_imagegallery_item image, tl_laimag10_imagegallery imagegallery, lams_rating_criteria criteria + WHERE image.uid=rating.imageGallery_item_uid AND imagegallery.uid=image.imageGallery_uid AND imagegallery.content_id=criteria.tool_content_id AND criteria.order_id=1; + +ALTER TABLE tl_laimag10_imagegallery DROP COLUMN allow_comment_images; +DROP TABLE tl_laimag10_image_rating; +DROP TABLE tl_laimag10_image_comment; + +UPDATE lams_tool SET tool_version='20151006' WHERE tool_signature='laimag10'; + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_laimag10_image_vote DROP FOREIGN KEY FK_tl_laimag10_image_vote_2; +ALTER TABLE tl_laimag10_image_vote ADD CONSTRAINT FK_tl_laimag10_image_vote_2 FOREIGN KEY (`create_by`) +REFERENCES `tl_laimag10_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_laimag10_image_vote DROP FOREIGN KEY FK_tl_laimag10_image_vote_3; +ALTER TABLE tl_laimag10_image_vote ADD CONSTRAINT FK_tl_laimag10_image_vote_3 FOREIGN KEY (`imageGallery_item_uid`) +REFERENCES `tl_laimag10_imagegallery_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimag10_imagegallery_item DROP FOREIGN KEY FK_NEW_1821149711_F52D1F9330E79035; +ALTER TABLE tl_laimag10_imagegallery_item ADD CONSTRAINT FK_NEW_1821149711_F52D1F9330E79035 FOREIGN KEY (`imageGallery_uid`) +REFERENCES `tl_laimag10_imagegallery` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laimag10_imagegallery_item DROP FOREIGN KEY FK_NEW_1821149711_F52D1F93758092FB; +ALTER TABLE tl_laimag10_imagegallery_item ADD CONSTRAINT FK_NEW_1821149711_F52D1F93758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_laimag10_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + + +ALTER TABLE tl_laimag10_item_log DROP FOREIGN KEY FK_NEW_1821149711_693580A438BF8DFE; +ALTER TABLE tl_laimag10_item_log ADD CONSTRAINT FK_NEW_1821149711_693580A438BF8DFE FOREIGN KEY (`imageGallery_item_uid`) +REFERENCES `tl_laimag10_imagegallery_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laimag10_item_log DROP FOREIGN KEY FK_NEW_1821149711_693580A441F9365D; +ALTER TABLE tl_laimag10_item_log ADD CONSTRAINT FK_NEW_1821149711_693580A441F9365D FOREIGN KEY (`user_uid`) +REFERENCES `tl_laimag10_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimag10_session DROP FOREIGN KEY FK_NEW_1821149711_24AA78C530E79035; +ALTER TABLE tl_laimag10_session ADD CONSTRAINT FK_NEW_1821149711_24AA78C530E79035 FOREIGN KEY (`imageGallery_uid`) +REFERENCES `tl_laimag10_imagegallery` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimag10_user DROP FOREIGN KEY FK_NEW_1821149711_30113BFCEC0D3147; +ALTER TABLE tl_laimag10_user ADD CONSTRAINT FK_NEW_1821149711_30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_laimag10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laimag10_user DROP FOREIGN KEY FK_NEW_1821149711_30113BFC309ED320; +ALTER TABLE tl_laimag10_user ADD CONSTRAINT FK_NEW_1821149711_30113BFC309ED320 FOREIGN KEY (`imageGallery_uid`) +REFERENCES `tl_laimag10_imagegallery` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimag10_imagegallery DROP FOREIGN KEY FK_NEW_1821149711_89093BF758092FB; +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; + +-- patch20170101.sql +-- LDEV-4180 + +ALTER TABLE tl_laimag10_imagegallery MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN allow_share_images TINYINT(1), + MODIFY COLUMN allow_vote TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN allow_rank TINYINT(1), + MODIFY COLUMN image_submit_notify TINYINT(1) DEFAULT 0; + +ALTER TABLE tl_laimag10_imagegallery_item MODIFY COLUMN create_by_author TINYINT(1), + MODIFY COLUMN is_hide TINYINT(1); + +ALTER TABLE tl_laimag10_image_vote MODIFY COLUMN is_voted TINYINT(1); + +ALTER TABLE tl_laimag10_item_log MODIFY COLUMN complete TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='laimag10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='laimag10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_imscc/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_imscc/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=laimsc11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=commonCartridge \ No newline at end of file Index: lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql (.../create_lams_tool_commonCartridge.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql (.../create_lams_tool_commonCartridge.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -6,14 +6,13 @@ update_date datetime, create_by bigint, title varchar(255), - lock_on_finished tinyint(1), - instructions text, + instructions MEDIUMTEXT, content_in_use tinyint(1), define_later tinyint(1), content_id bigint, mini_view_commonCartridge_number integer, allow_auto_run tinyint(1), - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity tinyint(1), primary key (uid), UNIQUE KEY content_id (content_id) @@ -118,10 +117,10 @@ REFERENCES tl_laimsc11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; -INSERT INTO tl_laimsc11_commoncartridge (uid, title, lock_on_finished, +INSERT INTO tl_laimsc11_commoncartridge (uid, title, 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); + (1,'CommonCartridge','Instructions ',0,0,${default_content_id},0,0,0); 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); Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20160518.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,134 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3123 Make all DB tables names to be lowercase +SELECT DATABASE() INTO @db_name FROM DUAL; + +SELECT Count(*) +INTO @exists +FROM information_schema.tables +WHERE table_schema = @db_name + AND table_type = 'BASE TABLE' + AND BINARY table_name = 'tl_laimsc11_commonCartridge'; + +SET @query = If(@exists>0, + 'RENAME TABLE tl_laimsc11_commonCartridge TO tl_laimsc11_commoncartridge', + 'SELECT \'nothing to rename\' status'); + +PREPARE stmt FROM @query; + +EXECUTE stmt; + + +SELECT Count(*) +INTO @exists +FROM information_schema.tables +WHERE table_schema = @db_name + AND table_type = 'BASE TABLE' + AND BINARY table_name = 'tl_laimsc11_commonCartridge_item'; + +SET @query = If(@exists>0, + 'RENAME TABLE tl_laimsc11_commonCartridge_item TO tl_laimsc11_commoncartridge_item', + 'SELECT \'nothing to rename\' status'); + +PREPARE stmt FROM @query; + +EXECUTE stmt; + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN online_instructions; +ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN offline_instructions; +ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_laimsc11_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laimsc11'; + +-- patch20150217.sql +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_laimsc11_commoncartridge MODIFY COLUMN reflect_instructions text; + +-- patch20150930.sql +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_laimsc11_session ADD UNIQUE (session_id); + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_laimsc11_commoncartridge DROP FOREIGN KEY FK_NEW_1279208528_89093BF758092FB; +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; + + +ALTER TABLE tl_laimsc11_commoncartridge_item DROP FOREIGN KEY FK_NEW_1279208528_F52D1F9330E79035; +ALTER TABLE tl_laimsc11_commoncartridge_item ADD CONSTRAINT FK_NEW_1279208528_F52D1F9330E79035 FOREIGN KEY (`commonCartridge_uid`) +REFERENCES `tl_laimsc11_commoncartridge` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laimsc11_commoncartridge_item DROP FOREIGN KEY FK_NEW_1279208528_F52D1F93758092FB; +ALTER TABLE tl_laimsc11_commoncartridge_item ADD CONSTRAINT FK_NEW_1279208528_F52D1F93758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_laimsc11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_laimsc11_commoncartridge_item DROP FOREIGN KEY FK_NEW_1279208528_F52D1F93EC0D3147; +ALTER TABLE tl_laimsc11_commoncartridge_item ADD CONSTRAINT FK_NEW_1279208528_F52D1F93EC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_laimsc11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimsc11_item_instruction DROP FOREIGN KEY FK_NEW_1279208528_A5665013980570ED; +ALTER TABLE tl_laimsc11_item_instruction ADD CONSTRAINT FK_NEW_1279208528_A5665013980570ED FOREIGN KEY (`item_uid`) +REFERENCES `tl_laimsc11_commoncartridge_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimsc11_item_log DROP FOREIGN KEY FK_NEW_1279208528_693580A438BF8DFE; +ALTER TABLE tl_laimsc11_item_log ADD CONSTRAINT FK_NEW_1279208528_693580A438BF8DFE FOREIGN KEY (`commonCartridge_item_uid`) +REFERENCES `tl_laimsc11_commoncartridge_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laimsc11_item_log DROP FOREIGN KEY FK_NEW_1279208528_693580A441F9365D; +ALTER TABLE tl_laimsc11_item_log ADD CONSTRAINT FK_NEW_1279208528_693580A441F9365D FOREIGN KEY (`user_uid`) +REFERENCES `tl_laimsc11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimsc11_session DROP FOREIGN KEY FK_NEW_1279208528_24AA78C530E79035; +ALTER TABLE tl_laimsc11_session ADD CONSTRAINT FK_NEW_1279208528_24AA78C530E79035 FOREIGN KEY (`commonCartridge_uid`) +REFERENCES `tl_laimsc11_commoncartridge` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_laimsc11_user DROP FOREIGN KEY FK_NEW_1279208528_30113BFCEC0D3147; +ALTER TABLE tl_laimsc11_user ADD CONSTRAINT FK_NEW_1279208528_30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_laimsc11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laimsc11_user DROP FOREIGN KEY FK_NEW_1279208528_30113BFC309ED320; +ALTER TABLE tl_laimsc11_user ADD CONSTRAINT FK_NEW_1279208528_30113BFC309ED320 FOREIGN KEY (`commonCartridge_uid`) +REFERENCES `tl_laimsc11_commoncartridge` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20160518.sql +-- LDEV-3802 Update IMS CC Author and Monitor to Bootstrap +ALTER TABLE tl_laimsc11_commoncartridge_item DROP FOREIGN KEY FK_NEW_1279208528_F52D1F93EC0D3147; +ALTER TABLE tl_laimsc11_commoncartridge_item DROP COLUMN session_uid; + +-- patch20170101.sql +-- LDEV-4180 + +ALTER TABLE tl_laimsc11_commoncartridge MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN allow_auto_run TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1); + +ALTER TABLE tl_laimsc11_commoncartridge_item MODIFY COLUMN create_by_author TINYINT(1), + MODIFY COLUMN is_hide TINYINT(1), + MODIFY COLUMN open_url_new_window TINYINT(1); + +ALTER TABLE tl_laimsc11_item_log MODIFY COLUMN complete TINYINT(1); + +ALTER TABLE tl_laimsc11_user MODIFY COLUMN session_finished TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='laimsc11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='laimsc11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_lamc/build.properties =================================================================== diff -u -rd53b871cf362921c3977c247e2eb7a46ce0e94fb -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_lamc/build.properties (.../build.properties) (revision d53b871cf362921c3977c247e2eb7a46ce0e94fb) +++ lams_tool_lamc/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lamc11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=mc \ No newline at end of file Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -4,7 +4,7 @@ uid BIGINT(20) NOT NULL AUTO_INCREMENT , content_id BIGINT(20) NOT NULL , title TEXT - , instructions TEXT + , instructions MEDIUMTEXT , creation_date DATETIME , update_date DATETIME , reflect TINYINT(1) NOT NULL DEFAULT 0 @@ -14,13 +14,15 @@ , retries TINYINT(1) NOT NULL DEFAULT 0 , pass_mark INTEGER , show_report TINYINT(1) NOT NULL DEFAULT 0 - , reflectionSubject TEXT + , reflectionSubject MEDIUMTEXT , showMarks TINYINT(1) NOT NULL DEFAULT 0 , randomize TINYINT(1) NOT NULL DEFAULT 0 , displayAnswers TINYINT(1) NOT NULL DEFAULT 1 , submission_deadline datetime , use_select_leader_tool_ouput tinyint(1) NOT NULL DEFAULT 0 , prefix_answers_with_letters tinyint(1) NOT NULL DEFAULT 1 + , enable_confidence_levels TINYINT(1) NOT NULL DEFAULT 0 + , display_feedback_only TINYINT(1) NOT NULL DEFAULT 0 , UNIQUE UQ_tl_lamc11_content_1 (content_id) , PRIMARY KEY (uid) ); @@ -60,11 +62,12 @@ CREATE TABLE tl_lamc11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , question TEXT + , question MEDIUMTEXT , mark INT(5) NOT NULL DEFAULT 1 , display_order INT(5) , mc_content_id BIGINT(20) NOT NULL - , feedback TEXT + , feedback MEDIUMTEXT + , question_hash CHAR(40) , PRIMARY KEY (uid) , INDEX (mc_content_id) , CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (mc_content_id) @@ -75,7 +78,7 @@ uid BIGINT(20) NOT NULL AUTO_INCREMENT , correct_option TINYINT(1) NOT NULL DEFAULT 0 , mc_que_content_id BIGINT(20) - , mc_que_option_text TEXT + , mc_que_option_text MEDIUMTEXT , displayOrder INT(5) , PRIMARY KEY (uid) , INDEX (mc_que_content_id) @@ -92,6 +95,7 @@ , isAttemptCorrect TINYINT(1) NOT NULL DEFAULT 0 , mark VARCHAR(255) , passed TINYINT(1) NOT NULL DEFAULT 0 + , confidence_level INT(11) NOT NULL DEFAULT 0 , PRIMARY KEY (uid) , UNIQUE KEY attempt_unique_index (que_usr_id,mc_que_content_id) , INDEX (mc_que_content_id) Index: lams_tool_lamc/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -30,12 +30,12 @@ '@tool_version@', 0, 2, -'tool/lamc11/learningStarter.do?mode=learner', -'tool/lamc11/learningStarter.do?mode=author', -'tool/lamc11/learningStarter.do?mode=teacher', -'tool/lamc11/authoringStarter.do', -'tool/lamc11/monitoringStarter.do', -'tool/lamc11/pedagogicalPlanner.do', +'tool/lamc11/learning/learning.do?mode=learner', +'tool/lamc11/learning/learning.do?mode=author', +'tool/lamc11/learning/learning.do?mode=teacher', +'tool/lamc11/authoring/authoring.do', +'tool/lamc11/monitoring/monitoring.do', +'tool/lamc11/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lamc11', 'org.lamsfoundation.lams.tool.mc.ApplicationResources', NOW(), Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130325.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130527.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130726.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130812.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20131021.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140101.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20140512.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,131 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; + +----------------------Put all sql statements below here------------------------- + +-- patch20130325.sql +ALTER TABLE tl_lamc11_que_usr DROP COLUMN viewSummaryRequested ; + +-- patch20130527.sql +-- Turn off autocommit, so nothing is committed if there is an error +--LDEV-3043 remove unused properties +ALTER TABLE tl_lamc11_usr_attempt DROP COLUMN finished; + +-- patch20130726.sql +--LDEV-3079 Use CKEditors as MCQ answers tags +ALTER TABLE tl_lamc11_options_content MODIFY COLUMN mc_que_option_text TEXT; + +-- patch20130812.sql +--LDEV-3085 Autosave feature for MCQ +CREATE TEMPORARY TABLE temp_select AS SELECT attempt.uid + FROM tl_lamc11_usr_attempt attempt + INNER JOIN( + SELECT que_usr_id, mc_que_content_id, max(attemptOrder) attemptOrder + FROM tl_lamc11_usr_attempt + GROUP BY que_usr_id, mc_que_content_id + ) ss ON attempt.que_usr_id = ss.que_usr_id AND attempt.mc_que_content_id = ss.mc_que_content_id AND attempt.attemptOrder = ss.attemptOrder; +ALTER TABLE temp_select ADD INDEX index1 (uid ASC); +DELETE FROM tl_lamc11_usr_attempt WHERE uid NOT IN (SELECT uid FROM temp_select); +DROP TEMPORARY TABLE temp_select; + +ALTER TABLE tl_lamc11_usr_attempt DROP COLUMN attemptOrder; +ALTER TABLE tl_lamc11_que_usr DROP COLUMN last_attempt_order; +ALTER TABLE tl_lamc11_que_usr ADD COLUMN number_attempts INTEGER DEFAULT 0; + +-- patch20131021.sql +--LDEV-3138 Prevent erroneously creating 2 identical user results for 1 question in DB +CREATE TEMPORARY TABLE temp_select AS SELECT MAX(uid) uid +FROM tl_lamc11_usr_attempt GROUP BY que_usr_id, mc_que_content_id; +ALTER TABLE temp_select ADD INDEX index1 (uid ASC); +DELETE FROM tl_lamc11_usr_attempt WHERE uid NOT IN (SELECT uid FROM temp_select); +DROP TEMPORARY TABLE temp_select; + +ALTER TABLE tl_lamc11_usr_attempt ADD UNIQUE INDEX attempt_unique_index (que_usr_id, mc_que_content_id); + +-- patch20140101.sql +-- LDEV-3155 adding all the leader aware tools (lamc,assessment,qa) to regular LAMS +ALTER TABLE tl_lamc11_content ADD COLUMN use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE tl_lamc11_session ADD COLUMN mc_group_leader_uid BIGINT; +ALTER TABLE tl_lamc11_session ADD INDEX FK_lamc11_session1 (mc_group_leader_uid), ADD CONSTRAINT FK_lamc11_session1 FOREIGN KEY (mc_group_leader_uid) REFERENCES tl_lamc11_que_usr (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +-- Put automatic letters in front of MCQ answers +ALTER TABLE tl_lamc11_content ADD COLUMN prefix_answers_with_letters TINYINT(1) NOT NULL DEFAULT 1; + +-- Adding a constraint to the MCQ user table so no same user_id and session_id can be repetead. +-- In order to achieve this remove duplicate users and according attempts. +CREATE TEMPORARY TABLE temp_select AS SELECT MAX(uid) uid FROM tl_lamc11_que_usr GROUP BY que_usr_id, mc_session_id; +ALTER TABLE temp_select ADD INDEX index1 (uid ASC); +DELETE FROM tl_lamc11_usr_attempt WHERE que_usr_id NOT IN (SELECT uid FROM temp_select); +DELETE FROM tl_lamc11_que_usr WHERE uid NOT IN (SELECT uid FROM temp_select); +DROP TEMPORARY TABLE temp_select; + +ALTER TABLE tl_lamc11_que_usr ADD UNIQUE INDEX(que_usr_id, mc_session_id); + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lamc11_content DROP COLUMN online_instructions; +ALTER TABLE tl_lamc11_content DROP COLUMN offline_instructions; +ALTER TABLE tl_lamc11_content DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lamc11_uploadedfile; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lamc11'; + +-- patch20140512.sql +-- LDEV-3228 Ability to change, add, remove MCQ questions even after student have reached it +ALTER TABLE tl_lamc11_content DROP COLUMN content_in_use; + +ALTER TABLE tl_lamc11_options_content DROP FOREIGN KEY FK_tl_lamc11_options_content_1; +ALTER TABLE tl_lamc11_options_content MODIFY COLUMN mc_que_content_id BIGINT(20), + ADD CONSTRAINT FK_tl_lamc11_options_content_1 FOREIGN KEY (mc_que_content_id) REFERENCES tl_lamc11_que_content(uid); + +UPDATE lams_tool SET tool_version='20140512' WHERE tool_signature='lamc11'; + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lamc11_options_content DROP FOREIGN KEY FK_tl_lamc11_options_content_1; +ALTER TABLE tl_lamc11_options_content ADD 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; + + +ALTER TABLE tl_lamc11_que_content DROP FOREIGN KEY FK_tl_lamc11_que_content_1; +ALTER TABLE tl_lamc11_que_content ADD CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (`mc_content_id`) +REFERENCES `tl_lamc11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lamc11_que_usr DROP FOREIGN KEY FK_tl_lamc11_que_usr_1; +ALTER TABLE tl_lamc11_que_usr ADD CONSTRAINT FK_tl_lamc11_que_usr_1 FOREIGN KEY (`mc_session_id`) +REFERENCES `tl_lamc11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lamc11_session DROP FOREIGN KEY FK_lamc11_session1; +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; + +ALTER TABLE tl_lamc11_session DROP FOREIGN KEY FK_tl_lamc_session_1; +ALTER TABLE tl_lamc11_session ADD CONSTRAINT FK_tl_lamc_session_1 FOREIGN KEY (`mc_content_id`) +REFERENCES `tl_lamc11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lamc11_usr_attempt DROP FOREIGN KEY FK_tl_lamc11_usr_attempt_2; +ALTER TABLE tl_lamc11_usr_attempt ADD CONSTRAINT FK_tl_lamc11_usr_attempt_2 FOREIGN KEY (`mc_que_content_id`) +REFERENCES `tl_lamc11_que_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lamc11_usr_attempt DROP FOREIGN KEY FK_tl_lamc11_usr_attempt_3; +ALTER TABLE tl_lamc11_usr_attempt ADD CONSTRAINT FK_tl_lamc11_usr_attempt_3 FOREIGN KEY (`mc_que_option_id`) +REFERENCES `tl_lamc11_options_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lamc11_usr_attempt DROP FOREIGN KEY FK_tl_lamc11_usr_attempt_4; +ALTER TABLE tl_lamc11_usr_attempt ADD CONSTRAINT FK_tl_lamc11_usr_attempt_4 FOREIGN KEY (`que_usr_id`) +REFERENCES `tl_lamc11_que_usr` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20170101.sql +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lamc11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lamc11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_leader/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_leader/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_leader/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lalead11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=leaderselection Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,41 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lalead11_leaderselection DROP COLUMN run_offline; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lalead11'; + +-- patch20150930.sql +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lalead11_session ADD UNIQUE (session_id); + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lalead11_session DROP FOREIGN KEY FK_lalead11_1; +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; + +ALTER TABLE tl_lalead11_session DROP FOREIGN KEY FK_NEW_1316293302_B7C198E2FC940906; +ALTER TABLE tl_lalead11_session ADD CONSTRAINT FK_NEW_1316293302_B7C198E2FC940906 FOREIGN KEY (`leaderselection_uid`) +REFERENCES `tl_lalead11_leaderselection` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lalead11_user DROP FOREIGN KEY FK_NEW_1316293302_CB8A58FFA3B0FADF; +ALTER TABLE tl_lalead11_user ADD CONSTRAINT FK_NEW_1316293302_CB8A58FFA3B0FADF FOREIGN KEY (`leaderselection_session_uid`) +REFERENCES `tl_lalead11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20170101.sql +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lalead11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lalead11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_mindmap/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_mindmap/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=lamind10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=mindmap Index: lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql (.../create_lams_tool_mindmap.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql (.../create_lams_tool_mindmap.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -52,7 +52,7 @@ unique_id bigint(20), parent_id bigint(20), node_text varchar(100), - node_color varchar(6), + node_color varchar(7), session_id bigint(20), user_id bigint(20), mindmap_id bigint(20), Index: lams_tool_mindmap/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_mindmap/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -30,12 +30,12 @@ '@tool_version@', 0, 2, -'tool/lamind10/learning.do?mode=learner', -'tool/lamind10/learning.do?mode=author', -'tool/lamind10/learning.do?mode=teacher', -'tool/lamind10/authoring.do', -'tool/lamind10/monitoring.do', -'tool/lamind10/pedagogicalPlanner.do', +'tool/lamind10/learning/learning.do?mode=learner', +'tool/lamind10/learning/learning.do?mode=author', +'tool/lamind10/learning/learning.do?mode=teacher', +'tool/lamind10/authoring/authoring.do', +'tool/lamind10/monitoring/monitoring.do', +'tool/lamind10/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lamind10', 'org.lamsfoundation.lams.tool.mindmap.ApplicationResources', NOW(), Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,63 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lamind10_mindmap DROP COLUMN online_instructions; +ALTER TABLE tl_lamind10_mindmap DROP COLUMN offline_instructions; +ALTER TABLE tl_lamind10_mindmap DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lamind10_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lamind10'; + +-- patch20150930.sql +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lamind10_session ADD UNIQUE (session_id); + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lamind10_node DROP FOREIGN KEY MindmapNode_Mindmap_FK; +ALTER TABLE tl_lamind10_node ADD CONSTRAINT MindmapNode_Mindmap_FK FOREIGN KEY (`mindmap_id`) +REFERENCES `tl_lamind10_mindmap` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lamind10_node DROP FOREIGN KEY MindmapNode_Parent_FK; +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; + +ALTER TABLE tl_lamind10_node DROP FOREIGN KEY MindmapNode_User_FK; +ALTER TABLE tl_lamind10_node ADD CONSTRAINT MindmapNode_User_FK FOREIGN KEY (`user_id`) +REFERENCES `tl_lamind10_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + + +ALTER TABLE tl_lamind10_request DROP FOREIGN KEY tl_lamind10_request_fk; +ALTER TABLE tl_lamind10_request ADD CONSTRAINT tl_lamind10_request_fk FOREIGN KEY (`mindmap_id`) +REFERENCES `tl_lamind10_mindmap` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lamind10_request DROP FOREIGN KEY tl_lamind10_request_fk1; +ALTER TABLE tl_lamind10_request ADD CONSTRAINT tl_lamind10_request_fk1 FOREIGN KEY (`user_id`) +REFERENCES `tl_lamind10_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lamind10_session DROP FOREIGN KEY FK_NEW_972920762_B7C198E2FC940906; +ALTER TABLE tl_lamind10_session ADD CONSTRAINT FK_NEW_972920762_B7C198E2FC940906 FOREIGN KEY (`mindmap_uid`) +REFERENCES `tl_lamind10_mindmap` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE tl_lamind10_user DROP FOREIGN KEY FK_NEW_972920762_CB8A58FFA3B0FADF; +ALTER TABLE tl_lamind10_user ADD CONSTRAINT FK_NEW_972920762_CB8A58FFA3B0FADF FOREIGN KEY (`mindmap_session_uid`) +REFERENCES `tl_lamind10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20170101.sql +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lamind10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lamind10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_nb/build.properties =================================================================== diff -u -rd53b871cf362921c3977c247e2eb7a46ce0e94fb -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_nb/build.properties (.../build.properties) (revision d53b871cf362921c3977c247e2eb7a46ce0e94fb) +++ lams_tool_nb/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=lanb11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=noticeboard Index: lams_tool_nb/db/sql/create_lams_tool_nb.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,16 +2,17 @@ uid BIGINT(20) NOT NULL AUTO_INCREMENT , nb_content_id BIGINT(20) NOT NULL , title TEXT - , content TEXT + , content MEDIUMTEXT , define_later TINYINT(1) , reflect_on_activity TINYINT(1) - , reflect_instructions TEXT + , reflect_instructions MEDIUMTEXT , 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 + , allow_anonymous TINYINT(1) DEFAULT 0 , PRIMARY KEY (uid) , UNIQUE KEY nb_content_id (nb_content_id) ); Index: lams_tool_nb/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -29,12 +29,12 @@ '@tool_version@', 0, 2, -'tool/lanb11/starter/learner.do?mode=learner', -'tool/lanb11/starter/learner.do?mode=author', -'tool/lanb11/starter/learner.do?mode=teacher', -'tool/lanb11/authoring.do', -'tool/lanb11/monitoring.do', -'tool/lanb11/pedagogicalPlanner.do', +'tool/lanb11/learning/learner.do', +'tool/lanb11/learning/author.do', +'tool/lanb11/learning/teacher.do', +'tool/lanb11/authoring/authoring.do', +'tool/lanb11/monitoring/monitoring.do', +'tool/lanb11/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lanb11', 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources', NOW(), Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20151210.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20160105.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,47 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lanb11_content DROP COLUMN online_instructions; +ALTER TABLE tl_lanb11_content DROP COLUMN offline_instructions; +ALTER TABLE tl_lanb11_content DROP COLUMN force_offline; +DROP TABLE IF EXISTS tl_lanb11_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lanb11'; + +-- patch20151210.sql +-- LDEV-3631 Use simple commenting widget +ALTER TABLE tl_lanb11_content ADD COLUMN allow_comments TINYINT(1) DEFAULT 0; + +UPDATE lams_tool SET tool_version='20151210' WHERE tool_signature='lanb11'; + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lanb11_session DROP FOREIGN KEY FK_tl_lanb11_session_1; +ALTER TABLE tl_lanb11_session ADD CONSTRAINT FK_tl_lanb11_session_1 FOREIGN KEY (`nb_content_uid`) +REFERENCES `tl_lanb11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lanb11_user DROP FOREIGN KEY FK_tl_lanb11_user_1; +ALTER TABLE tl_lanb11_user ADD CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (`nb_session_uid`) +REFERENCES `tl_lanb11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20160105.sql +-- LDEV-3631 Use simple commenting widget +ALTER TABLE tl_lanb11_content ADD COLUMN comments_like_dislike TINYINT(1) DEFAULT 0; + +UPDATE lams_tool SET tool_version='20160105' WHERE tool_signature='lanb11'; + +-- patch20170101.sql +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lanb11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lanb11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_notebook/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4ba184e420dd753ae8e2dcc9434581a794fa244d --- lams_tool_notebook/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/build.properties (.../build.properties) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lantbk11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=notebook \ No newline at end of file Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140716.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20161123.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4ba184e420dd753ae8e2dcc9434581a794fa244d 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_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101_updateTo30.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,49 @@ + +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- patch20140102.sql +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lantbk11_notebook DROP COLUMN online_instructions; +ALTER TABLE tl_lantbk11_notebook DROP COLUMN offline_instructions; +ALTER TABLE tl_lantbk11_notebook DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lantbk11_attachment; + +UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lantbk11'; + +-- patch20140716.sql +-- LDEV-3193 Notebook monitor UI improvements +ALTER TABLE tl_lantbk11_user ADD COLUMN teachers_comment TEXT; + +-- patch20150930.sql +-- Turn off autocommit, so nothing is committed if there is an error +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lantbk11_session ADD UNIQUE (session_id); + +-- patch20151217.sql +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_lantbk11_session DROP FOREIGN KEY FKB7C198E2FC940906; +ALTER TABLE tl_lantbk11_session ADD CONSTRAINT FKB7C198E2FC940906 FOREIGN KEY (`notebook_uid`) +REFERENCES `tl_lantbk11_notebook` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lantbk11_user DROP FOREIGN KEY FKCB8A58FFA3B0FADF; +ALTER TABLE tl_lantbk11_user ADD CONSTRAINT FKCB8A58FFA3B0FADF FOREIGN KEY (`notebook_session_uid`) +REFERENCES `tl_lantbk11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- patch20161123.sql +-- LDEV-4063 Force student response +ALTER TABLE tl_lantbk11_notebook ADD COLUMN force_response bit DEFAULT 0; + +-- patch20170101.sql +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lantbk11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20190103.sql (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4743 Update tools version for LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lantbk11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file