chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merging all changes before releasing 1.8.6.1 stable again

Browse Source
skala
Yannick Warnier 17 years ago
parent 018c81064b 11bd69f7e4
commit bb96fc593e
3 changed files with 84 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 65
      main/install/dokeos_main.sql
  2. 52
      main/install/dokeos_main_corp.sql
  3. 22
      main/install/migrate-db-1.8.6-1.8.6.1-pre.sql

65
main/install/dokeos_main.sql
Unescape View File

@ -722,7 +722,11 @@ VALUES
('allow_terms_conditions', NULL, 'radio', 'Platform', 'false', 'AllowTermsAndConditionsTitle', 'AllowTermsAndConditionsComment', NULL, NULL,0),
('show_tutor_data',NULL,'radio','Platform','true','ShowTutorDataTitle','ShowTutorDataComment',NULL,NULL, 1),
('show_teacher_data',NULL,'radio','Platform','true','ShowTeacherDataTitle','ShowTeacherDataComment',NULL,NULL, 1),
('dokeos_database_version', NULL, 'textfield', NULL,'1.8.6.1.8171','DokeosDatabaseVersion','',NULL,NULL,0);
('course_create_active_tools','enable_search','checkbox','Tools','false','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Search',0),
('search_enabled',NULL,'radio','Tools','false','EnableSearchTitle','EnableSearchComment',NULL,NULL,1),
('search_prefilter_prefix',NULL, NULL,'Search','','SearchPrefilterPrefix','SearchPrefilterPrefixComment',NULL,NULL,0),
('search_show_unlinked_results',NULL,'radio','Search','true','SearchShowUnlinkedResultsTitle','SearchShowUnlinkedResultsComment',NULL,NULL,1),
('dokeos_database_version', NULL, 'textfield', NULL,'1.8.6.1.8225','DokeosDatabaseVersion','',NULL,NULL,0);
UNLOCK TABLES;
/*!40000 ALTER TABLE settings_current ENABLE KEYS */;
@ -899,7 +903,12 @@ VALUES
('show_tutor_data','true','Yes'),
('show_tutor_data','false','No'),
('show_teacher_data','true','Yes'),
('show_teacher_data','false','No');
('show_teacher_data','false','No'),
('search_enabled', 'true', 'Yes'),
('search_enabled', 'false', 'No'),
('search_show_unlinked_results', 'true', 'SearchShowUnlinkedResults'),
('search_show_unlinked_results', 'false', 'SearchHideUnlinkedResults');
UNLOCK TABLES;
@ -1061,6 +1070,7 @@ CREATE TABLE gradebook_evaluation (
weight smallint NOT NULL,
max float unsigned NOT NULL,
visible tinyint NOT NULL,
type varchar(40) NOT NULL default 'evaluation',
PRIMARY KEY (id)
);
DROP TABLE IF EXISTS gradebook_link;
@ -2030,6 +2040,7 @@ CREATE TABLE reservation_item (
description text NOT NULL,
blackout tinyint NOT NULL default 0,
creator int unsigned NOT NULL default 0,
always_available TINYINT NOT NULL default 0,
PRIMARY KEY ( id )
);
@ -2174,4 +2185,54 @@ CREATE TABLE legal (
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'legal_accept','Legal',0,0);
--
-- Table structure for certificate with gradebook
--
CREATE TABLE gradebook_certificate(
id bigint unsigned not null auto_increment,
cat_id int unsigned not null,
user_id int unsigned not null,
score_certificate float unsigned not null default 0,
date_certificate datetime not null default '0000-00-00 00:00:00',
path_certificate text null,
PRIMARY KEY(id)
);
ALTER TABLE gradebook_certificate ADD INDEX idx_gradebook_certificate_category_id(cat_id);
ALTER TABLE gradebook_certificate ADD INDEX idx_gradebook_certificate_user_id(user_id);
ALTER TABLE gradebook_certificate ADD INDEX idx_gradebook_certificate_category_id_user_id(cat_id,user_id);
ALTER TABLE gradebook_category ADD COLUMN document_id int unsigned default NULL;
--
-- Tables structure for search tool
--
-- specific fields tables
CREATE TABLE specific_field (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
code char(1) NOT NULL,
name VARCHAR(200) NOT NULL
);
CREATE TABLE specific_field_values (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
course_code VARCHAR(40) NOT NULL ,
tool_id VARCHAR(100) NOT NULL ,
ref_id INT NOT NULL ,
field_id INT NOT NULL ,
value VARCHAR(200) NOT NULL
);
ALTER TABLE specific_field ADD CONSTRAINT unique_specific_field__code UNIQUE (code);
-- search engine references to map dokeos resources
CREATE TABLE search_engine_ref (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
course_code VARCHAR( 40 ) NOT NULL,
tool_id VARCHAR( 100 ) NOT NULL,
ref_id_high_level INT NOT NULL,
ref_id_second_level INT NULL,
search_did INT NOT NULL
);

52
main/install/dokeos_main_corp.sql
Unescape View File

@ -1,52 +0,0 @@
INSERT INTO settings_current
(variable, subkey, type, category, selected_value, title, comment, scope, subkeytext)
VALUES
('search_enabled',NULL,'radio','Tools','false','EnableSearchTitle','EnableSearchComment',NULL,NULL),
('search_prefilter_prefix',NULL, NULL,'Search','','SearchPrefilterPrefix','SearchPrefilterPrefixComment',NULL,NULL),
('search_show_unlinked_results',NULL,'radio','Search','true','SearchShowUnlinkedResultsTitle','SearchShowUnlinkedResultsComment',NULL,NULL);
INSERT INTO settings_options
(variable, value, display_text)
VALUES
('search_enabled', 'true', 'Yes'),
('search_enabled', 'false', 'No'),
('search_show_unlinked_results', 'true', 'SearchShowUnlinkedResults'),
('search_show_unlinked_results', 'false', 'SearchHideUnlinkedResults');
-- specific fields tables
CREATE TABLE specific_field (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
code char(1) NOT NULL,
name VARCHAR( 200 ) NOT NULL
);
CREATE TABLE specific_field_values (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
course_code VARCHAR( 40 ) NOT NULL ,
tool_id VARCHAR( 100 ) NOT NULL ,
ref_id INT NOT NULL ,
field_id INT NOT NULL ,
value VARCHAR( 200 ) NOT NULL
);
ALTER TABLE specific_field ADD CONSTRAINT unique_specific_field__code UNIQUE (code);
-- search engine references to map dokeos resources
CREATE TABLE search_engine_ref (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
course_code VARCHAR( 40 ) NOT NULL,
tool_id VARCHAR( 100 ) NOT NULL,
ref_id_high_level INT NOT NULL,
ref_id_second_level INT NULL,
search_did INT NOT NULL
);
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('allow_message_tool', NULL, 'radio', 'Tools', 'false', 'AllowMessageToolTitle', 'AllowMessageToolComment', NULL, NULL);
INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_message_tool', 'true', 'Yes');
INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_message_tool', 'false', 'No');
-- to make a DRH have the same rights as a tutor
-- INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('drhCourseManagerRights',null,'radio','Platform','true','DrhCourseManagerRightsTitle','DrhCoursManagerRightsComment',null,null,1,0);
-- enable RSS feeds in social page
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'rssfeeds','RSS feeds',0,0);

22
main/install/migrate-db-1.8.6-1.8.6.1-pre.sql
Unescape View File

@ -32,8 +32,28 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('show_tutor
INSERT INTO settings_options (variable, value, display_text) VALUES ('show_tutor_data','false','No');
INSERT INTO settings_options (variable, value, display_text) VALUES ('show_teacher_data','true','Yes');
INSERT INTO settings_options (variable, value, display_text) VALUES ('show_teacher_data','false','No');
INSERT IGNORE INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('dokeos_database_version',NULL,'textfield',NULL,'1.8.6.1.8171','DokeosDatabaseVersion','',NULL,NULL,1,0);
ALTER TABLE user_friend ADD COLUMN last_edit DATETIME;
ALTER TABLE reservation_item ADD always_available TINYINT NOT NULL default 0;
CREATE TABLE gradebook_certificate( id bigint unsigned not null auto_increment, cat_id int unsigned not null, user_id int unsigned not null, score_certificate float unsigned not null default 0, date_certificate datetime not null default '0000-00-00 00:00:00', path_certificate text null, PRIMARY KEY(id));
ALTER TABLE gradebook_certificate ADD INDEX idx_gradebook_certificate_category_id(cat_id);
ALTER TABLE gradebook_certificate ADD INDEX idx_gradebook_certificate_user_id(user_id);
ALTER TABLE gradebook_certificate ADD INDEX idx_gradebook_certificate_category_id_user_id(cat_id,user_id);
ALTER TABLE gradebook_category ADD COLUMN document_id int unsigned default NULL;
CREATE TABLE specific_field (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, code char(1) NOT NULL, name VARCHAR( 200 ) NOT NULL);
CREATE TABLE specific_field_values (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, course_code VARCHAR( 40 ) NOT NULL, tool_id VARCHAR( 100 ) NOT NULL, ref_id INT NOT NULL, field_id INT NOT NULL, value VARCHAR( 200 ) NOT NULL);
ALTER TABLE specific_field ADD CONSTRAINT unique_specific_field__code UNIQUE (code);
CREATE TABLE search_engine_ref (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, course_code VARCHAR( 40 ) NOT NULL, tool_id VARCHAR( 100 ) NOT NULL, ref_id_high_level INT NOT NULL, ref_id_second_level INT NULL, search_did INT NOT NULL);
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('search_enabled',NULL,'radio','Tools','false','EnableSearchTitle','EnableSearchComment',NULL,NULL);
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('search_prefilter_prefix',NULL, NULL,'Search','','SearchPrefilterPrefix','SearchPrefilterPrefixComment',NULL,NULL);
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('search_show_unlinked_results',NULL,'radio','Search','true','SearchShowUnlinkedResultsTitle','SearchShowUnlinkedResultsComment',NULL,NULL);
INSERT INTO settings_options (variable, value, display_text) VALUES ('search_enabled', 'true', 'Yes');
INSERT INTO settings_options (variable, value, display_text) VALUES ('search_enabled', 'false', 'No');
INSERT INTO settings_options (variable, value, display_text) VALUES ('search_show_unlinked_results', 'true', 'SearchShowUnlinkedResults');
INSERT INTO settings_options (variable, value, display_text) VALUES ('search_show_unlinked_results', 'false', 'SearchHideUnlinkedResults');
ALTER TABLE gradebook_evaluation ADD COLUMN type varchar(40) NOT NULL default 'evaluation';
INSERT IGNORE INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('dokeos_database_version',NULL,'textfield',NULL,'1.8.6.1.8225','DokeosDatabaseVersion','',NULL,NULL,1,0);
-- xxSTATSxx

Write Preview
Loading…
Cancel
Save