LDEV-3147 Get rid of 'supports_run_offline_flag' and 'define_later_ur…

…l' columns from lams_tool table
ivanDad · Feb 28, 2017 · fccaf30 · fccaf30
1 parent 248a473
commit fccaf30
Show file tree

Hide file tree

Showing 32 changed files with 5 additions and 125 deletions.
diff --git a/lams_common/db/sql/create_lams_11_tables.sql b/lams_common/db/sql/create_lams_11_tables.sql
@@ -388,12 +388,10 @@ CREATE TABLE lams_tool (
      , default_tool_content_id BIGINT(20)
      , valid_flag TINYINT(1) NOT NULL DEFAULT 1
      , grouping_support_type_id INT(3) NOT NULL
-     , supports_run_offline_flag TINYINT(1) NOT NULL
      , learner_url TEXT NOT NULL
      , learner_preview_url TEXT
      , learner_progress_url TEXT
      , author_url TEXT NOT NULL
-     , define_later_url TEXT
      , monitor_url TEXT 
 	 , pedagogical_planner_url TEXT
      , help_url TEXT

diff --git a/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040022.sql b/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040022.sql
@@ -4,14 +4,6 @@ SET AUTOCOMMIT = 0;
 SET FOREIGN_KEY_CHECKS=0;
 
 -- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and run offline activity options
--- Comment out this part until we will be able to modify tools' tool_insert.sql and tool_insert.sql activity_insert.sql to exclude inserting according columns   
---ALTER TABLE lams_learning_activity DROP COLUMN define_later_flag;
---ALTER TABLE lams_learning_activity DROP COLUMN run_offline_flag;
-
---ALTER TABLE lams_tool DROP COLUMN supports_run_offline_flag;
---ALTER TABLE lams_tool DROP COLUMN define_later_url;
-
---TODO remove the next line after uncommenting previous section
 ALTER TABLE lams_learning_activity CHANGE COLUMN run_offline_flag run_offline_flag TINYINT(1) NOT NULL DEFAULT '0';
 
 ALTER TABLE lams_learning_design DROP COLUMN online_instructions;

diff --git a/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000001.sql b/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000001.sql
@@ -40,6 +40,11 @@ ALTER TABLE lams_timezone MODIFY COLUMN server_timezone TINYINT(1);
 
 -- fix a typo
 UPDATE lams_configuration SET config_key = 'ConfigCacheRefreshInterval' WHERE config_key = 'ConfigCacheRefresInterval';
+
+-- LDEV-3147 Get rid of 'supports_run_offline_flag' and 'define_later_url' columns from lams_tool table
+ALTER TABLE lams_tool DROP COLUMN supports_run_offline_flag;
+ALTER TABLE lams_tool DROP COLUMN define_later_url;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on

diff --git a/lams_tool_assessment/db/sql/tool_insert.sql b/lams_tool_assessment/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 help_url,
 language_file,
 create_date_time,
@@ -31,13 +29,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/laasse10/learning/start.do?mode=learner',
 'tool/laasse10/learning/start.do?mode=author',
 'tool/laasse10/learning/start.do?mode=teacher',
 'tool/laasse10/authoring/start.do',
 'tool/laasse10/monitoring/summary.do',
-'tool/laasse10/definelater.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laasse10',
 'org.lamsfoundation.lams.tool.assessment.ApplicationResources',
 NOW(),

diff --git a/lams_tool_bbb/db/sql/tool_insert.sql b/lams_tool_bbb/db/sql/tool_insert.sql
@@ -10,13 +10,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 help_url,
 admin_url,
 language_file,
@@ -33,13 +31,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/labbb10/learning.do?mode=learner',
 'tool/labbb10/learning.do?mode=author',
 'tool/labbb10/learning.do?mode=teacher',
 'tool/labbb10/authoring.do',
 'tool/labbb10/monitoring.do',
-'tool/labbb10/authoring.do?mode=teacher',
 'http://wiki.lamsfoundation.org/display/lamsdocs/labbb10',
 'tool/labbb10/admin/view.do',
 'org.lamsfoundation.lams.tool.bbb.ApplicationResources',

diff --git a/lams_tool_chat/db/sql/tool_insert.sql b/lams_tool_chat/db/sql/tool_insert.sql
@@ -10,13 +10,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -34,13 +32,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/lachat11/learning.do?mode=learner',
 'tool/lachat11/learning.do?mode=author',
 'tool/lachat11/learning.do?mode=teacher',
 'tool/lachat11/authoring.do',
 'tool/lachat11/monitoring.do',
-'tool/lachat11/authoring.do?mode=teacher',
 'tool/lachat11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lachat11',
 'org.lamsfoundation.lams.tool.chat.ApplicationResources',

diff --git a/lams_tool_daco/db/sql/tool_insert.sql b/lams_tool_daco/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 help_url,
 language_file,
 create_date_time,
@@ -31,13 +29,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/ladaco10/learning/start.do?mode=learner',
 'tool/ladaco10/learning/start.do?mode=author',
 'tool/ladaco10/learning/start.do?mode=teacher',
 'tool/ladaco10/authoring/start.do',
 'tool/ladaco10/monitoring/summary.do',
-'tool/ladaco10/definelater.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/ladaco10',
 'org.lamsfoundation.lams.tool.daco.ApplicationResources',
 NOW(),

diff --git a/lams_tool_eadventure/db/sql/tool_insert.sql b/lams_tool_eadventure/db/sql/tool_insert.sql
@@ -10,13 +10,11 @@ learning_library_id,
 default_tool_content_id,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -36,13 +34,11 @@ NULL,
 NULL,
 0,
 2,
-1,
 'tool/eueadv10/learning/start.do?mode=learner',
 'tool/eueadv10/learning/start.do?mode=author',
 'tool/eueadv10/learning/start.do?mode=teacher',
 'tool/eueadv10/authoring/start.do',
 'tool/eueadv10/monitoring/summary.do',
-NULL,
 'tool/eueadv10/authoring/initPedagogicalPlannerForm.do',
 NULL,
 'org.eucm.lams.tool.eadventure.ApplicationResources',

diff --git a/lams_tool_forum/db/sql/tool_insert.sql b/lams_tool_forum/db/sql/tool_insert.sql
@@ -10,13 +10,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -34,13 +32,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/lafrum11/learning/viewForum.do?mode=learner',
 'tool/lafrum11/learning/viewForum.do?mode=author',
 'tool/lafrum11/learning/viewForum.do?mode=teacher',
 'tool/lafrum11/authoring.do',
 'tool/lafrum11/monitoring.do',
-'tool/lafrum11/defineLater.do',
 'tool/lafrum11/authoring/initPedagogicalPlannerForm.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lafrum11',
 'org.lamsfoundation.lams.tool.forum.ApplicationResources',

diff --git a/lams_tool_gmap/db/sql/tool_insert.sql b/lams_tool_gmap/db/sql/tool_insert.sql
@@ -10,13 +10,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 help_url,
 language_file,
 create_date_time,
@@ -39,7 +37,6 @@ VALUES
 'tool/lagmap10/learning.do?mode=teacher',
 'tool/lagmap10/authoring.do',
 'tool/lagmap10/monitoring.do',
-'tool/lagmap10/authoring.do?mode=teacher',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lagmap10',
 'org.lamsfoundation.lams.tool.gmap.ApplicationResources',
 NOW(),

diff --git a/lams_tool_images/db/sql/tool_insert.sql b/lams_tool_images/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 help_url,
 language_file,
 create_date_time,
@@ -32,13 +30,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/laimag10/learning/start.do?mode=learner',
 'tool/laimag10/learning/start.do?mode=author',
 'tool/laimag10/learning/start.do?mode=teacher',
 'tool/laimag10/authoring/start.do',
 'tool/laimag10/monitoring/summary.do',
-'tool/laimag10/definelater.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laimag10',
 'org.lamsfoundation.lams.tool.imageGallery.ApplicationResources',
 NOW(),

diff --git a/lams_tool_imscc/db/sql/tool_insert.sql b/lams_tool_imscc/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -32,13 +30,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/laimsc11/learning/start.do?mode=learner',
 'tool/laimsc11/learning/start.do?mode=author',
 'tool/laimsc11/learning/start.do?mode=teacher',
 'tool/laimsc11/authoring/start.do',
 'tool/laimsc11/monitoring/summary.do',
-'tool/laimsc11/definelater.do',
 'tool/laimsc11/authoring/initPedagogicalPlannerForm.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laimsc11',
 'org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources',

diff --git a/lams_tool_kaltura/db/sql/tool_insert.sql b/lams_tool_kaltura/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -32,13 +30,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/lakalt11/learning.do?mode=learner',
 'tool/lakalt11/learning.do?mode=author',
 'tool/lakalt11/learning.do?mode=teacher',
 'tool/lakalt11/authoring.do',
 'tool/lakalt11/monitoring.do',
-'tool/lakalt11/authoring.do?mode=teacher',
 'tool/lakalt11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lakalt11',
 'org.lamsfoundation.lams.tool.kaltura.ApplicationResources',

diff --git a/lams_tool_lamc/db/sql/tool_insert.sql b/lams_tool_lamc/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -32,13 +30,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/lamc11/learningStarter.do?mode=learner',
 'tool/lamc11/learningStarter.do?mode=author',
 'tool/lamc11/learningStarter.do?mode=teacher',
 'tool/lamc11/authoringStarter.do',
 'tool/lamc11/monitoringStarter.do',
-'tool/lamc11/defineLaterStarter.do',
 'tool/lamc11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/lamc11',
 'org.lamsfoundation.lams.tool.mc.ApplicationResources',

diff --git a/lams_tool_laqa/db/sql/tool_insert.sql b/lams_tool_laqa/db/sql/tool_insert.sql
@@ -9,13 +9,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -34,13 +32,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 '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/defineLaterStarter.do',
 'tool/laqa11/pedagogicalPlanner.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/laqa11',
 'org.lamsfoundation.lams.tool.qa.ApplicationResources',

diff --git a/lams_tool_larsrc/db/sql/tool_insert.sql b/lams_tool_larsrc/db/sql/tool_insert.sql
@@ -8,13 +8,11 @@ tool_identifier,
 tool_version,
 valid_flag,
 grouping_support_type_id,
-supports_run_offline_flag,
 learner_url,
 learner_preview_url,
 learner_progress_url,
 author_url,
 monitor_url,
-define_later_url,
 pedagogical_planner_url,
 help_url,
 language_file,
@@ -31,13 +29,11 @@ VALUES
 '@tool_version@',
 0,
 2,
-1,
 'tool/larsrc11/learning/start.do?mode=learner',
 'tool/larsrc11/learning/start.do?mode=author',
 'tool/larsrc11/learning/start.do?mode=teacher',
 'tool/larsrc11/authoring/start.do',
 'tool/larsrc11/monitoring/summary.do',
-'tool/larsrc11/definelater.do',
 'tool/larsrc11/authoring/initPedagogicalPlannerForm.do',
 'http://wiki.lamsfoundation.org/display/lamsdocs/larsrc11',
 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources',