Julio Montoya преди 11 години
родител
ревизия
735ef00908

+ 16 - 9
vendor/chamilo/chash/src/Chash/Resources/Database/1.10.0/db_main.sql

@@ -32,16 +32,16 @@ CREATE TABLE IF NOT EXISTS user (
   openarea text,
   openarea text,
   teach text,
   teach text,
   productions varchar(250) default NULL,
   productions varchar(250) default NULL,
-  chatcall_user_id int unsigned NOT NULL default '0',
-  chatcall_date datetime NOT NULL default '0000-00-00 00:00:00',
-  chatcall_text varchar(50) NOT NULL default '',
+  chatcall_user_id int unsigned default 0,
+  chatcall_date datetime default NULL,
+  chatcall_text varchar(50) default NULL,
   language varchar(40) default NULL,
   language varchar(40) default NULL,
   registration_date datetime NOT NULL default '0000-00-00 00:00:00',
   registration_date datetime NOT NULL default '0000-00-00 00:00:00',
-  expiration_date datetime NOT NULL default '0000-00-00 00:00:00',
+  expiration_date datetime default NULL,
   active tinyint unsigned NOT NULL default 1,
   active tinyint unsigned NOT NULL default 1,
   openid varchar(255) DEFAULT NULL,
   openid varchar(255) DEFAULT NULL,
   theme varchar(255) DEFAULT NULL,
   theme varchar(255) DEFAULT NULL,
-  hr_dept_id int unsigned NOT NULL default 0,
+  hr_dept_id int unsigned default 0,
   salt VARCHAR(255) DEFAULT NULL,
   salt VARCHAR(255) DEFAULT NULL,
   PRIMARY KEY (user_id),
   PRIMARY KEY (user_id),
   UNIQUE KEY username (username)
   UNIQUE KEY username (username)
@@ -79,10 +79,10 @@ INSERT INTO roles (id ,name, role) VALUES('5', 'Student', 'ROLE_STUDENT');
 INSERT INTO roles (id, name, role) VALUES('6', 'Anonymous', 'ROLE_ANONYMOUS');
 INSERT INTO roles (id, name, role) VALUES('6', 'Anonymous', 'ROLE_ANONYMOUS');
 INSERT INTO roles (id, name, role) VALUES('11', 'Admin', 'ROLE_ADMIN');
 INSERT INTO roles (id, name, role) VALUES('11', 'Admin', 'ROLE_ADMIN');
 INSERT INTO roles (id, name, role) VALUES('17', 'Question Manager', 'ROLE_QUESTION_MANAGER');
 INSERT INTO roles (id, name, role) VALUES('17', 'Question Manager', 'ROLE_QUESTION_MANAGER');
+INSERT INTO roles (id, name, role) VALUES('18', 'Global admin', 'ROLE_GLOBAL_ADMIN');
 
 
 -- Admin
 -- Admin
-INSERT INTO users_roles VALUES (1, 11);
-
+INSERT INTO users_roles VALUES (1, 18);
 
 
 --
 --
 -- Table structure for table admin
 -- Table structure for table admin
@@ -504,6 +504,8 @@ CREATE TABLE IF NOT EXISTS session (
   id INT unsigned NOT NULL auto_increment,
   id INT unsigned NOT NULL auto_increment,
   id_coach int unsigned NOT NULL default '0',
   id_coach int unsigned NOT NULL default '0',
   name char(150) NOT NULL default '',
   name char(150) NOT NULL default '',
+  description text,
+  show_description int default NULL,
   nbr_courses int unsigned NOT NULL default '0',
   nbr_courses int unsigned NOT NULL default '0',
   nbr_users int unsigned NOT NULL default '0',
   nbr_users int unsigned NOT NULL default '0',
   nbr_classes int unsigned NOT NULL default '0',
   nbr_classes int unsigned NOT NULL default '0',
@@ -963,6 +965,7 @@ VALUES
 ('admins_can_set_users_pass', NULL, 'radio', 'security', 'true', 'AdminsCanChangeUsersPassTitle', 'AdminsCanChangeUsersPassComment', 1, 0, 1),
 ('admins_can_set_users_pass', NULL, 'radio', 'security', 'true', 'AdminsCanChangeUsersPassTitle', 'AdminsCanChangeUsersPassComment', 1, 0, 1),
 ('template', NULL, 'text', 'stylesheets', 'default', 'DefaultTemplateTitle', 'DefaultTemplateComment', NULL, NULL, 1),
 ('template', NULL, 'text', 'stylesheets', 'default', 'DefaultTemplateTitle', 'DefaultTemplateComment', NULL, NULL, 1),
 ('breadcrumb_navigation_display', NULL, 'radio', 'Platform','true','BreadcrumbNavigationDisplayTitle', 'BreadcrumbNavigationDisplayComment', NULL, NULL, 1),
 ('breadcrumb_navigation_display', NULL, 'radio', 'Platform','true','BreadcrumbNavigationDisplayTitle', 'BreadcrumbNavigationDisplayComment', NULL, NULL, 1),
+('default_calendar_view', NULL, 'radio', 'Platform','month','DefaultCalendarViewTitle', 'DefaultCalendarViewComment', NULL, NULL, 1)
 ('chamilo_database_version', NULL, 'textfield', NULL, '1.10.0.001', 'DatabaseVersion', '', NULL, NULL, 0); -- base value, updated at end of file. Don't change here
 ('chamilo_database_version', NULL, 'textfield', NULL, '1.10.0.001', 'DatabaseVersion', '', NULL, NULL, 0); -- base value, updated at end of file. Don't change here
 
 
 UNLOCK TABLES;
 UNLOCK TABLES;
@@ -1322,7 +1325,11 @@ VALUES
 ('admins_can_set_users_pass','true','Yes'),
 ('admins_can_set_users_pass','true','Yes'),
 ('admins_can_set_users_pass','false','No'),
 ('admins_can_set_users_pass','false','No'),
 ('breadcrumb_navigation_display', 'true', 'Show'),
 ('breadcrumb_navigation_display', 'true', 'Show'),
-('breadcrumb_navigation_display', 'false', 'Hide');
+('breadcrumb_navigation_display', 'false', 'Hide'),
+('default_calendar_view', 'month', 'Month'),
+('default_calendar_view', 'basicWeek', 'BasicWeek'),
+('default_calendar_view', 'agendaWeek', 'Week'),
+('default_calendar_view', 'agendaDay', 'Day');
 
 
 UNLOCK TABLES;
 UNLOCK TABLES;
 
 
@@ -3625,4 +3632,4 @@ CREATE TABLE curriculum_rel_user (
 
 
 
 
 -- Do not move this
 -- Do not move this
-UPDATE settings_current SET selected_value = '1.10.0.039' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.043' WHERE variable = 'chamilo_database_version';

+ 22 - 7
vendor/chamilo/chash/src/Chash/Resources/Database/1.10.0/migrate-db-1.9.0-1.10.0-pre.sql

@@ -120,7 +120,7 @@ ALTER TABLE c_survey_invitation ADD COLUMN group_id INT NOT NULL DEFAULT 0;
 ALTER TABLE c_lp ADD COLUMN category_id INT unsigned NOT NULL default 0;
 ALTER TABLE c_lp ADD COLUMN category_id INT unsigned NOT NULL default 0;
 ALTER TABLE c_lp ADD COLUMN max_attempts INT NOT NULL default 0;
 ALTER TABLE c_lp ADD COLUMN max_attempts INT NOT NULL default 0;
 ALTER TABLE c_lp ADD COLUMN subscribe_users INT NOT NULL default 0;
 ALTER TABLE c_lp ADD COLUMN subscribe_users INT NOT NULL default 0;
-ALTER TABLE user MODIFY COLUMN hr_dept_id int unsigned NOT NULL default 0;
+ALTER TABLE user MODIFY COLUMN hr_dept_id int unsigned default 0;
 ALTER TABLE session MODIFY COLUMN id INT unsigned NOT NULL auto_increment;
 ALTER TABLE session MODIFY COLUMN id INT unsigned NOT NULL auto_increment;
 ALTER TABLE session MODIFY COLUMN nbr_courses int unsigned NOT NULL default 0;
 ALTER TABLE session MODIFY COLUMN nbr_courses int unsigned NOT NULL default 0;
 ALTER TABLE session MODIFY COLUMN nbr_users int unsigned NOT NULL default 0;
 ALTER TABLE session MODIFY COLUMN nbr_users int unsigned NOT NULL default 0;
@@ -295,10 +295,21 @@ ALTER TABLE c_attendance_sheet_log DROP PRIMARY KEY;
 ALTER TABLE c_attendance_sheet_log add COLUMN iid int unsigned not null AUTO_INCREMENT PRIMARY KEY FIRST;
 ALTER TABLE c_attendance_sheet_log add COLUMN iid int unsigned not null AUTO_INCREMENT PRIMARY KEY FIRST;
 ALTER TABLE c_attendance_sheet_log add UNIQUE KEY(c_id,id);
 ALTER TABLE c_attendance_sheet_log add UNIQUE KEY(c_id,id);
 ALTER TABLE c_attendance_sheet_log ENGINE = InnoDB;
 ALTER TABLE c_attendance_sheet_log ENGINE = InnoDB;
+ALTER TABLE session ADD COLUMN description TEXT;
+ALTER TABLE session ADD COLUMN show_description int default NULL;
 
 
 ALTER TABLE c_quiz_category ADD COLUMN visibility INT default 1;
 ALTER TABLE c_quiz_category ADD COLUMN visibility INT default 1;
 ALTER TABLE c_quiz_question ADD INDEX idx_c_q_qst_cpt (c_id, parent_id, type);
 ALTER TABLE c_quiz_question ADD INDEX idx_c_q_qst_cpt (c_id, parent_id, type);
 ALTER TABLE c_quiz_question_rel_category ADD INDEX idx_c_q_qst_r_cat_qc(question_id, c_id);
 ALTER TABLE c_quiz_question_rel_category ADD INDEX idx_c_q_qst_r_cat_qc(question_id, c_id);
+ALTER TABLE c_quiz ADD COLUMN question_selection_type INT DEFAULT 1;
+ALTER TABLE c_quiz ADD COLUMN hide_question_title INT DEFAULT 0;
+ALTER TABLE c_quiz ADD COLUMN global_category_id INT DEFAULT NULL;
+
+ALTER TABLE user MODIFY COLUMN chatcall_user_id int unsigned default 0;
+ALTER TABLE user MODIFY COLUMN chatcall_date datetime default NULL;
+ALTER TABLE user MODIFY COLUMN chatcall_text varchar(50) default NULL;
+ALTER TABLE user MODIFY COLUMN expiration_date datetime default NULL;
+
 
 
 INSERT INTO roles (id, name, role) VALUES('1', 'Teacher', 'ROLE_TEACHER');
 INSERT INTO roles (id, name, role) VALUES('1', 'Teacher', 'ROLE_TEACHER');
 INSERT INTO roles (id, name, role) VALUES('4', 'RRHH', 'ROLE_RRHH');
 INSERT INTO roles (id, name, role) VALUES('4', 'RRHH', 'ROLE_RRHH');
@@ -307,10 +318,7 @@ INSERT INTO roles (id ,name, role) VALUES('5', 'Student', 'ROLE_STUDENT');
 INSERT INTO roles (id, name, role) VALUES('6', 'Anonymous', 'ROLE_ANONYMOUS');
 INSERT INTO roles (id, name, role) VALUES('6', 'Anonymous', 'ROLE_ANONYMOUS');
 INSERT INTO roles (id, name, role) VALUES('11', 'Admin', 'ROLE_ADMIN');
 INSERT INTO roles (id, name, role) VALUES('11', 'Admin', 'ROLE_ADMIN');
 INSERT INTO roles (id, name, role) VALUES('17', 'Question Manager', 'ROLE_QUESTION_MANAGER');
 INSERT INTO roles (id, name, role) VALUES('17', 'Question Manager', 'ROLE_QUESTION_MANAGER');
-
-ALTER TABLE c_quiz ADD COLUMN question_selection_type INT DEFAULT 1;
-ALTER TABLE c_quiz ADD COLUMN hide_question_title INT DEFAULT 0;
-ALTER TABLE c_quiz ADD COLUMN global_category_id INT DEFAULT NULL;
+INSERT INTO roles (id, name, role) VALUES('18', 'Global admin', 'ROLE_GLOBAL_ADMIN');
 
 
 -- Admin
 -- Admin
 INSERT INTO users_roles VALUES (1, 11);
 INSERT INTO users_roles VALUES (1, 11);
@@ -347,11 +355,18 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('use_virtua
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('disable_copy_paste', NULL, 'radio', 'Platform', 'false','DisableCopyPasteTitle','DisableCopyPasteComment', NULL, NULL, 1);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('disable_copy_paste', NULL, 'radio', 'Platform', 'false','DisableCopyPasteTitle','DisableCopyPasteComment', NULL, NULL, 1);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('disable_copy_paste', 'true', 'Show');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('disable_copy_paste', 'true', 'Show');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('disable_copy_paste', 'false', 'Hide');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('disable_copy_paste', 'false', 'Hide');
-INSERT INTO settings_current(variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable)  VALUES ('showonline','session','checkbox','Platform','true','ShowOnlineTitle','ShowOnlineComment',NULL,'ShowOnlineSession', 0);
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('showonline','session','checkbox','Platform','true','ShowOnlineTitle','ShowOnlineComment',NULL,'ShowOnlineSession', 0);
+
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('default_calendar_view', NULL, 'radio', 'Platform','month','DefaultCalendarViewTitle', 'DefaultCalendarViewComment', NULL, NULL, 1);
+INSERT INTO settings_options (variable, value, display_text) VALUES ('default_calendar_view', 'month', 'Month');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('default_calendar_view', 'basicWeek', 'BasicWeek');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('default_calendar_view', 'agendaWeek', 'Week');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('default_calendar_view', 'agendaDay', 'Day');
+
 
 
 INSERT INTO branch_transaction_status VALUES (1, 'To be executed'), (2, 'Executed successfully'), (3, 'Execution deprecated'), (4, 'Execution failed');
 INSERT INTO branch_transaction_status VALUES (1, 'To be executed'), (2, 'Executed successfully'), (3, 'Execution deprecated'), (4, 'Execution failed');
 
 
 UPDATE course_field SET field_type = 3 WHERE field_variable = 'special_course';
 UPDATE course_field SET field_type = 3 WHERE field_variable = 'special_course';
 
 
 -- Do not move this
 -- Do not move this
-UPDATE settings_current SET selected_value = '1.10.0.039' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.043' WHERE variable = 'chamilo_database_version';