Minor - Fixing grading model example value + updating DB version

main/install/db_main.sql

@@ -854,7 +854,7 @@ VALUES
 ('enable_help_link', NULL, 'radio', 'Platform', 'true', 'EnableHelpLinkTitle', 'EnableHelpLinkTitle', NULL, NULL, 0),
 ('allow_teacher_change_gradebook_grading_model', NULL, 'radio', 'Gradebook', 'false', 'AllowTeacherChangeGradebookGradingModelTitle', 'AllowTeacherChangeGradebookGradingModelComment', NULL, NULL, 1),
 ('grading_model', 'grading_model', 'custom', 'Gradebook', 'false', 'GradingModelTitle', 'GradingModelComment', NULL, NULL, 1),
-('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.15858','DokeosDatabaseVersion','', NULL, NULL, 0);
+('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.16233','DokeosDatabaseVersion','', NULL, NULL, 0);
 
 /*
 ('use_custom_pages',NULL,'radio','Platform','false','UseCustomPages','useCustomPagesComment','platform',NULL,0),
@@ -1157,7 +1157,7 @@ VALUES
 ('enable_help_link', 'false', 'No'),
 ('allow_teacher_change_gradebook_grading_model', 'true', 'Yes'),
 ('allow_teacher_change_gradebook_grading_model', 'false', 'No'),
-('grading_model', '1*X+2*X+3*X/4', 'Model 1'),
+('grading_model', '1*X+2*X+3*X/6', 'Model 1'),
 ('grading_model', '1*X+1*X+1*X/3', 'Model 2'),
 ('grading_model', '1*X+1*X+1*X+1*X/4', 'Model 3');
 

main/install/migrate-db-1.8.8-1.9.0-pre.sql

@@ -13,7 +13,7 @@
 -- This first part is for the main database
 
 -- xxMAINxx
-UPDATE settings_current SET selected_value = '1.9.0.15858' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.9.0.16233' WHERE variable = 'chamilo_database_version';
 
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('filter_terms', NULL, 'textarea', 'Security', '', 'FilterTermsTitle', 'FilterTermsComment', NULL, NULL, 0);
 
@@ -100,7 +100,7 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_teac
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('grading_model', 'grading_model', 'custom', 'Gradebook', 'false', 'GradingModelTitle', 'GradingModelComment', NULL, NULL, 1);
 
 
-INSERT INTO settings_options (variable, value, display_text) VALUES ('grading_model', '1*X+2*X+3*X/4', 'Model 1');
+INSERT INTO settings_options (variable, value, display_text) VALUES ('grading_model', '1*X+2*X+3*X/6', 'Model 1');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('grading_model', '1*X+1*X+1*X/3', 'Model 2');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('grading_model', '1*X+1*X+1*X+1*X/4', 'Model 3');
 
@@ -149,4 +149,4 @@ ALTER TABLE student_publication ADD COLUMN contains_file INTEGER NOT NULL DEFAUL
 ALTER TABLE student_publication ADD COLUMN allow_text_assignment INTEGER NOT NULL DEFAULT 0;
 ALTER TABLE quiz ADD COLUMN random_by_category INT NOT NULL DEFAULT 0;
 ALTER TABLE quiz ADD text_when_finished TEXT default NULL;
-ALTER TABLE quiz ADD display_category_name TINYINT NOT NULL DEFAULT 1;
+ALTER TABLE quiz ADD display_category_name TINYINT NOT NULL DEFAULT 1;