Minor: RemedialCourse: padding Fix #18221 - refs BT#18221

pull/3886/head
Carlos Alvarado 5 years ago committed by Angel Fernando Quiroz Campos
parent 246c778366
commit c64b2582ca
  1. 98
      main/exercise/exercise.class.php

@ -10979,55 +10979,59 @@ class Exercise
// Courses // Courses
if (false === $count) { if (false === $count) {
$countSelect = " $countSelect = "
cq.title as quiz_title, cq.title as quiz_title,
cq.iid as quiz_id, cq.iid as quiz_id,
cru.c_id as course_id, cru.c_id as course_id,
cru.user_id as user_id, cru.user_id as user_id,
c.title as title, c.title as title,
c.`code` as 'code', c.`code` as 'code',
cq.active as active, cq.active as active,
cq.session_id as session_id cq.session_id as session_id
"; ";
} }
$sql = "SELECT $sql = "
$countSelect SELECT
FROM $countSelect
$tblCourseRelUser as cru FROM
INNER JOIN $tblCourse as c ON ( cru.c_id = c.id ) $tblCourseRelUser as cru
INNER JOIN $tblQuiz as cq ON ( cq.c_id = c.id ) INNER JOIN $tblCourse as c ON ( cru.c_id = c.id )
WHERE INNER JOIN $tblQuiz as cq ON ( cq.c_id = c.id )
cru.is_tutor = 0 WHERE
AND ( cq.session_id = 0 or cq.session_id is null) cru.is_tutor = 0
AND cq.active > 0 AND ( cq.session_id = 0 or cq.session_id is null)
AND cq.c_id = $courseId AND cq.active > 0
AND cq.iid = $exerciseId AND cq.c_id = $courseId
ORDER BY cq.c_id"; AND cq.iid = $exerciseId
ORDER BY cq.c_id";
} else { } else {
//Sessions //Sessions
if (false === $count) { if (false === $count) {
$countSelect = " $countSelect = "
cq.title as quiz_title, cq.title as quiz_title,
cq.iid as quiz_id, cq.iid as quiz_id,
sru.user_id as user_id, sru.user_id as user_id,
cq.c_id as course_id, cq.c_id as course_id,
cq.session_id as session_id, cq.session_id as session_id,
c.title as title, c.title as title,
c.`code` as 'code', c.`code` as 'code',
cq.active as active cq.active as active
"; ";
} }
$sql = "SELECT $countSelect FROM $sql = "
$tblSessionRelUser AS sru SELECT
INNER JOIN $tblQuiz AS cq ON ( sru.session_id = sru.session_id ) $countSelect
INNER JOIN $tblCourse AS c ON ( c.id = cq.c_id ) FROM
WHERE $tblSessionRelUser AS sru
cq.active > 0 INNER JOIN $tblQuiz AS cq ON ( sru.session_id = sru.session_id )
AND cq.c_id = $courseId INNER JOIN $tblCourse AS c ON ( c.id = cq.c_id )
AND sru.session_id = $sessionId WHERE
AND cq.iid = $exerciseId cq.active > 0
ORDER BY AND cq.c_id = $courseId
cq.c_id"; AND sru.session_id = $sessionId
AND cq.iid = $exerciseId
ORDER BY
cq.c_id";
} }
$result = Database::query($sql); $result = Database::query($sql);
@ -11078,7 +11082,7 @@ ORDER BY
$link = "<a href=\"$url\">$url</a>"; $link = "<a href=\"$url\">$url</a>";
foreach ($usersArray as $userId => $userData) { foreach ($usersArray as $userId => $userData) {
$tittle = get_lang('QuizRemindSubject'); $title = get_lang('QuizRemindSubject');
$content = sprintf( $content = sprintf(
get_lang('QuizRemindBody'), get_lang('QuizRemindBody'),
$courseTitle, $courseTitle,
@ -11087,7 +11091,7 @@ ORDER BY
); );
MessageManager::send_message_simple( MessageManager::send_message_simple(
$userId, $userId,
$tittle, $title,
$content, $content,
0, 0,
true true

Loading…
Cancel
Save