Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -r2c185f5f72bd7eeb485c93b4ef4de0288fe959f5 -r0e4c2d8550392e022509a50245be3c99a85257f3
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 2c185f5f72bd7eeb485c93b4ef4de0288fe959f5)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 0e4c2d8550392e022509a50245be3c99a85257f3)
@@ -464,6 +464,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -644,6 +657,13 @@
+
+
+
+
+
+
+
@@ -2367,8 +2387,8 @@
-
+
@@ -3305,6 +3325,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r2c185f5f72bd7eeb485c93b4ef4de0288fe959f5 -r0e4c2d8550392e022509a50245be3c99a85257f3
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 2c185f5f72bd7eeb485c93b4ef4de0288fe959f5)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 0e4c2d8550392e022509a50245be3c99a85257f3)
@@ -96,6 +96,12 @@
, PRIMARY KEY (copy_type_id)
)TYPE=InnoDB;
+CREATE TABLE lams_activity_category (
+ activity_category_id INT(3) NOT NULL
+ , description VARCHAR(255) NOT NULL
+ , PRIMARY KEY (activity_category_id)
+)TYPE=InnoDB;
+
CREATE TABLE lams_authentication_method_type (
authentication_method_type_id INT(3) NOT NULL
, description VARCHAR(64) NOT NULL
@@ -299,6 +305,7 @@
CREATE TABLE lams_learning_activity (
activity_id BIGINT(20) NOT NULL AUTO_INCREMENT
, activity_ui_id INT(11)
+ , activity_category_id INT(3) NOT NULL
, description TEXT
, title VARCHAR(255)
, help_text TEXT
@@ -359,6 +366,9 @@
, INDEX (library_activity_id)
, CONSTRAINT FK_lams_learning_activity_11 FOREIGN KEY (library_activity_id)
REFERENCES lams_learning_activity (activity_id)
+ , INDEX (activity_category_id)
+ , CONSTRAINT FK_lams_learning_activity_12 FOREIGN KEY (activity_category_id)
+ REFERENCES lams_activity_category (activity_category_id)
)TYPE=InnoDB;
CREATE TABLE lams_learner_progress (
Index: lams_common/db/sql/drop_lams_11_tables.sql
===================================================================
diff -u -ra4af839849939c13a64168e034e2484676135b8c -r0e4c2d8550392e022509a50245be3c99a85257f3
--- lams_common/db/sql/drop_lams_11_tables.sql (.../drop_lams_11_tables.sql) (revision a4af839849939c13a64168e034e2484676135b8c)
+++ lams_common/db/sql/drop_lams_11_tables.sql (.../drop_lams_11_tables.sql) (revision 0e4c2d8550392e022509a50245be3c99a85257f3)
@@ -38,5 +38,6 @@
DROP TABLE IF EXISTS lams_gate_activity_level;
DROP TABLE IF EXISTS lams_license;
DROP TABLE IF EXISTS lams_copy_type;
+DROP TABLE IF EXISTS lams_activity_category;
SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/db/sql/insert_test_data.sql
===================================================================
diff -u -rfaf7395bfcb42f3aabf442d4034a81995676c7a4 -r0e4c2d8550392e022509a50245be3c99a85257f3
--- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision faf7395bfcb42f3aabf442d4034a81995676c7a4)
+++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 0e4c2d8550392e022509a50245be3c99a85257f3)
@@ -36,8 +36,15 @@
INSERT INTO lams_authentication_method VALUES (2, 2, 'Oxford-WebAuth');
INSERT INTO lams_authentication_method VALUES (3, 3, 'MQ-LDAP');
+INSERT INTO lams_activity_category VALUES (1 ,'SYSTEM');
+INSERT INTO lams_activity_category VALUES (1 ,'COLLABORATION');
+INSERT INTO lams_activity_category VALUES (1 ,'ASSESSMENT');
+INSERT INTO lams_activity_category VALUES (1 ,'CONTENT');
+INSERT INTO lams_activity_category VALUES (1 ,'SPLIT');
+
insert into lams_workspace_folder (parent_folder_id,name,workspace_id) values(null,'Trial',1);
+
-- Populates the lams_learning_library table with default libraries
insert into lams_learning_library (learning_library_id,description,title,create_date_time) values (1,'Notebook','Notebook','20050207');