Index: lams_tool_laqa/build.properties =================================================================== diff -u -rd53b871cf362921c3977c247e2eb7a46ce0e94fb -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_laqa/build.properties (.../build.properties) (revision d53b871cf362921c3977c247e2eb7a46ce0e94fb) +++ lams_tool_laqa/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=laqa11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=qa Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,7 +2,7 @@ uid BIGINT(20) NOT NULL AUTO_INCREMENT , qa_content_id BIGINT(20) NOT NULL , title TEXT - , instructions TEXT + , instructions MEDIUMTEXT , creation_date DATETIME , update_date DATETIME , submission_deadline DATETIME @@ -12,7 +12,7 @@ , allow_rate_answers TINYINT(1) NOT NULL DEFAULT 0 , created_by BIGINT(20) NOT NULL DEFAULT 0 , define_later TINYINT(1) NOT NULL DEFAULT 0 - , reflectionSubject TEXT + , reflectionSubject MEDIUMTEXT , lockWhenFinished TINYINT(1) NOT NULL DEFAULT 1 , showOtherAnswers TINYINT(1) NOT NULL DEFAULT 1 , allow_rich_editor TINYINT(1) NOT NULL DEFAULT 0 @@ -59,8 +59,8 @@ CREATE TABLE tl_laqa11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , question TEXT - , feedback TEXT + , question MEDIUMTEXT + , feedback MEDIUMTEXT , display_order INT(5) DEFAULT 1 , qa_content_id BIGINT(20) , answer_required TINYINT(1) NOT NULL DEFAULT 0 @@ -73,13 +73,13 @@ CREATE TABLE tl_laqa11_usr_resp ( response_id BIGINT(20) NOT NULL AUTO_INCREMENT - , answer TEXT + , answer MEDIUMTEXT , time_zone VARCHAR(255) , attempt_time DATETIME , que_usr_id BIGINT(20) NOT NULL , qa_que_content_id BIGINT(20) , visible TINYINT(1) NOT NULL DEFAULT 1 - , answer_autosaved text + , answer_autosaved MEDIUMTEXT , PRIMARY KEY (response_id) , INDEX (que_usr_id) , CONSTRAINT FK_tl_laqa11_usr_resp_3 FOREIGN KEY (que_usr_id) @@ -109,39 +109,7 @@ REFERENCES tl_laqa11_que_content(uid) ON DELETE CASCADE ON UPDATE CASCADE ); -CREATE TABLE tl_laqa11_configuration ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - config_key varchar(30), - config_value varchar(255), - PRIMARY KEY (uid), - UNIQUE KEY config_key (config_key) -); -CREATE TABLE tl_laqa11_wizard_category ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - title varchar(255) NOT NULL, - PRIMARY KEY (uid) -); - -CREATE TABLE tl_laqa11_wizard_cognitive_skill ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - title varchar(255) NOT NULL, - category_uid bigint(20), - PRIMARY KEY (uid), - CONSTRAINT FK3BA4132BCBB0DC8D FOREIGN KEY (category_uid) - REFERENCES tl_laqa11_wizard_category (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_laqa11_wizard_question ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - cognitive_skill_uid bigint(20), - title mediumtext NOT NULL, - PRIMARY KEY (uid), - CONSTRAINT FKAF08A0C7EFF77FD4 FOREIGN KEY (cognitive_skill_uid) - REFERENCES tl_laqa11_wizard_cognitive_skill (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - - ALTER TABLE tl_laqa11_session ADD CONSTRAINT FK_laqa11_session1 FOREIGN KEY (qa_group_leader_uid) REFERENCES tl_laqa11_que_usr (uid) ON DELETE SET NULL ON UPDATE CASCADE; @@ -152,25 +120,4 @@ -- data for content questions table INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('Sample Question 1?',1,1); --- Inserting the required config item into the config table -INSERT INTO tl_laqa11_configuration ( - config_key, - config_value -) -VALUES( - "enableQaWizard", - "false" -); - --- Default content for the qa wizard - --- Wizard categories -INSERT INTO tl_laqa11_wizard_category VALUES (1,'Data%20Collection'),(2,'Data%20Organization'),(3,'Data%20Analysis'),(4,'Data%20Transcendence'); - --- Wizard cognitive skills -INSERT INTO tl_laqa11_wizard_cognitive_skill VALUES (1,'2.%20Recognition',1),(2,'1.%20Observation',1),(3,'3.%20Recall',1),(4,'Ordering',2),(5,'Comparison',2),(6,'Hierarchy',2),(7,'Classification',2),(8,'Distinction%20between%20facts%20%26%20opinions/judgments',3),(9,'Analysis%20of%20basic%20parts',3),(10,'Clarification',3),(11,'Flush%20out%20relationships',3),(12,'Pattern%20recognition',3),(13,'Error%20and%20conflict%20detection',4),(14,'Summary',4),(15,'Reflection',4),(16,'Hypothesis',4),(17,'Prediction',4),(18,'Explanation',4),(19,'Empathy',4),(20,'Knowledge%20Organization',4),(21,'Application%20and%20Improvement',4),(22,'Assessment/Evaluation',4),(23,'Verification',4),(24,'Conclusion',4); - --- Wizard questions -INSERT INTO tl_laqa11_wizard_question VALUES (1,1,'Please%20identify%u2026'),(2,2,'What%20do%20you%20observe%20...'),(3,2,'What%20do%20you%20see%u2026%3F'),(4,3,'Give%20the%20definition%20of%u2026'),(5,3,'What%20is%20the%20meaning%20of%u2026%3F'),(6,3,'What%20has%20been%20said%20by%u2026%20about%u2026%3F'),(7,4,'Find%20a%20criterion%20to%20order%20these%u2026'),(8,4,'Order%20these%u2026'),(9,4,'Find%20the%205%20biggest/smallest%20%u2026'),(10,5,'Compare%20these%u2026%20using%20the%20following%20criteria%u2026'),(11,5,'Find%20the%20pros%20and%20cons%20of%u2026'),(12,5,'Find%20both%20the%20similarities%20and%20the%20differences%20between..%20and%u2026'),(13,6,'Arrange%20these%u2026by%20the%20following%20criterion%u2026'),(14,6,'Sort%20these%u2026%20by%20the%20following%20criterion%u2026'),(15,6,'Put%20these%u2026in%20an%20ascending/descending%20sequence%u2026'),(16,7,'Group%20these%20elements%20using%20the%20following%20criteria%u2026'),(17,7,'Find%20the%20pros%20and%20cons%20of%20these%u2026solutions'),(18,7,'Find%205%20%20advantages%20and%203%20disadvantages%20%20of%20%u2026'),(19,8,'Clarify%20whether%20this%20%u2026describes%20a%20fact%20or%20if%20it%20is%20a%20personal%20opinion'),(20,8,'Provide%20more%20than%20one%20view%20about%20the%20following%u2026'),(21,8,'Provide%20logical%20arguments%20to%20support%20the%20following%20statement'),(22,9,'Identify%20the%20parts/units/characteristics%20of%u2026'),(23,9,'Define%20the%20data%20given%20and%20the%20objectives%20of%u2026.'),(24,9,'Refer%20to%20the%20appropriate%20phases%20of%20the%20solution%20plan%20for%u2026'),(25,10,'What%20do%20we%20mean%20by%u2026%3F'),(26,10,'Provide%20an%20example%20to%20clarify%u2026'),(27,10,'When%20does%20this%u2026have%20a%20meaning%u2026%3F'),(28,11,'Distinguish%20possible%20relationships%20among%20the%20data%u2026'),(29,11,'Is%20there%20any%20reason%20that%20affects%20this%20phenomenon%u2026%3F'),(30,11,'Is%20there%20any%20structure%20within%u2026%3F'),(31,12,'Is%20there%20any%20pattern%20that%20is%20repeated%20in%u2026%3F'),(32,12,'Find%20out%20what%20is%20common%20in%u2026'),(33,12,'Find%20out%20what%20is%20similar%20in%u2026'),(34,13,'Point%20out%20the%20mistakes%20of/in%u2026'),(35,13,'Are%20there%20any%20contradictions%20in%u2026%3F'),(36,13,'What%20is%20missing%20in%u2026%3F'),(37,14,'Form%20an%20abstract%20of%20%u2026%28number%29%20words%20to%20describe%u2026'),(38,14,'Which%20are%20the%20main%20points%20of%20%u2026'),(39,14,'Which%20are%20the%20top%205%20essential%20points%20of%20%u2026'),(40,15,'What%20have%20you%20learnt%20about%u2026%3F'),(41,15,'Are%20there%20any%20points%20that%20you%u2026%3F'),(42,16,'If%20%u2026%20then%u2026'),(43,17,'Could%20you%20make%20any%20predictions%20about%u2026%3F'),(44,17,'If%20we%20do%u2026then%20what%20will%20happen%3F'),(45,17,'In%20the%20case%20of%u2026find%20out%u2026'),(46,18,'Please%20explain%20how%20the%20meaning%20of%u2026'),(47,18,'Please%20explain%20why%20the%20meaning%20of/%u2026'),(48,18,'Please%20explain%20what%20the%20meaning%20of%20%u2026'),(49,18,'Please%20explain%20in%20your%20own%20words%u2026'),(50,18,'Please%20explain%20in%20your%20own%20words%u2026'),(51,19,'Could%20you%20accept%20the%20role%20of%u2026%3F'),(52,19,'What%20are%20the%20possible%20arguments%20of%20others%20for%u2026%3F'),(53,19,'What%20would%20be%20your%20answer%20if%20you%20were%20in%20the%20position%20of%u2026%3F'),(54,20,'Make%20a%20hierarchical%20tree%20to%20describe%u2026'),(55,20,'Can%20you%20form%20a%20sequential%20structure%20of%u2026%3F'),(56,20,'Characterize%20it%20according%20to%20the%20following%20criteria%u2026'),(57,21,'How%20can%20you%20improve%20this%u2026in%20order%20to%u2026%3F'),(58,21,'How%20can%20you%20apply%20this%u2026in%20order%20to%u2026%3F'),(59,22,'Assess%20this%u2026'),(60,22,'Evaluate%20the%u2026'),(61,22,'What%20kind%20of%20criteria%20can%20you%20use%20to%20evaluate%20the%u2026%3F'),(62,23,'Please%20verify%20that%u2026'),(63,23,'Please%20confirm%20that%u2026'),(64,24,'Based%20on%20this%u2026what%20do%20you%20conclude%3F'),(65,24,'Based%20on%20these%u2026what%20do%20you%20conclude%3F'),(66,24,'Are%20there%20any%20exceptions%20to%u2026%3F'),(67,24,'Are%20there%20any%20weak%20points%20in%u2026%3F'); - SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_laqa/db/sql/db_version_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_laqa/db/sql/db_version_insert.sql (.../db_version_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/db/sql/db_version_insert.sql (.../db_version_insert.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -1,2 +1 @@ - INSERT INTO patches VALUES ('@signature@', '@tool_version@', NOW(), 'F'); \ No newline at end of file Index: lams_tool_laqa/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_laqa/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -1,4 +1,3 @@ --- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) INSERT INTO lams_tool ( tool_signature, @@ -19,8 +18,7 @@ language_file, create_date_time, modified_date_time, -supports_outputs, -admin_url +supports_outputs ) VALUES ( @@ -32,16 +30,15 @@ '@tool_version@', 0, 2, -'tool/laqa11/learningStarter.do?mode=learner', -'tool/laqa11/learningStarter.do?mode=author', -'tool/laqa11/learningStarter.do?mode=teacher', -'tool/laqa11/authoringStarter.do', -'tool/laqa11/monitoringStarter.do', -'tool/laqa11/pedagogicalPlanner.do', +'tool/laqa11/learning/learning.do?mode=learner', +'tool/laqa11/learning/learning.do?mode=author', +'tool/laqa11/learning/learning.do?mode=teacher', +'tool/laqa11/authoring/authoring.do', +'tool/laqa11/monitoring/monitoring.do', +'tool/laqa11/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laqa11', 'org.lamsfoundation.lams.tool.qa.ApplicationResources', NOW(), NOW(), -1, -'tool/laqa11/laqa11admin.do' +1 ) \ No newline at end of file Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140101.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140812.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140822.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20150511.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20150619.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20151006.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160325.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160416.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,112 @@ +-- 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-3155 adding all the leader aware tools (lamc,assessment,qa) to regular LAMS +ALTER TABLE tl_laqa11_content ADD COLUMN use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE tl_laqa11_session ADD COLUMN qa_group_leader_uid BIGINT; +ALTER TABLE tl_laqa11_session ADD INDEX FK_laqa11_session1 (qa_group_leader_uid), ADD CONSTRAINT FK_laqa11_session1 FOREIGN KEY (qa_group_leader_uid) REFERENCES tl_laqa11_que_usr (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +-- Adding a constraint to the QA user table so no same que_usr_id and qa_session_id can be repetead +-- In order to achieve this remove duplicate users and according responses. +CREATE TEMPORARY TABLE temp_select AS SELECT MAX(uid) uid FROM tl_laqa11_que_usr GROUP BY que_usr_id, qa_session_id; +ALTER TABLE temp_select ADD INDEX index1 (uid ASC); +DELETE FROM tl_laqa11_usr_resp WHERE que_usr_id NOT IN (SELECT uid FROM temp_select); +DELETE FROM tl_laqa11_que_usr WHERE uid NOT IN (SELECT uid FROM temp_select); +DROP TEMPORARY TABLE temp_select; + +ALTER TABLE tl_laqa11_que_usr ADD UNIQUE INDEX(que_usr_id, qa_session_id); + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_laqa11_content DROP COLUMN online_instructions; +ALTER TABLE tl_laqa11_content DROP COLUMN offline_instructions; +ALTER TABLE tl_laqa11_content DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_laqa11_uploadedfile; + +-- LDEV-3236 Ability to change, add, remove Q&A questions even after student have reached it +ALTER TABLE tl_laqa11_content DROP COLUMN content_inUse; +ALTER TABLE tl_laqa11_content DROP COLUMN synch_in_monitor; +ALTER TABLE tl_laqa11_content ADD COLUMN notify_response_submit TINYINT(1) NOT NULL DEFAULT 0; + +-- LDEV-3292: Add missing indexes +CREATE INDEX tl_laqa11_content_qa_content_id ON tl_laqa11_content(qa_content_id); +CREATE INDEX tl_laqa11_session_qa_session_id ON tl_laqa11_session(qa_session_id); + +-- LDEV-3295 Allow questions having user responses with ratings be deleted +ALTER TABLE tl_laqa11_response_rating DROP FOREIGN KEY FK_tl_laqa11_response_rating_2 ; +ALTER TABLE tl_laqa11_response_rating ADD CONSTRAINT FK_tl_laqa11_response_rating_2 FOREIGN KEY (response_id ) REFERENCES tl_laqa11_usr_resp (response_id) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV- Set max and min rates limits +ALTER TABLE tl_laqa11_content ADD COLUMN minimum_rates integer DEFAULT 0; +ALTER TABLE tl_laqa11_content ADD COLUMN maximum_rates integer DEFAULT 0; +ALTER TABLE tl_laqa11_que_content ADD COLUMN min_words_limit integer DEFAULT 0; + +-- LDEV-3487 Don't allow question redos +ALTER TABLE tl_laqa11_content ADD COLUMN no_reedit_allowed TINYINT(1) NOT NULL DEFAULT 0; + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_laqa11_session ADD UNIQUE (qa_session_id); + +-- LDEV-3568 Move old rating data into the new DB model +INSERT INTO lams_rating_criteria (title, rating_criteria_type_id, comments_enabled, order_id, tool_content_id) +SELECT "", 3, false, 1, qa_content_id +FROM tl_laqa11_content WHERE allow_rate_answers=TRUE; + +INSERT INTO lams_rating (rating_criteria_id, item_id, user_id, rating) +SELECT criteria.rating_criteria_id, rating.response_id, rating.user_id, rating.rating +FROM tl_laqa11_response_rating rating, tl_laqa11_usr_resp response, tl_laqa11_que_content question, tl_laqa11_content qa, lams_rating_criteria criteria + WHERE response.response_id=rating.response_id AND response.qa_que_content_id=question.uid AND qa.uid=question.qa_content_id AND qa.qa_content_id=criteria.tool_content_id AND criteria.order_id=1; + +DROP TABLE tl_laqa11_response_rating; + +-- LDEV-3640 Add necessary cascades + +ALTER TABLE tl_laqa11_que_content DROP FOREIGN KEY FK_tl_laqa11_que_content_1; +ALTER TABLE tl_laqa11_que_content ADD CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (`qa_content_id`) +REFERENCES `tl_laqa11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_que_usr DROP FOREIGN KEY FK_tl_laqa11_que_usr_1; +ALTER TABLE tl_laqa11_que_usr ADD CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (`qa_session_id`) +REFERENCES `tl_laqa11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_session DROP FOREIGN KEY FK_laqa11_session1; +ALTER TABLE tl_laqa11_session ADD CONSTRAINT FK_laqa11_session1 FOREIGN KEY (`qa_group_leader_uid`) +REFERENCES `tl_laqa11_que_usr` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_session DROP FOREIGN KEY FK_tl_laqa11_session_1; +ALTER TABLE tl_laqa11_session ADD CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (`qa_content_id`) +REFERENCES `tl_laqa11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_usr_resp MODIFY COLUMN qa_que_content_id BIGINT(20) DEFAULT NULL; +ALTER TABLE tl_laqa11_usr_resp DROP FOREIGN KEY FK_tl_laqa11_usr_resp_2; +ALTER TABLE tl_laqa11_usr_resp ADD CONSTRAINT FK_tl_laqa11_usr_resp_2 FOREIGN KEY (`qa_que_content_id`) +REFERENCES `tl_laqa11_que_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_usr_resp DROP FOREIGN KEY FK_tl_laqa11_usr_resp_3; +ALTER TABLE tl_laqa11_usr_resp ADD CONSTRAINT FK_tl_laqa11_usr_resp_3 FOREIGN KEY (`que_usr_id`) +REFERENCES `tl_laqa11_que_usr` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_wizard_cognitive_skill DROP FOREIGN KEY FK3BA4132BCBB0DC8D; +ALTER TABLE tl_laqa11_wizard_cognitive_skill ADD CONSTRAINT FK3BA4132BCBB0DC8D FOREIGN KEY (`category_uid`) +REFERENCES `tl_laqa11_wizard_category` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laqa11_wizard_question DROP FOREIGN KEY FKAF08A0C7EFF77FD4; +ALTER TABLE tl_laqa11_wizard_question ADD CONSTRAINT FKAF08A0C7EFF77FD4 FOREIGN KEY (`cognitive_skill_uid`) +REFERENCES `tl_laqa11_wizard_cognitive_skill` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-3730 while re-editing a question autosaves overwrite submitted reponse +ALTER TABLE tl_laqa11_usr_resp ADD COLUMN answer_autosaved TEXT; + +-- LDEV-3751 Prevent students from submitting questions but allow them to view responses +ALTER TABLE tl_laqa11_content ADD COLUMN show_other_answers_after_deadline TINYINT(1) NOT NULL DEFAULT 0; + +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='laqa11'; + +----------------------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_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='laqa11'; + +----------------------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_larsrc/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_larsrc/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=larsrc11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=rsrc \ No newline at end of file Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -6,15 +6,15 @@ 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, allow_add_files TINYINT(1), allow_add_urls TINYINT(1), mini_view_resource_number integer, allow_auto_run TINYINT(1), - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity TINYINT(1), assigment_submit_notify TINYINT(1) DEFAULT 0, file_upload_notify TINYINT(1) DEFAULT 0, @@ -74,6 +74,8 @@ resource_uid bigint, session_uid bigint, order_id integer, + is_allow_rating TINYINT(1) default 0, + is_allow_comments TINYINT(1) default 0, primary key (uid), CONSTRAINT FKF52D1F9330E79035 FOREIGN KEY (resource_uid) REFERENCES tl_larsrc11_resource (uid) ON DELETE CASCADE ON UPDATE CASCADE, @@ -85,7 +87,7 @@ create table tl_larsrc11_item_instruction ( uid bigint not null auto_increment, - description text, + description MEDIUMTEXT, sequence_id integer, item_uid bigint, primary key (uid), @@ -120,7 +122,7 @@ (1,'Resources','0','Instructions ',0,0,${default_content_id},0,0,0,0,0); INSERT INTO tl_larsrc11_resource_item (uid, title, url,create_date, create_by_author, is_hide, item_type, open_url_new_window, resource_uid,order_id) VALUES - (1,'Web Search','http://www.google.com ',NOW(),1,0,1,0,1,1); + (1,'Web Search','http://www.google.com ',NOW(),1,0,1,1,1,1); INSERT INTO tl_larsrc11_item_instruction (uid, description, sequence_id, item_uid) VALUES (1,'Use Google to search the web',0,1); Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20130107.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20150218.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20160421.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,98 @@ +-- 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-2941 Enable the option "Open URL in pop-up" for the example URL by default +UPDATE tl_larsrc11_resource_item SET open_url_new_window=1 WHERE uid='1'; + +-- LDEV-3153 Enlarge instructions field for Share Resource +ALTER TABLE tl_larsrc11_item_instruction MODIFY description TEXT; + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_larsrc11_resource DROP COLUMN online_instructions; +ALTER TABLE tl_larsrc11_resource DROP COLUMN offline_instructions; +ALTER TABLE tl_larsrc11_resource DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_larsrc11_attachment; + +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_larsrc11_resource MODIFY COLUMN reflect_instructions text; + +-- LDEV-3292 These indexes will help Hibernate. +CREATE INDEX idx_user_user_id ON tl_larsrc11_user(user_id); +CREATE INDEX idx_item_log_session_id ON tl_larsrc11_item_log(session_id); + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_larsrc11_session ADD UNIQUE (session_id); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_larsrc11_item_instruction DROP FOREIGN KEY FKA5665013980570ED; +ALTER TABLE tl_larsrc11_item_instruction ADD CONSTRAINT FKA5665013980570ED FOREIGN KEY (`item_uid`) +REFERENCES `tl_larsrc11_resource_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_item_log DROP FOREIGN KEY FK693580A438BF8DFE; +ALTER TABLE tl_larsrc11_item_log ADD CONSTRAINT FK693580A438BF8DFE FOREIGN KEY (`resource_item_uid`) +REFERENCES `tl_larsrc11_resource_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_item_log DROP FOREIGN KEY FK693580A441F9365D; +ALTER TABLE tl_larsrc11_item_log ADD CONSTRAINT FK693580A441F9365D FOREIGN KEY (`user_uid`) +REFERENCES `tl_larsrc11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_resource DROP FOREIGN KEY FK89093BF758092FB; +ALTER TABLE tl_larsrc11_resource ADD CONSTRAINT FK89093BF758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_larsrc11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_resource_item DROP FOREIGN KEY FKF52D1F9330E79035; +ALTER TABLE tl_larsrc11_resource_item ADD CONSTRAINT FKF52D1F9330E79035 FOREIGN KEY (`resource_uid`) +REFERENCES `tl_larsrc11_resource` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_resource_item DROP FOREIGN KEY FKF52D1F93758092FB; +ALTER TABLE tl_larsrc11_resource_item ADD CONSTRAINT FKF52D1F93758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_larsrc11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_resource_item DROP FOREIGN KEY FKF52D1F93EC0D3147; +ALTER TABLE tl_larsrc11_resource_item ADD CONSTRAINT FKF52D1F93EC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_larsrc11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_session DROP FOREIGN KEY FK24AA78C530E79035; +ALTER TABLE tl_larsrc11_session ADD CONSTRAINT FK24AA78C530E79035 FOREIGN KEY (`resource_uid`) +REFERENCES `tl_larsrc11_resource` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_user DROP FOREIGN KEY FK30113BFCEC0D3147; +ALTER TABLE tl_larsrc11_user ADD CONSTRAINT FK30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_larsrc11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_larsrc11_user DROP FOREIGN KEY FK30113BFC309ED320; +ALTER TABLE tl_larsrc11_user ADD CONSTRAINT FK30113BFC309ED320 FOREIGN KEY (`resource_uid`) +REFERENCES `tl_larsrc11_resource` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +-- LDEV-3760 Add notification on file upload +ALTER TABLE tl_larsrc11_resource ADD COLUMN file_upload_notify tinyint DEFAULT 0; + +-- LDEV-4180 +ALTER TABLE tl_larsrc11_resource 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), + MODIFY COLUMN allow_add_files TINYINT(1), + MODIFY COLUMN allow_add_urls TINYINT(1), + MODIFY COLUMN assigment_submit_notify TINYINT(1), + MODIFY COLUMN file_upload_notify TINYINT(1); + +ALTER TABLE tl_larsrc11_resource_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_larsrc11_item_log MODIFY COLUMN complete TINYINT(1); + +ALTER TABLE tl_larsrc11_user MODIFY COLUMN session_finished TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='larsrc11'; + +----------------------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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='larsrc11'; + +----------------------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_nb/db/sql/create_lams_tool_nb.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- 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 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,10 +2,10 @@ 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 Index: lams_tool_pixlr/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_pixlr/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_pixlr/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lapixl10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=pixlr \ No newline at end of file Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,34 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lapixl10_pixlr DROP COLUMN online_instructions; +ALTER TABLE tl_lapixl10_pixlr DROP COLUMN offline_instructions; +ALTER TABLE tl_lapixl10_pixlr DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lapixl10_attachment; + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lapixl10_session ADD UNIQUE (session_id); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lapixl10_session DROP FOREIGN KEY FKE5C05E7FCB8ADA74; +ALTER TABLE tl_lapixl10_session ADD CONSTRAINT FKE5C05E7FCB8ADA74 FOREIGN KEY (`pixlr_uid`) +REFERENCES `tl_lapixl10_pixlr` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lapixl10_user DROP FOREIGN KEY FK9A39C08236E23005; +ALTER TABLE tl_lapixl10_user ADD CONSTRAINT FK9A39C08236E23005 FOREIGN KEY (`pixlr_session_uid`) +REFERENCES `tl_lapixl10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lapixl10'; + +----------------------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_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lapixl10'; + +----------------------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_preview/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_preview/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_preview/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=laprev11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=peerreview Index: lams_tool_preview/db/sql/create_lams_tool_peerreview.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_preview/db/sql/create_lams_tool_peerreview.sql (.../create_lams_tool_peerreview.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_preview/db/sql/create_lams_tool_peerreview.sql (.../create_lams_tool_peerreview.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -8,11 +8,11 @@ title varchar(255), lock_on_finished TINYINT(1), show_ratings_left_for_user TINYINT(1) DEFAULT 1, - instructions text, + instructions MEDIUMTEXT, content_in_use TINYINT(1), define_later TINYINT(1), content_id bigint, - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity TINYINT(1), minimum_rates integer DEFAULT 0, maximum_rates integer DEFAULT 0, @@ -47,6 +47,7 @@ session_finished TINYINT(1), session_uid bigint, peerreview_uid bigint, + hidden TINYINT(1) DEFAULT '0', primary key (uid), UNIQUE KEY prev11uniqusersession (user_id,session_uid), CONSTRAINT FK_NEW_1661738138_30113BFC309ED320 FOREIGN KEY (peerreview_uid) @@ -55,7 +56,6 @@ REFERENCES tl_laprev11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE ); - ALTER TABLE tl_laprev11_peerreview ADD CONSTRAINT FK_NEW_1661738138_89093BF758092FB FOREIGN KEY (create_by) REFERENCES tl_laprev11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20150825.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161004.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161226.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,59 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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------------------------- + +ALTER TABLE `tl_laprev11_user` +ADD UNIQUE INDEX `prev11uniqusersession` (`user_id` ASC, `session_uid` ASC); + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_laprev11_session ADD UNIQUE (session_id); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_laprev11_peerreview DROP FOREIGN KEY FK_NEW_1661738138_89093BF758092FB; +ALTER TABLE tl_laprev11_peerreview ADD CONSTRAINT FK_NEW_1661738138_89093BF758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_laprev11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_laprev11_session DROP FOREIGN KEY FK_NEW_1661738138_24AA78C530E79035; +ALTER TABLE tl_laprev11_session ADD CONSTRAINT FK_NEW_1661738138_24AA78C530E79035 FOREIGN KEY (`peerreview_uid`) +REFERENCES `tl_laprev11_peerreview` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laprev11_user DROP FOREIGN KEY FK_NEW_1661738138_30113BFC309ED320; +ALTER TABLE tl_laprev11_user ADD CONSTRAINT FK_NEW_1661738138_30113BFC309ED320 FOREIGN KEY (`peerreview_uid`) +REFERENCES `tl_laprev11_peerreview` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_laprev11_user DROP FOREIGN KEY FK_NEW_1661738138_30113BFCEC0D3147; +ALTER TABLE tl_laprev11_user ADD CONSTRAINT FK_NEW_1661738138_30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_laprev11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-3767 Peer review: two new review methods. Allow for self review +ALTER TABLE tl_laprev11_peerreview ADD COLUMN self_review TINYINT(4) DEFAULT '0'; + +-- LDEV-3767 Peer review: two new review methods. Allow monitor to email results to users +ALTER TABLE tl_laprev11_peerreview ADD COLUMN notify_users_of_results TINYINT(4) DEFAULT '1'; + +-- LDEV-4161: enhancements. Differentiate between showing results left for user and results left by user +ALTER TABLE tl_laprev11_peerreview ADD COLUMN show_ratings_left_by_user TINYINT(4) DEFAULT '0'; + +-- LDEV-4180 +ALTER TABLE tl_laprev11_peerreview MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN show_ratings_left_for_user TINYINT(1) DEFAULT 1, + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN self_review TINYINT(1) DEFAULT 0, + MODIFY COLUMN notify_users_of_results TINYINT(1) DEFAULT 1, + MODIFY COLUMN show_ratings_left_by_user TINYINT(1) DEFAULT 0; + +ALTER TABLE tl_laprev11_user MODIFY COLUMN session_finished TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='laprev11'; + +----------------------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_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='laprev11'; + +----------------------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_sbmt/build.properties =================================================================== diff -u -rd53b871cf362921c3977c247e2eb7a46ce0e94fb -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_sbmt/build.properties (.../build.properties) (revision d53b871cf362921c3977c247e2eb7a46ce0e94fb) +++ lams_tool_sbmt/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=lasbmt11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=sbmt Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql (.../create_lams_tool_sbmt.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql (.../create_lams_tool_sbmt.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -3,11 +3,11 @@ create table tl_lasbmt11_content ( content_id bigint not null, title varchar(255) not null, - instruction text, + instruction MEDIUMTEXT, define_later TINYINT(1), content_in_use TINYINT(1), lock_on_finished TINYINT(1), - reflect_instructions TEXT, + reflect_instructions MEDIUMTEXT, reflect_on_activity TINYINT(1), limit_upload TINYINT(1), limit_upload_number integer, @@ -17,6 +17,7 @@ submission_deadline datetime, mark_release_notify TINYINT(1) DEFAULT 0, file_submit_notify TINYINT(1) DEFAULT 0, + use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0, primary key (content_id) ); @@ -25,9 +26,14 @@ status TINYINT(1), content_id bigint, session_name varchar(250), - primary key (session_id), + group_leader_uid BIGINT, + marks_released TINYINT(1) DEFAULT 0, + PRIMARY KEY (session_id), + KEY FK_lasbmt11_session_1 (group_leader_uid), CONSTRAINT FKEC8C77C9785A173A FOREIGN KEY (content_id) - REFERENCES tl_lasbmt11_content (content_id) ON DELETE CASCADE ON UPDATE CASCADE + REFERENCES tl_lasbmt11_content (content_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT tl_lasbmt11_session FOREIGN KEY (group_leader_uid) + REFERENCES tl_lasbmt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE ); create table tl_lasbmt11_user ( @@ -39,7 +45,8 @@ login_name varchar(255), last_name varchar(255), content_id bigint, - primary key (uid), + PRIMARY KEY (uid), + UNIQUE KEY user_id (user_id, session_id), KEY session_id (session_id), CONSTRAINT tl_lasbmt11_user_ibfk_1 FOREIGN KEY (session_id) REFERENCES tl_lasbmt11_session (session_id) ON DELETE CASCADE ON UPDATE CASCADE @@ -48,7 +55,7 @@ create table tl_lasbmt11_submission_details ( submission_id bigint not null auto_increment, filePath varchar(250), - fileDescription text, + fileDescription MEDIUMTEXT, date_of_submission datetime, uuid bigint, version_id bigint, @@ -64,13 +71,12 @@ create table tl_lasbmt11_report ( report_id bigint not null auto_increment, - comments text, + comments MEDIUMTEXT, marks float, - date_marks_released datetime, mark_file_uuid bigint, mark_file_version_id bigint, mark_file_name varchar(255), - primary key (report_id), + PRIMARY KEY (report_id), CONSTRAINT tl_lasbmt11_report_ibfk_1 FOREIGN KEY (report_id) REFERENCES tl_lasbmt11_submission_details (submission_id) ON DELETE CASCADE ON UPDATE CASCADE ); Index: lams_tool_sbmt/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_sbmt/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -29,12 +29,12 @@ '@tool_version@', 0, 2, -'tool/lasbmt11/learner.do?mode=learner', -'tool/lasbmt11/learner.do?mode=author', -'tool/lasbmt11/learner.do?mode=teacher', -'tool/lasbmt11/authoring.do', -'tool/lasbmt11/monitoring.do', -'tool/lasbmt11/pedagogicalPlanner.do', +'tool/lasbmt11/learning/learner.do', +'tool/lasbmt11/learning/author.do', +'tool/lasbmt11/learning/teacher.do', +'tool/lasbmt11/authoring/authoring.do', +'tool/lasbmt11/monitoring/monitoring.do', +'tool/lasbmt11/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasbmt11', 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources', NOW(), Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20140407.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20140520.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20160828.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20161025.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,73 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lasbmt11_content DROP COLUMN online_instruction; +ALTER TABLE tl_lasbmt11_content DROP COLUMN offline_instruction; +ALTER TABLE tl_lasbmt11_content DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lasbmt11_instruction_files; + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lasbmt11_content MODIFY title varchar(255) not null; +ALTER TABLE tl_lasbmt11_content MODIFY reflect_instructions text; + +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_lasbmt11_content MODIFY COLUMN reflect_instructions text; + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lasbmt11_content DROP FOREIGN KEY FKAEF329AC172BC670; +ALTER TABLE tl_lasbmt11_content ADD CONSTRAINT FKAEF329AC172BC670 FOREIGN KEY (`created_by`) +REFERENCES `tl_lasbmt11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lasbmt11_session DROP FOREIGN KEY FKEC8C77C9785A173A; +ALTER TABLE tl_lasbmt11_session ADD CONSTRAINT FKEC8C77C9785A173A FOREIGN KEY (`content_id`) +REFERENCES `tl_lasbmt11_content` (`content_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasbmt11_submission_details DROP FOREIGN KEY FK1411A53C93C861A; +ALTER TABLE tl_lasbmt11_submission_details ADD CONSTRAINT FK1411A53C93C861A FOREIGN KEY (`session_id`) +REFERENCES `tl_lasbmt11_session` (`session_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasbmt11_submission_details DROP FOREIGN KEY FK1411A53CFFD5A38B; +ALTER TABLE tl_lasbmt11_submission_details ADD CONSTRAINT FK1411A53CFFD5A38B FOREIGN KEY (`learner_id`) +REFERENCES `tl_lasbmt11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +DELETE FROM tl_lasbmt11_report WHERE report_id NOT IN (SELECT submission_id FROM tl_lasbmt11_submission_details); +ALTER TABLE tl_lasbmt11_report ADD FOREIGN KEY (`report_id`) +REFERENCES `tl_lasbmt11_submission_details` (`submission_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +DELETE FROM tl_lasbmt11_user WHERE session_id NOT IN (SELECT session_id FROM tl_lasbmt11_session); +ALTER TABLE tl_lasbmt11_user ADD FOREIGN KEY (`session_id`) +REFERENCES `tl_lasbmt11_session` (`session_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-3688 Ability to remove/delete files from sbmt files +ALTER TABLE tl_lasbmt11_submission_details +ADD COLUMN `removed` TINYINT(1) NOT NULL DEFAULT 0; + +-- LDEV-4022 Increase the file description size (currently at 255 characters) +ALTER TABLE tl_lasbmt11_submission_details MODIFY fileDescription text; + +-- LDEV-4180 +ALTER TABLE tl_lasbmt11_content MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN limit_upload TINYINT(1), + MODIFY COLUMN mark_release_notify TINYINT(1) DEFAULT 0, + MODIFY COLUMN file_submit_notify TINYINT(1) DEFAULT 0; + +ALTER TABLE tl_lasbmt11_session MODIFY COLUMN status TINYINT(1); + +ALTER TABLE tl_lasbmt11_user MODIFY COLUMN finished TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lasbmt11'; + +----------------------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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lasbmt11'; + +----------------------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_scratchie/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_scratchie/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,7 +2,7 @@ min.server.version.number=3.0 signature=lascrt11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=scratchie Index: lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql (.../create_lams_tool_scratchie.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql (.../create_lams_tool_scratchie.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -6,15 +6,19 @@ update_date datetime, create_by bigint, title varchar(255), - instructions text, + instructions MEDIUMTEXT, define_later TINYINT(1), content_id bigint, - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity TINYINT(1), extra_point TINYINT(1), submission_deadline datetime, burning_questions_enabled TINYINT(1) DEFAULT 1, time_limit int(11) DEFAULT 0, + shuffle_items TINYINT(1) DEFAULT 0, + confidence_levels_activity_uiid INT(11), + preset_marks varchar(255), + show_scratchies_in_results TINYINT(1) DEFAULT 1, PRIMARY KEY (uid), UNIQUE KEY content_id (content_id) ); @@ -45,21 +49,18 @@ login_name varchar(255), session_finished TINYINT(1), scratching_finished TINYINT(1), - session_uid bigint, scratchie_uid bigint, primary key (uid), UNIQUE KEY user_id (user_id,session_uid), KEY userIdIndex (user_id), - CONSTRAINT FK_NEW_610529188_30113BFC309ED320 FOREIGN KEY (scratchie_uid) - REFERENCES tl_lascrt11_scratchie (uid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT FK_NEW_610529188_30113BFCEC0D3147 FOREIGN KEY (session_uid) REFERENCES tl_lascrt11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE ); create table tl_lascrt11_scratchie_item ( uid bigint not null auto_increment, title varchar(255), - description text, + description MEDIUMTEXT, create_date datetime, create_by_author TINYINT(1), scratchie_uid bigint, @@ -74,7 +75,7 @@ create table tl_lascrt11_scratchie_answer ( uid bigint not null auto_increment, - description text, + description MEDIUMTEXT, correct TINYINT(1), scratchie_item_uid bigint, order_id integer, Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130808.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130912.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130923.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131008.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131009.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131130.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140505.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140613.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150903.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160329.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160720.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20161205.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,189 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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------------------------- + +-- LKC-15 adding a constraint to the scratchie user table so no same user_id and session_id can be repetead +ALTER TABLE tl_lascrt11_user ADD UNIQUE INDEX(user_id, session_uid); + +-- LKC-28 Ability to modify marks in monitor +ALTER TABLE tl_lascrt11_user ADD COLUMN mark INTEGER DEFAULT 0; + +-- LKC-22 Remove cloumn that is not used any longer +ALTER TABLE tl_lascrt11_scratchie DROP COLUMN show_results_page; + +-- LKC-34 Scratchie to have a time limitation in monitor +ALTER TABLE tl_lascrt11_scratchie ADD COLUMN submission_deadline DATETIME DEFAULT null; + +-- LKC-35 Be able import learning design with Scratchie tool exported from another server +ALTER TABLE tl_lascrt11_scratchie_item DROP FOREIGN KEY FK_NEW_610529188_F52D1F93758092FB; +ALTER TABLE tl_lascrt11_scratchie_item DROP COLUMN create_by; + +-- LKC-40 prevent Massive load of DB when accessing tool with 20+ users +ALTER TABLE tl_lascrt11_user ADD INDEX userIdIndex (user_id); +ALTER TABLE tl_lascrt11_session ADD INDEX sessionIdIndex (session_id); + +-- LKC-40 +-- Remove logs belong to all other users except leader +DROP TABLE IF EXISTS temp_select; +CREATE TEMPORARY TABLE temp_select AS SELECT group_leader_uid uid FROM tl_lascrt11_session WHERE group_leader_uid IS NOT NULL; +ALTER TABLE temp_select ADD INDEX index1 (uid ASC); +DELETE FROM tl_lascrt11_answer_log WHERE user_uid NOT IN (SELECT uid FROM temp_select); +DROP TEMPORARY TABLE temp_select; + +--Make ScratchieAnswerVisitLog belong to session and not user, thus being shared by all users +ALTER TABLE tl_lascrt11_answer_log DROP FOREIGN KEY FK_NEW_610529188_693580A441F9365D; +ALTER TABLE tl_lascrt11_answer_log DROP INDEX FK_NEW_610529188_693580A441F9365D; +ALTER TABLE tl_lascrt11_answer_log DROP COLUMN user_uid; + +-- Make mark belong to session and not user, thus being shared by all users +ALTER TABLE tl_lascrt11_session ADD COLUMN mark INTEGER DEFAULT 0; +UPDATE tl_lascrt11_session, tl_lascrt11_user + SET tl_lascrt11_session.mark = tl_lascrt11_user.mark + WHERE tl_lascrt11_user.uid = tl_lascrt11_session.group_leader_uid; +ALTER TABLE tl_lascrt11_user DROP COLUMN mark; + +-- Make scratching_finished flag belong to session and not user, thus being shared by all users +ALTER TABLE tl_lascrt11_session ADD COLUMN scratching_finished smallint DEFAULT 0; +UPDATE tl_lascrt11_session, tl_lascrt11_user + SET tl_lascrt11_session.scratching_finished = tl_lascrt11_user.scratching_finished + WHERE tl_lascrt11_user.uid = tl_lascrt11_session.group_leader_uid; +ALTER TABLE tl_lascrt11_user DROP COLUMN scratching_finished; + +ALTER TABLE tl_lascrt11_session ADD UNIQUE INDEX session_id_UNIQUE (session_id ASC); +ALTER TABLE tl_lascrt11_answer_log ADD INDEX sessionIdIndex (session_id), ADD CONSTRAINT sessionIdIndex FOREIGN KEY (session_id) REFERENCES tl_lascrt11_session (session_id); +ALTER TABLE tl_lascrt11_scratchie_answer ADD INDEX FK_scratchie_answer_1 (scratchie_item_uid), ADD CONSTRAINT FK_scratchie_answer_1 FOREIGN KEY (scratchie_item_uid) REFERENCES tl_lascrt11_scratchie_item (uid); + +--Remove create_by from tl_lascrt11_scratchie +ALTER TABLE tl_lascrt11_scratchie DROP FOREIGN KEY FK_NEW_610529188_89093BF758092FB; +ALTER TABLE tl_lascrt11_scratchie DROP INDEX FK_NEW_610529188_89093BF758092FB; +ALTER TABLE tl_lascrt11_scratchie DROP COLUMN create_by; + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lascrt11_scratchie DROP COLUMN online_instructions; +ALTER TABLE tl_lascrt11_scratchie DROP COLUMN offline_instructions; +ALTER TABLE tl_lascrt11_scratchie DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lascrt11_attachment; + +-- LDEV-3224 Ability to change, add, remove questions even after student have reached it +ALTER TABLE tl_lascrt11_scratchie DROP COLUMN content_in_use; + +-- LDEV-3251 Create configurable grading scale for scratchie +CREATE TABLE tl_lascrt11_configuration ( + uid BIGINT NOT NULL auto_increment, + config_key VARCHAR(30) UNIQUE, + config_value VARCHAR(255), + PRIMARY KEY (uid) +)ENGINE=InnoDB; +UPDATE lams_tool SET admin_url='tool/lascrt11/admin/start.do' WHERE tool_signature='lascrt11'; + +INSERT INTO `tl_lascrt11_configuration` (`config_key`, `config_value`) VALUES + ('isEnabledExtraPointOption', 'true'); +INSERT INTO `tl_lascrt11_configuration` (`config_key`, `config_value`) VALUES + ('presetMarks', '4,2,1,0'); + +-- LDEV- +ALTER TABLE tl_lascrt11_scratchie ADD COLUMN burning_questions_enabled TINYINT DEFAULT 1; +CREATE TABLE tl_lascrt11_burning_question ( + uid bigint NOT NULL auto_increment, + access_date DATETIME, + scratchie_item_uid BIGINT, + session_id BIGINT, + question TEXT, + general_question tinyint, + PRIMARY KEY (uid) +)ENGINE=InnoDB; +ALTER TABLE tl_lascrt11_burning_question ADD INDEX FK_NEW_610529188_693580A438BF8DF2 (scratchie_item_uid), ADD CONSTRAINT FK_NEW_610529188_693580A438BF8DF2 FOREIGN KEY (scratchie_item_uid) REFERENCES tl_lascrt11_scratchie_item (uid); +ALTER TABLE tl_lascrt11_burning_question ADD INDEX sessionIdIndex2 (session_id), ADD CONSTRAINT sessionIdIndex2 FOREIGN KEY (session_id) REFERENCES tl_lascrt11_session (session_id); + +-- LDEV-3548 Prevent Scratchie tool from storing duplicate scratches done by the same user +ALTER TABLE `tl_lascrt11_answer_log` ADD UNIQUE `FK_NEW_lascrt11_30113BFC309ED321`(`scratchie_answer_uid`, `session_id`); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lascrt11_scratchie_answer DROP FOREIGN KEY FK_scratchie_answer_1; +ALTER TABLE tl_lascrt11_scratchie_answer ADD CONSTRAINT FK_scratchie_answer_1 FOREIGN KEY (`scratchie_item_uid`) +REFERENCES `tl_lascrt11_scratchie_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_scratchie_item DROP FOREIGN KEY FK_NEW_610529188_F52D1F9330E79035; +ALTER TABLE tl_lascrt11_scratchie_item ADD CONSTRAINT FK_NEW_610529188_F52D1F9330E79035 FOREIGN KEY (`scratchie_uid`) +REFERENCES `tl_lascrt11_scratchie` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_scratchie_item DROP FOREIGN KEY FK_NEW_610529188_F52D1F93EC0D3147; +ALTER TABLE tl_lascrt11_scratchie_item ADD CONSTRAINT FK_NEW_610529188_F52D1F93EC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_lascrt11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_session DROP FOREIGN KEY FK_lalead11_session1; +ALTER TABLE tl_lascrt11_session ADD CONSTRAINT FK_lalead11_session1 FOREIGN KEY (`group_leader_uid`) +REFERENCES `tl_lascrt11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_session DROP FOREIGN KEY FK_NEW_610529188_24AA78C530E79035; +ALTER TABLE tl_lascrt11_session ADD CONSTRAINT FK_NEW_610529188_24AA78C530E79035 FOREIGN KEY (`scratchie_uid`) +REFERENCES `tl_lascrt11_scratchie` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_user DROP FOREIGN KEY FK_NEW_610529188_30113BFCEC0D3147; +ALTER TABLE tl_lascrt11_user ADD CONSTRAINT FK_NEW_610529188_30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_lascrt11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_user DROP FOREIGN KEY FK_NEW_610529188_30113BFC309ED320; +ALTER TABLE tl_lascrt11_user ADD CONSTRAINT FK_NEW_610529188_30113BFC309ED320 FOREIGN KEY (`scratchie_uid`) +REFERENCES `tl_lascrt11_scratchie` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_answer_log DROP FOREIGN KEY sessionIdIndex; +ALTER TABLE tl_lascrt11_answer_log ADD CONSTRAINT sessionIdIndex FOREIGN KEY (`session_id`) +REFERENCES `tl_lascrt11_session` (`session_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_answer_log DROP FOREIGN KEY FK_NEW_610529188_693580A438BF8DFE; +ALTER TABLE tl_lascrt11_answer_log ADD CONSTRAINT FK_NEW_610529188_693580A438BF8DFE FOREIGN KEY (`scratchie_answer_uid`) +REFERENCES `tl_lascrt11_scratchie_answer` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_burning_question DROP FOREIGN KEY sessionIdIndex2; +ALTER TABLE tl_lascrt11_burning_question ADD CONSTRAINT sessionIdIndex2 FOREIGN KEY (`session_id`) +REFERENCES `tl_lascrt11_session` (`session_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrt11_burning_question DROP FOREIGN KEY FK_NEW_610529188_693580A438BF8DF2; +ALTER TABLE tl_lascrt11_burning_question ADD CONSTRAINT FK_NEW_610529188_693580A438BF8DF2 FOREIGN KEY (`scratchie_item_uid`) +REFERENCES `tl_lascrt11_scratchie_item` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV- +--ALTER TABLE tl_lascrt11_scratchie ADD COLUMN burning_questions_enabled TINYINT DEFAULT 1; +CREATE TABLE tl_lascrt11_burning_que_like ( + uid bigint NOT NULL auto_increment, + burning_question_uid BIGINT, + session_id bigint, + PRIMARY KEY (uid) +)ENGINE=InnoDB; +ALTER TABLE tl_lascrt11_burning_que_like ADD INDEX FK_burning_que_uid (burning_question_uid), ADD CONSTRAINT FK_burning_que_uid FOREIGN KEY (burning_question_uid) REFERENCES tl_lascrt11_burning_question (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-3741 Add a time limit to scratchie +ALTER TABLE tl_lascrt11_scratchie ADD COLUMN time_limit INTEGER DEFAULT 0; + +-- LDEV-3801 keep the time limit start time in DB +ALTER TABLE tl_lascrt11_session ADD COLUMN time_limit_launched_date datetime; + +-- LDEV-4180 +ALTER TABLE tl_lascrt11_scratchie MODIFY COLUMN extra_point TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN burning_questions_enabled TINYINT(1); + +ALTER TABLE tl_lascrt11_session MODIFY COLUMN status TINYINT(1), + MODIFY COLUMN scratching_finished TINYINT(1) DEFAULT 0; + +ALTER TABLE tl_lascrt11_user MODIFY COLUMN session_finished TINYINT(1); + +ALTER TABLE tl_lascrt11_scratchie_answer MODIFY COLUMN correct TINYINT(1); + +ALTER TABLE tl_lascrt11_scratchie_item MODIFY COLUMN create_by_author TINYINT(1); + +ALTER TABLE tl_lascrt11_burning_question MODIFY COLUMN general_question TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lascrt11'; + +----------------------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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lascrt11'; + +----------------------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_scribe/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_scribe/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scribe/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lascrb11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=scribe \ No newline at end of file Index: lams_tool_scribe/db/sql/create_lams_tool_scribe.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_scribe/db/sql/create_lams_tool_scribe.sql (.../create_lams_tool_scribe.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scribe/db/sql/create_lams_tool_scribe.sql (.../create_lams_tool_scribe.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -20,7 +20,6 @@ CREATE TABLE tl_lascrb11_session ( uid bigint(20) NOT NULL AUTO_INCREMENT, - version int(11) NOT NULL, session_end_date datetime, session_start_date datetime, status int(11), Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,50 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lascrb11_scribe DROP COLUMN online_instructions; +ALTER TABLE tl_lascrb11_scribe DROP COLUMN offline_instructions; +ALTER TABLE tl_lascrb11_scribe DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lascrb11_attachment; + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lascrb11_session ADD UNIQUE (session_id); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lascrb11_heading DROP FOREIGN KEY FK428A22FFB3FA1495; +ALTER TABLE tl_lascrb11_heading ADD CONSTRAINT FK428A22FFB3FA1495 FOREIGN KEY (`scribe_uid`) +REFERENCES `tl_lascrb11_scribe` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrb11_report_entry DROP FOREIGN KEY FK5439FACA1C266FAE; +ALTER TABLE tl_lascrb11_report_entry ADD CONSTRAINT FK5439FACA1C266FAE FOREIGN KEY (`scribe_session_uid`) +REFERENCES `tl_lascrb11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrb11_report_entry DROP FOREIGN KEY FK5439FACAEA50D086; +ALTER TABLE tl_lascrb11_report_entry ADD CONSTRAINT FK5439FACAEA50D086 FOREIGN KEY (`scribe_heading_uid`) +REFERENCES `tl_lascrb11_heading` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrb11_session DROP FOREIGN KEY FK89732793B3FA1495; +ALTER TABLE tl_lascrb11_session ADD CONSTRAINT FK89732793B3FA1495 FOREIGN KEY (`scribe_uid`) +REFERENCES `tl_lascrb11_scribe` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lascrb11_session DROP FOREIGN KEY FK89732793E46919FF; +ALTER TABLE tl_lascrb11_session ADD CONSTRAINT FK89732793E46919FF FOREIGN KEY (`appointed_scribe_uid`) +REFERENCES `tl_lascrb11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lascrb11_user DROP FOREIGN KEY FK187DAFEE1C266FAE; +ALTER TABLE tl_lascrb11_user ADD CONSTRAINT FK187DAFEE1C266FAE FOREIGN KEY (`scribe_session_uid`) +REFERENCES `tl_lascrb11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lascrb11'; + +----------------------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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lascrb11'; + +----------------------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_spreadsheet/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_spreadsheet/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lasprd10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=spreadsheet \ No newline at end of file Index: lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql (.../create_lams_tool_spreadsheet.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql (.../create_lams_tool_spreadsheet.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -4,7 +4,7 @@ create table tl_lasprd10_spreadsheet_mark ( uid bigint not null auto_increment, marks FLOAT, - comments text, + comments MEDIUMTEXT, date_marks_released datetime, primary key (uid) ); @@ -18,12 +18,12 @@ is_learner_allowed_to_save TINYINT(1), is_marking_enabled TINYINT(1), lock_on_finished TINYINT(1), - instructions text, + instructions MEDIUMTEXT, code text, content_in_use TINYINT(1), define_later TINYINT(1), content_id bigint, - reflect_instructions text, + reflect_instructions MEDIUMTEXT, reflect_on_activity TINYINT(1), primary key (uid), UNIQUE KEY content_id (content_id) Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20151123.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20160225.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,77 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lasprd10_spreadsheet DROP COLUMN online_instructions; +ALTER TABLE tl_lasprd10_spreadsheet DROP COLUMN offline_instructions; +ALTER TABLE tl_lasprd10_spreadsheet DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lasprd10_attachment; + +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_lasprd10_spreadsheet MODIFY COLUMN reflect_instructions text; + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lasprd10_session ADD UNIQUE (session_id); + +-- LDEV-3612 Marks should accept decimal +ALTER TABLE tl_lasprd10_spreadsheet_mark CHANGE COLUMN marks marks FLOAT NULL DEFAULT NULL; + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lasprd10_session DROP FOREIGN KEY FK_NEW_2065267438_24AA78C530E79035; +ALTER TABLE tl_lasprd10_session ADD CONSTRAINT FK_NEW_2065267438_24AA78C530E79035 FOREIGN KEY (`spreadsheet_uid`) +REFERENCES `tl_lasprd10_spreadsheet` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasprd10_spreadsheet DROP FOREIGN KEY FK_NEW_2065267438_89093BF758092FB; +ALTER TABLE tl_lasprd10_spreadsheet ADD CONSTRAINT FK_NEW_2065267438_89093BF758092FB FOREIGN KEY (`create_by`) +REFERENCES `tl_lasprd10_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lasprd10_user DROP FOREIGN KEY FK_NEW_2065267438_30113BFC309ED320; +ALTER TABLE tl_lasprd10_user ADD CONSTRAINT FK_NEW_2065267438_30113BFC309ED320 FOREIGN KEY (`spreadsheet_uid`) +REFERENCES `tl_lasprd10_spreadsheet` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasprd10_user DROP FOREIGN KEY FK_NEW_2065267438_30113BFCEC0D3147; +ALTER TABLE tl_lasprd10_user ADD CONSTRAINT FK_NEW_2065267438_30113BFCEC0D3147 FOREIGN KEY (`session_uid`) +REFERENCES `tl_lasprd10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasprd10_user DROP FOREIGN KEY FK_NEW_2065267438_693580A441F9365D; +ALTER TABLE tl_lasprd10_user ADD CONSTRAINT FK_NEW_2065267438_693580A441F9365D FOREIGN KEY (`user_modified_spreadsheet_uid`) +REFERENCES `tl_lasprd10_user_modified_spreadsheet` (`uid`) ON DELETE SET NULL ON UPDATE NO ACTION; + +ALTER TABLE tl_lasprd10_user_modified_spreadsheet DROP FOREIGN KEY FK_tl_lasprd10_user_modified_spreadsheet_1; +ALTER TABLE tl_lasprd10_user_modified_spreadsheet ADD CONSTRAINT FK_tl_lasprd10_user_modified_spreadsheet_1 FOREIGN KEY (`mark_id`) +REFERENCES `tl_lasprd10_spreadsheet_mark` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lasprd10_spreadsheet_mark ADD FOREIGN KEY (`uid`) +REFERENCES `tl_lasprd10_user_modified_spreadsheet` (`mark_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-3687 Unable to add marks due to foreign key on spreadsheet_mark table +ALTER TABLE `tl_lasprd10_spreadsheet_mark` DROP FOREIGN KEY `tl_lasprd10_spreadsheet_mark_ibfk_1`; + +ALTER TABLE tl_lasprd10_user_modified_spreadsheet DROP FOREIGN KEY FK_tl_lasprd10_user_modified_spreadsheet_1; +ALTER TABLE tl_lasprd10_user_modified_spreadsheet ADD CONSTRAINT FK_tl_lasprd10_user_modified_spreadsheet_1 FOREIGN KEY (`mark_id`) +REFERENCES `tl_lasprd10_spreadsheet_mark` (`uid`) ON DELETE SET NULL ON UPDATE NO ACTION; + +-- LDEV-4180 +ALTER TABLE tl_lasprd10_spreadsheet MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN is_learner_allowed_to_save TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN is_marking_enabled TINYINT(1); + +ALTER TABLE tl_lasprd10_session MODIFY COLUMN status TINYINT(1); + +ALTER TABLE tl_lasprd10_user MODIFY COLUMN session_finished TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lasprd10'; + +----------------------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_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lasprd10'; + +----------------------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_survey/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_survey/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lasurv11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=survey \ No newline at end of file Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_survey/db/sql/create_lams_tool_survey.sql (.../create_lams_tool_survey.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/db/sql/create_lams_tool_survey.sql (.../create_lams_tool_survey.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -4,12 +4,12 @@ uid bigint not null auto_increment, title varchar(255), lock_on_finished TINYINT(1), -instructions text, +instructions MEDIUMTEXT, submission_deadline datetime, content_in_use TINYINT(1), define_later TINYINT(1), content_id bigint, -reflect_instructions text, +reflect_instructions MEDIUMTEXT, reflect_on_activity TINYINT(1), show_questions_on_one_page TINYINT(1), create_date datetime, @@ -54,7 +54,7 @@ create table tl_lasurv11_question ( uid bigint not null auto_increment, sequence_id integer, -description text, +description MEDIUMTEXT, create_by bigint, create_date datetime, question_type smallint, @@ -75,7 +75,7 @@ user_uid bigint, answer_choices varchar(255), udpate_date datetime, -answer_text text, +answer_text MEDIUMTEXT, primary key (uid), CONSTRAINT FK6DAAFE3B25F3BB77 FOREIGN KEY (question_uid) REFERENCES tl_lasurv11_question (uid) ON DELETE CASCADE ON UPDATE CASCADE, @@ -85,7 +85,7 @@ create table tl_lasurv11_option ( uid bigint not null auto_increment, -description text, +description MEDIUMTEXT, sequence_id integer, question_uid bigint, primary key (uid), Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20141023.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20150217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,82 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lasurv11_survey DROP COLUMN online_instructions; +ALTER TABLE tl_lasurv11_survey DROP COLUMN offline_instructions; +ALTER TABLE tl_lasurv11_survey DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lasurv11_attachment; + +-- LDEV-3326 Option to include everyone results after survey responses are sent +ALTER TABLE tl_lasurv11_survey ADD COLUMN show_other_users_answers TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE tl_lasurv11_user ADD COLUMN response_finalized TINYINT(1) NOT NULL DEFAULT 0; + +-- LDEV-3432 Do not limit reflect instructions length +ALTER TABLE tl_lasurv11_survey MODIFY COLUMN reflect_instructions text; + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lasurv11_session ADD UNIQUE (session_id); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lasurv11_option DROP FOREIGN KEY FK85AB46F26966134F; +ALTER TABLE tl_lasurv11_option ADD CONSTRAINT FK85AB46F26966134F FOREIGN KEY (`question_uid`) +REFERENCES `tl_lasurv11_question` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_question DROP FOREIGN KEY FK872D4F23D14146E5; +ALTER TABLE tl_lasurv11_question ADD CONSTRAINT FK872D4F23D14146E5 FOREIGN KEY (`survey_uid`) +REFERENCES `tl_lasurv11_survey` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_question DROP FOREIGN KEY FK872D4F23E4C99A5F; +ALTER TABLE tl_lasurv11_question ADD CONSTRAINT FK872D4F23E4C99A5F FOREIGN KEY (`create_by`) +REFERENCES `tl_lasurv11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_session DROP FOREIGN KEY FKF08793B9D14146E5; +ALTER TABLE tl_lasurv11_session ADD CONSTRAINT FKF08793B9D14146E5 FOREIGN KEY (`survey_uid`) +REFERENCES `tl_lasurv11_survey` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_survey DROP FOREIGN KEY FK8CC465D7E4C99A5F; +ALTER TABLE tl_lasurv11_survey ADD CONSTRAINT FK8CC465D7E4C99A5F FOREIGN KEY (`create_by`) +REFERENCES `tl_lasurv11_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_user DROP FOREIGN KEY FK633F25884F803F63; +ALTER TABLE tl_lasurv11_user ADD CONSTRAINT FK633F25884F803F63 FOREIGN KEY (`session_uid`) +REFERENCES `tl_lasurv11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_user DROP FOREIGN KEY FK633F2588D14146E5; +ALTER TABLE tl_lasurv11_user ADD CONSTRAINT FK633F2588D14146E5 FOREIGN KEY (`survey_uid`) +REFERENCES `tl_lasurv11_survey` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_answer DROP FOREIGN KEY FK6DAAFE3BB1423DC1; +ALTER TABLE tl_lasurv11_answer ADD CONSTRAINT FK6DAAFE3BB1423DC1 FOREIGN KEY (`user_uid`) +REFERENCES `tl_lasurv11_user` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lasurv11_answer DROP FOREIGN KEY FK6DAAFE3B25F3BB77; +ALTER TABLE tl_lasurv11_answer ADD CONSTRAINT FK6DAAFE3B25F3BB77 FOREIGN KEY (`question_uid`) +REFERENCES `tl_lasurv11_question` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- LDEV-4180 +ALTER TABLE tl_lasurv11_survey MODIFY COLUMN lock_on_finished TINYINT(1), + MODIFY COLUMN content_in_use TINYINT(1), + MODIFY COLUMN define_later TINYINT(1), + MODIFY COLUMN show_questions_on_one_page TINYINT(1), + MODIFY COLUMN reflect_on_activity TINYINT(1), + MODIFY COLUMN answer_submit_notify TINYINT(1); + +ALTER TABLE tl_lasurv11_question MODIFY COLUMN append_text TINYINT(1), + MODIFY COLUMN optional TINYINT(1), + MODIFY COLUMN allow_multiple_answer TINYINT(1); + +ALTER TABLE tl_lasurv11_user MODIFY COLUMN session_finished TINYINT(1); + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lasurv11'; + +----------------------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_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lasurv11'; + +----------------------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_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='latask10'; + +----------------------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_vote/build.properties =================================================================== diff -u -rd53b871cf362921c3977c247e2eb7a46ce0e94fb -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_vote/build.properties (.../build.properties) (revision d53b871cf362921c3977c247e2eb7a46ce0e94fb) +++ lams_tool_vote/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lavote11 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=vote \ No newline at end of file Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,7 +2,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 , maxNominationCount SMALLINT NOT NULL DEFAULT 1 @@ -13,7 +13,7 @@ , define_later TINYINT(1) NOT NULL DEFAULT 0 , lock_on_finish TINYINT(1) NOT NULL DEFAULT 1 , retries TINYINT(1) NOT NULL DEFAULT 0 - , reflectionSubject TEXT + , reflectionSubject MEDIUMTEXT , show_results TINYINT(1) NOT NULL DEFAULT 1 , assigned_data_flow_object TINYINT(1) , external_inputs_added SMALLINT DEFAULT 0 @@ -56,7 +56,7 @@ CREATE TABLE tl_lavote11_nomination_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , nomination TEXT + , nomination MEDIUMTEXT , display_order INT(5) , vote_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) Index: lams_tool_vote/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_vote/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_vote/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -30,12 +30,12 @@ '@tool_version@', 0, 2, -'tool/lavote11/learning.do?dispatch=start&mode=learner', -'tool/lavote11/learning.do?dispatch=start&mode=author', -'tool/lavote11/learning.do?dispatch=start&mode=teacher', -'tool/lavote11/authoring.do?dispatch=start', -'tool/lavote11/monitoring.do?dispatch=start', -'tool/lavote11/pedagogicalPlanner.do', +'tool/lavote11/learning/start.do?mode=learner', +'tool/lavote11/learning/start.do?mode=author', +'tool/lavote11/learning/start.do?mode=teacher', +'tool/lavote11/authoring/start.do', +'tool/lavote11/monitoring/start.do', +'tool/lavote11/pedagogicalPlanner/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lavote11', 'org.lamsfoundation.lams.tool.vote.ApplicationResources', NOW(), Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20131227.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20140520.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20161004.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,78 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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 +ALTER TABLE tl_lavote11_content ADD COLUMN use_select_leader_tool_ouput TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE tl_lavote11_session ADD COLUMN group_leader_uid BIGINT; +ALTER TABLE tl_lavote11_session ADD INDEX FK_lavote11_session_1 (group_leader_uid), ADD CONSTRAINT tl_lavote11_session FOREIGN KEY (group_leader_uid) REFERENCES tl_lavote11_usr (uid) ON DELETE CASCADE ON UPDATE CASCADE; + +-- Adding a constraint to the vote user table so no same user_id and vote_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_lavote11_usr GROUP BY user_id, vote_session_id; +ALTER TABLE temp_select ADD INDEX index1 (uid ASC); +DELETE FROM tl_lavote11_usr_attempt WHERE que_usr_id NOT IN (SELECT uid FROM temp_select); +DELETE FROM tl_lavote11_usr WHERE uid NOT IN (SELECT uid FROM temp_select); +DROP TEMPORARY TABLE temp_select; + +ALTER TABLE tl_lavote11_usr ADD UNIQUE INDEX(user_id, vote_session_id); + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lavote11_content DROP COLUMN online_instructions; +ALTER TABLE tl_lavote11_content DROP COLUMN offline_instructions; +ALTER TABLE tl_lavote11_content DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lavote11_uploadedfile; + +-- LDEV-3228 Ability to change, add, remove MCQ questions even after student have reached it +ALTER TABLE tl_lavote11_content DROP COLUMN content_in_use; + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lavote11_nomination_content DROP FOREIGN KEY FK_tl_lavote11_nomination_content_1; +ALTER TABLE tl_lavote11_nomination_content ADD CONSTRAINT FK_tl_lavote11_nomination_content_1 FOREIGN KEY (`vote_content_id`) +REFERENCES `tl_lavote11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lavote11_usr DROP FOREIGN KEY FK_tl_lavote11_usr_1; +ALTER TABLE tl_lavote11_usr ADD CONSTRAINT FK_tl_lavote11_usr_1 FOREIGN KEY (`vote_session_id`) +REFERENCES `tl_lavote11_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lavote11_session DROP FOREIGN KEY FK_tl_lavote11_session_1; +ALTER TABLE tl_lavote11_session ADD CONSTRAINT FK_tl_lavote11_session_1 FOREIGN KEY (`vote_content_id`) +REFERENCES `tl_lavote11_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lavote11_usr_attempt DROP FOREIGN KEY FK_tl_lavote11_usr_attempt_2; +ALTER TABLE tl_lavote11_usr_attempt ADD CONSTRAINT FK_tl_lavote11_usr_attempt_2 FOREIGN KEY (`que_usr_id`) +REFERENCES `tl_lavote11_usr` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lavote11_usr_attempt DROP FOREIGN KEY FK_tl_lavote11_usr_attempt_3; +ALTER TABLE tl_lavote11_usr_attempt ADD CONSTRAINT FK_tl_lavote11_usr_attempt_3 FOREIGN KEY (`vote_nomination_content_id`) +REFERENCES `tl_lavote11_nomination_content` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; +-- This has to be added as Hibernate is not aware of the cascade +ALTER TABLE tl_lavote11_usr_attempt MODIFY COLUMN vote_nomination_content_id bigint(20) DEFAULT NULL; + +-- LDEV-3984 Rename actions to have more simple names +UPDATE lams_tool SET learner_url = 'tool/lavote11/learning.do?dispatch=start&mode=learner', + learner_preview_url = 'tool/lavote11/learning.do?dispatch=start&mode=author', + learner_progress_url = 'tool/lavote11/learning.do?dispatch=start&mode=teacher' + WHERE tool_signature = 'lavote11'; + +UPDATE lams_tool SET monitor_url = 'tool/lavote11/monitoring.do?dispatch=start' + WHERE tool_signature = 'lavote11'; + +UPDATE lams_tool SET author_url = 'tool/lavote11/authoring.do?dispatch=start' + WHERE tool_signature = 'lavote11'; + +-- LDEV-4180 +ALTER TABLE tl_lavote11_content MODIFY COLUMN maxNominationCount SMALLINT NOT NULL DEFAULT 1, + MODIFY COLUMN minNominationCount SMALLINT NOT NULL DEFAULT 1; + +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lavote11'; + +----------------------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_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lavote11'; + +----------------------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_wiki/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_wiki/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lawiki10 -tool.version=20170101 +tool.version=20190103 tool.hide=false tool.short.name=wiki \ No newline at end of file Index: lams_tool_wiki/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_wiki/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -30,12 +30,12 @@ '@tool_version@', 0, 2, -'tool/lawiki10/learning.do?mode=learner', -'tool/lawiki10/learning.do?mode=author', -'tool/lawiki10/learning.do?mode=teacher', -'tool/lawiki10/authoring.do', -'tool/lawiki10/monitoring.do', -'tool/lawiki10/pedagogicalPlanner.do', +'tool/lawiki10/learning/learning.do?mode=learner', +'tool/lawiki10/learning/learning.do?mode=author', +'tool/lawiki10/learning/learning.do?mode=teacher', +'tool/lawiki10/authoring/authoring.do', +'tool/lawiki10/monitoring/monitoring.do', +'tool/lawiki10/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lawiki10', 'org.lamsfoundation.lams.tool.wiki.ApplicationResources', NOW(), Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20120315.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20130716.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20160919_updateFrom235.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20170101_updateTo30.sql =================================================================== diff -u --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20170101_updateTo30.sql (revision 0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20170101_updateTo30.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,75 @@ +-- SQL statements to update to LAMS 3.0 + +-- 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- +ALTER TABLE tl_lawiki10_wiki_page ADD COLUMN deleted bit DEFAULT 0 AFTER editable; + +-- LDEV-3078 Wiki tool should start uploading images to www/secure/runtime/ folder +ALTER TABLE tl_lawiki10_session DROP COLUMN content_folder_id; + +-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options +ALTER TABLE tl_lawiki10_wiki DROP COLUMN online_instructions; +ALTER TABLE tl_lawiki10_wiki DROP COLUMN offline_instructions; +ALTER TABLE tl_lawiki10_wiki DROP COLUMN run_offline; +DROP TABLE IF EXISTS tl_lawiki10_attachment; + +-- LDEV-3564 tool session id must be unique in tool's session table +ALTER TABLE tl_lawiki10_session ADD UNIQUE (session_id); + +-- LDEV-3640 Add necessary cascades +ALTER TABLE tl_lawiki10_session DROP FOREIGN KEY FKF01D63C260B3B03B; +ALTER TABLE tl_lawiki10_session ADD CONSTRAINT FKF01D63C260B3B03B FOREIGN KEY (`wiki_uid`) +REFERENCES `tl_lawiki10_wiki` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_session DROP FOREIGN KEY FKF01D63C2A3FF7EC0; +ALTER TABLE tl_lawiki10_session ADD CONSTRAINT FKF01D63C2A3FF7EC0 FOREIGN KEY (`wiki_main_page_uid`) +REFERENCES `tl_lawiki10_wiki_page` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_user DROP FOREIGN KEY FKED5D7A1FD8004954; +ALTER TABLE tl_lawiki10_user ADD CONSTRAINT FKED5D7A1FD8004954 FOREIGN KEY (`wiki_session_uid`) +REFERENCES `tl_lawiki10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki DROP FOREIGN KEY FKED5E3E04A3FF7EC0; +ALTER TABLE tl_lawiki10_wiki ADD CONSTRAINT FKED5E3E04A3FF7EC0 FOREIGN KEY (`wiki_main_page_uid`) +REFERENCES `tl_lawiki10_wiki_page` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki_page DROP FOREIGN KEY wiki_page_fk_1; +ALTER TABLE tl_lawiki10_wiki_page ADD CONSTRAINT wiki_page_fk_1 FOREIGN KEY (`wiki_session_uid`) +REFERENCES `tl_lawiki10_session` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki_page DROP FOREIGN KEY wiki_page_fk_2; +ALTER TABLE tl_lawiki10_wiki_page ADD CONSTRAINT wiki_page_fk_2 FOREIGN KEY (`wiki_uid`) +REFERENCES `tl_lawiki10_wiki` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki_page DROP FOREIGN KEY wiki_page_fk_3; +ALTER TABLE tl_lawiki10_wiki_page ADD CONSTRAINT wiki_page_fk_3 FOREIGN KEY (`added_by`) +REFERENCES `tl_lawiki10_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki_page DROP FOREIGN KEY wiki_page_fk_4; +ALTER TABLE tl_lawiki10_wiki_page ADD CONSTRAINT wiki_page_fk_4 FOREIGN KEY (`wiki_current_content`) +REFERENCES `tl_lawiki10_wiki_page_content` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki_page_content DROP FOREIGN KEY FK528051242D44CCF8; +ALTER TABLE tl_lawiki10_wiki_page_content ADD CONSTRAINT FK528051242D44CCF8 FOREIGN KEY (`wiki_page_uid`) +REFERENCES `tl_lawiki10_wiki_page` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE tl_lawiki10_wiki_page_content DROP FOREIGN KEY FK528051243233D952; +ALTER TABLE tl_lawiki10_wiki_page_content ADD CONSTRAINT FK528051243233D952 FOREIGN KEY (`editor`) +REFERENCES `tl_lawiki10_user` (`uid`) ON DELETE SET NULL ON UPDATE CASCADE; + +-- LDEV- +alter table tl_lawiki10_wiki add column submission_deadline datetime default null; + +-- LDEV-4180 +UPDATE lams_tool SET tool_version='20170101' WHERE tool_signature='lawiki10'; + +----------------------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_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lawiki10'; + +----------------------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_zoom/build.properties =================================================================== diff -u -r7e6e3f54e13ae88f51988659f2e290d6d902f7b1 -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_zoom/build.properties (.../build.properties) (revision 7e6e3f54e13ae88f51988659f2e290d6d902f7b1) +++ lams_tool_zoom/build.properties (.../build.properties) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -2,6 +2,6 @@ min.server.version.number=3.0 signature=lazoom10 -tool.version=20180608 +tool.version=20190103 tool.hide=false tool.short.name=zoom \ No newline at end of file Index: lams_tool_zoom/db/sql/tool_insert.sql =================================================================== diff -u -r5da86331a25afcff7dfa0dd4647187c5beaa757b -r8cb3b47e0bc1e7d89582929aa33ee29f0ef37189 --- lams_tool_zoom/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 5da86331a25afcff7dfa0dd4647187c5beaa757b) +++ lams_tool_zoom/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -1,5 +1,3 @@ - - INSERT INTO lams_tool ( tool_signature, @@ -31,13 +29,13 @@ '@tool_version@', 0, 2, -'tool/lazoom10/learning.do?mode=learner', -'tool/lazoom10/learning.do?mode=author', -'tool/lazoom10/learning.do?mode=teacher', -'tool/lazoom10/authoring.do', -'tool/lazoom10/monitoring.do', +'tool/lazoom10/learning/start.do?mode=learner', +'tool/lazoom10/learning/start.do?mode=author', +'tool/lazoom10/learning/start.do?mode=teacher', +'tool/lazoom10/authoring/start.do', +'tool/lazoom10/monitoring/start.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lazoom10', -'tool/lazoom10/admin.do', +'tool/lazoom10/admin/start.do', 'org.lamsfoundation.lams.tool.zoom.ApplicationResources', NOW(), NOW() Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20190103.sql =================================================================== diff -u --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20190103.sql (revision 0) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20190103.sql (revision 8cb3b47e0bc1e7d89582929aa33ee29f0ef37189) @@ -0,0 +1,17 @@ +-- 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 tool version to mark LAMS 3.1 release +UPDATE lams_tool SET tool_version='20190103' WHERE tool_signature='lazoom10'; + +----------------------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; + + +