Add setting block_quiz_mail_notification_general_coach BT#11816

1.10.x
jmontoyaa 9 years ago
parent 5d53246353
commit cf3164a6e1
  1. 12
      main/exercice/exercise.class.php
  2. 7
      main/inc/lib/course.lib.php

@ -5229,7 +5229,17 @@ class Exercise
$subject = get_lang('ExerciseAttempted'); $subject = get_lang('ExerciseAttempted');
if (!empty($sessionId)) { if (!empty($sessionId)) {
$teachers = CourseManager::get_coach_list_from_course_code($courseCode, $sessionId); $addGeneralCoach = true;
$setting = api_get_configuration_value('block_quiz_mail_notification_general_coach');
if ($setting === true) {
$addGeneralCoach = false;
}
$teachers = CourseManager::get_coach_list_from_course_code(
$courseCode,
$sessionId,
$addGeneralCoach
);
} else { } else {
$teachers = CourseManager::get_teacher_list_from_course_code($courseCode); $teachers = CourseManager::get_teacher_list_from_course_code($courseCode);
} }

@ -1665,9 +1665,10 @@ class CourseManager
* Get a list of coaches of a course and a session * Get a list of coaches of a course and a session
* @param string Course code * @param string Course code
* @param int Session ID * @param int Session ID
* @param bool $addGeneralCoach
* @return array List of users * @return array List of users
*/ */
public static function get_coach_list_from_course_code($course_code, $session_id) public static function get_coach_list_from_course_code($course_code, $session_id, $addGeneralCoach = true)
{ {
if (empty($course_code) OR empty($session_id)) { if (empty($course_code) OR empty($session_id)) {
return array(); return array();
@ -1692,9 +1693,10 @@ class CourseManager
$users[$user['user_id']] = $user_info; $users[$user['user_id']] = $user_info;
} }
if ($addGeneralCoach) {
$table = Database::get_main_table(TABLE_MAIN_SESSION); $table = Database::get_main_table(TABLE_MAIN_SESSION);
// We get the session coach. // We get the session coach.
$sql = 'SELECT id_coach FROM ' . $table . ' WHERE id=' . $session_id; $sql = 'SELECT id_coach FROM '.$table.' WHERE id='.$session_id;
$rs = Database::query($sql); $rs = Database::query($sql);
$session_id_coach = Database::result($rs, 0, 'id_coach'); $session_id_coach = Database::result($rs, 0, 'id_coach');
$user_info = api_get_user_info($session_id_coach); $user_info = api_get_user_info($session_id_coach);
@ -1702,6 +1704,7 @@ class CourseManager
//$user_info['tutor_id'] = $user['tutor_id']; //$user_info['tutor_id'] = $user['tutor_id'];
$user_info['email'] = $user['email']; $user_info['email'] = $user['email'];
$users[$session_id_coach] = $user_info; $users[$session_id_coach] = $user_info;
}
return $users; return $users;
} }

Loading…
Cancel
Save