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

Adding gradebook_block platform setting + adding c_id in the track_e_default table see #4635

Browse Source
skala
Julio Montoya 13 years ago
parent be42ac122c
commit 57c757dd37
4 changed files with 55 additions and 37 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. 77
      main/inc/lib/events.lib.inc.php
  2. 7
      main/install/db_main.sql
  3. 1
      main/install/db_stats.sql
  4. 7
      main/install/migrate-db-1.8.8-1.9.0-pre.sql

77
main/inc/lib/events.lib.inc.php
Unescape View File

@ -562,7 +562,7 @@ function exercise_attempt_hotspot($exe_id, $question_id, $answer_id, $correct, $
* @param integer User ID (defaults to null)
* @param string Course code (defaults to null)
*/
function event_system($event_type, $event_value_type, $event_value, $datetime = null, $user_id=null, $course_code=null) {
function event_system($event_type, $event_value_type, $event_value, $datetime = null, $user_id = null, $course_code = null) {
global $_user;
global $TABLETRACK_DEFAULT;
@ -579,18 +579,25 @@ function event_system($event_type, $event_value_type, $event_value, $datetime =
unset($event_value['avatar']);
unset($event_value['password']);
unset($event_value['lastLogin']);
unset($event_value['picture_uri']);
unset($event_value['picture_uri']);
$event_value = serialize($event_value);
}
}
$event_value = Database::escape_string($event_value);
$user_id = Database::escape_string($user_id);
$course_code = Database::escape_string($course_code);
$course_info = api_get_course_info($course_code);
$course_id = null;
if (!empty($course_info)) {
$course_id = $course_info['real_id'];
}
if (!isset($datetime)) {
$datetime = api_get_utc_datetime();
}
$datetime = Database::escape_string($datetime);
if(!isset($user_id)) {
@ -599,17 +606,19 @@ function event_system($event_type, $event_value_type, $event_value, $datetime =
if(!isset($course_code)) {
$course_code = '';
}
$sql = "INSERT INTO $TABLETRACK_DEFAULT
(default_user_id,
default_cours_code,
c_id,
default_date,
default_event_type,
default_value_type,
default_value
)
VALUES
('$user_id.',
VALUES('$user_id.',
'$course_code',
'$course_id',
'$datetime',
'$event_type',
'$event_value_type',
@ -617,37 +626,37 @@ function event_system($event_type, $event_value_type, $event_value, $datetime =
$res = Database::query($sql);
//Sending notifications to users
$send_event_setting = api_get_setting('activate_send_event_by_mail');
if (!empty($send_event_setting) && $send_event_setting == 'true') {
global $language_file;
//prepare message
list($message, $subject) = get_event_message_and_subject($event_type);
$mail_body=$message;
if ( is_array($notification_infos) ){
foreach ($notification_infos as $variable => $value) {
$mail_body = str_replace('%'.$variable.'%',$value,$mail_body);
}
}
$send_event_setting = api_get_setting('activate_send_event_by_mail');
if (!empty($send_event_setting) && $send_event_setting == 'true') {
global $language_file;
//prepare message
list($message, $subject) = get_event_message_and_subject($event_type);
$mail_body=$message;
if (is_array($notification_infos)) {
foreach ($notification_infos as $variable => $value) {
$mail_body = str_replace('%'.$variable.'%',$value,$mail_body);
}
}
//prepare mail common variables
if(empty($subject)) {
$subject = $event_type;
}
$mail_subject = '['.api_get_setting('siteName').'] '.$subject;
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$emailfromaddr = api_get_setting('emailAdministrator');
$emailfromname = api_get_setting('siteName');
//Send mail to all subscribed users
$users_arr = get_users_subscribed_to_event($event_type);
foreach ($users_arr as $user) {
$recipient_name = api_get_person_name($user['firstname'], $user['lastname']);
$email = $user['email'];
@api_mail($recipient_name, $email, $mail_subject, $mail_body, $sender_name, $email_admin);
//prepare mail common variables
if(empty($subject)) {
$subject = $event_type;
}
$mail_subject = '['.api_get_setting('siteName').'] '.$subject;
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
$emailfromaddr = api_get_setting('emailAdministrator');
$emailfromname = api_get_setting('siteName');
//Send mail to all subscribed users
$users_arr = get_users_subscribed_to_event($event_type);
foreach ($users_arr as $user) {
$recipient_name = api_get_person_name($user['firstname'], $user['lastname']);
$email = $user['email'];
@api_mail($recipient_name, $email, $mail_subject, $mail_body, $sender_name, $email_admin);
}
}
}
return true;
}

7
main/install/db_main.sql
Unescape View File

@ -858,7 +858,8 @@ VALUES
('teachers_can_change_grade_model_settings', NULL, 'radio', 'Gradebook', 'true', 'TeachersCanChangeGradeModelSettingsTitle', 'TeachersCanChangeGradeModelSettingsComment', NULL, NULL, 1),
('shibboleth_description', NULL, 'radio', 'Shibboleth', 'false', 'ShibbolethMainActivateTitle', 'ShibbolethMainActivateComment', NULL, NULL, 0),
('facebook_description', NULL, 'radio', 'Facebook', 'false', 'FacebookMainActivateTitle', 'FacebookMainActivateComment', NULL, NULL, 0),
('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17763','DatabaseVersion','', NULL, NULL, 0);
('gradebook_locking_enabled', NULL, 'radio', 'Gradebook', 'false', 'GradebookEnableLockingTitle', 'GradebookEnableLockingComment', NULL, NULL, 0),
('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17769','DatabaseVersion','', NULL, NULL, 0);
/*
('show_tabs', 'custom_tab_1', 'checkbox', 'Platform', 'true', 'ShowTabsTitle', 'ShowTabsComment', NULL, 'TabsCustom1', 1),
@ -1196,7 +1197,9 @@ VALUES
('teachers_can_change_score_settings', 'true', 'Yes'),
('teachers_can_change_score_settings', 'false', 'No'),
('teachers_can_change_grade_model_settings', 'true', 'Yes'),
('teachers_can_change_grade_model_settings', 'false', 'No');
('teachers_can_change_grade_model_settings', 'false', 'No'),
('gradebook_locking_enabled', 'true', 'Yes'),
('gradebook_locking_enabled', 'false', 'No');
UNLOCK TABLES;
/*
('activate_send_event_by_mail', 'true', 'Yes'),

1
main/install/db_stats.sql
Unescape View File

@ -85,6 +85,7 @@ CREATE TABLE track_e_default (
default_event_type varchar(20) NOT NULL default '',
default_value_type varchar(20) NOT NULL default '',
default_value text NOT NULL,
c_id int unsigned default NULL,
PRIMARY KEY (default_id)
);

7
main/install/migrate-db-1.8.8-1.9.0-pre.sql
Unescape View File

@ -100,6 +100,10 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_grade_model_settings', 'true', 'Yes');
INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_grade_model_settings', 'false', 'No');
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('gradebook_locking_enabled', NULL, 'radio', 'Gradebook', 'false', 'GradebookEnableLockingTitle', 'GradebookEnableLockingComment', NULL, NULL, 0);
INSERT INTO settings_options (variable, value, display_text) VALUES ('gradebook_locking_enabled', 'true', 'Yes');
INSERT INTO settings_options (variable, value, display_text) VALUES ('gradebook_locking_enabled', 'false', 'No');
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('allow_users_to_change_email_with_no_password', NULL, 'radio', 'User', 'false', 'AllowUsersToChangeEmailWithNoPasswordTitle', 'AllowUsersToChangeEmailWithNoPasswordComment', NULL, NULL, 0);
INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_users_to_change_email_with_no_password', 'true', 'Yes');
INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_users_to_change_email_with_no_password', 'false', 'No');
@ -190,7 +194,7 @@ DELETE FROM settings_current WHERE variable = 'use_document_title';
DELETE FROM settings_options WHERE variable = 'use_document_title';
-- Do not move this query
UPDATE settings_current SET selected_value = '1.9.0.17763' WHERE variable = 'chamilo_database_version';
UPDATE settings_current SET selected_value = '1.9.0.17769' WHERE variable = 'chamilo_database_version';
-- xxSTATSxx
ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT '';
@ -203,6 +207,7 @@ ALTER TABLE stored_values_stack ADD KEY (user_id, sco_id, course_id, sv_key, sta
ALTER TABLE stored_values_stack ADD UNIQUE (user_id, sco_id, course_id, sv_key, stack_order);
ALTER TABLE track_e_attempt ADD COLUMN filename VARCHAR(255) DEFAULT NULL;
ALTER TABLE track_e_default ADD COLUMN c_id INTEGER DEFAULT NULL;
-- xxUSERxx

Write Preview
Loading…
Cancel
Save