Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -r84861fe0f6370b07582541e94edaa156fab08694 -rfa1a03cd89958eeba49f78a13b9638499bbd385f
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 84861fe0f6370b07582541e94edaa156fab08694)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision fa1a03cd89958eeba49f78a13b9638499bbd385f)
@@ -148,7 +148,7 @@
-
+
@@ -683,32 +683,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,7 +885,7 @@
-
+
@@ -1907,7 +1881,7 @@
-
+
@@ -2043,11 +2017,11 @@
-
+
-
+
@@ -2114,7 +2088,7 @@
-
+
@@ -2778,11 +2752,11 @@
-
+
-
+
@@ -2801,7 +2775,7 @@
-
+
@@ -2907,6 +2881,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r84861fe0f6370b07582541e94edaa156fab08694 -rfa1a03cd89958eeba49f78a13b9638499bbd385f
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 84861fe0f6370b07582541e94edaa156fab08694)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision fa1a03cd89958eeba49f78a13b9638499bbd385f)
@@ -73,9 +73,9 @@
)TYPE=InnoDB;
CREATE TABLE lams_lesson_state (
- lams_lesson_state_id INT(3) NOT NULL
+ lesson_state_id INT(3) NOT NULL
, description VARCHAR(255) NOT NULL
- , PRIMARY KEY (lams_lesson_state_id)
+ , PRIMARY KEY (lesson_state_id)
)TYPE=InnoDB;
CREATE TABLE lams_authentication_method_type (
@@ -195,8 +195,6 @@
, valid_design_flag TINYINT(4) NOT NULL
, read_only_flag TINYINT(4) NOT NULL
, date_read_only DATETIME
- , read_access BIGINT(20)
- , write_access BIGINT(20)
, user_id BIGINT(20) NOT NULL
, help_text TEXT
, lesson_copy_flag TINYINT(4) NOT NULL DEFAULT 0
@@ -248,7 +246,7 @@
, user_id BIGINT(20) NOT NULL DEFAULT 0
, create_date_time DATETIME NOT NULL
, organisation_id BIGINT(20) NOT NULL DEFAULT 0
- , lams_lesson_state_id INT(3) NOT NULL
+ , lesson_state_id INT(3) NOT NULL
, start_date_time DATETIME
, end_date_time DATETIME
, class_grouping_id BIGINT(20) NOT NULL DEFAULT 0
@@ -262,9 +260,9 @@
, INDEX (organisation_id)
, CONSTRAINT FK_lams_lesson_3 FOREIGN KEY (organisation_id)
REFERENCES lams_organisation (organisation_id)
- , INDEX (lams_lesson_state_id)
- , CONSTRAINT FK_lams_lesson_4 FOREIGN KEY (lams_lesson_state_id)
- REFERENCES lams_lesson_state (lams_lesson_state_id)
+ , INDEX (lesson_state_id)
+ , CONSTRAINT FK_lams_lesson_4 FOREIGN KEY (lesson_state_id)
+ REFERENCES lams_lesson_state (lesson_state_id)
, INDEX (class_grouping_id)
, CONSTRAINT FK_lams_lesson_5 FOREIGN KEY (class_grouping_id)
REFERENCES lams_grouping (grouping_id)
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
diff -u -rf3685eac39b0b050392312f77cbea03b0c46b155 -rfa1a03cd89958eeba49f78a13b9638499bbd385f
--- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision f3685eac39b0b050392312f77cbea03b0c46b155)
+++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision fa1a03cd89958eeba49f78a13b9638499bbd385f)
@@ -19,6 +19,7 @@
INSERT INTO lams_role VALUES (3, 'AUTHOR', 'Authors Learning Designs', NOW());
INSERT INTO lams_role VALUES (4, 'STAFF', 'Member of Staff', NOW());
INSERT INTO lams_role VALUES (5, 'LEARNER', 'Student', NOW());
+INSERT INTO lams_role VALUES (6, 'TEACHER', 'Student', NOW());
INSERT INTO lams_authentication_method_type VALUES(1, 'LAMS');
INSERT INTO lams_authentication_method_type VALUES(2, 'WEB_AUTH');
@@ -28,8 +29,9 @@
INSERT INTO lams_organisation_type VALUES(2, 'BASE ORGANISATION', 'base organization: represents a real seperate organization sucha s a university ');
INSERT INTO lams_organisation_type VALUES(3, 'SUB-ORGANISATION', 'sub organization of a base organization');
-INSERT INTO lams_grouping_type VALUES (1, 'NORMAL');
-INSERT INTO lams_grouping_type VALUES (2, 'CLASS');
+INSERT INTO lams_grouping_type VALUES (1, 'RANDOM_GROUPING');
+INSERT INTO lams_grouping_type VALUES (2, 'CHOSEN_GROUPING');
+INSERT INTO lams_grouping_type VALUES (3, 'CLASS_GROUPING');
INSERT INTO lams_learning_activity_type VALUES (1, 'TOOL');
INSERT INTO lams_learning_activity_type VALUES (2, 'GROUPING_RANDOM');
@@ -40,8 +42,8 @@
INSERT INTO lams_learning_activity_type VALUES (7, 'PARALLEL');
INSERT INTO lams_learning_activity_type VALUES (8, 'OPTIONS');
INSERT INTO lams_learning_activity_type VALUES (9, 'SEQUENCE');
-INSERT INTO lams_learning_activity_type VALUES (10, 'BRANCH_GROUP_CONTENT');
+
INSERT INTO lams_gate_activity_level VALUES (1, 'LEARNER');
INSERT INTO lams_gate_activity_level VALUES (2, 'GROUP');
INSERT INTO lams_gate_activity_level VALUES (3, 'CLASS');
@@ -56,5 +58,13 @@
INSERT INTO lams_user_tool_session_state VALUES (4, 'RESUMED');
INSERT INTO lams_user_tool_session_state VALUES (5, 'ERROR');
+INSERT INTO lams_lesson_state VALUES (1, 'NOT_STARTED');
+INSERT INTO lams_lesson_state VALUES (2, 'STARTED');
+INSERT INTO lams_lesson_state VALUES (3, 'SUSPENDED');
+INSERT INTO lams_lesson_state VALUES (4, 'FINISHED');
+INSERT INTO lams_lesson_state VALUES (5, 'ARCHIVED');
+
+
+