Add course in drh list if "session all content" setting is on see BT#11652

1.10.x
jmontoyaa 9 years ago
parent 5329e3033c
commit 37f12a95de
  1. 23
      main/inc/lib/sessionmanager.lib.php
  2. 4
      main/inc/lib/tracking.lib.php

@ -3287,7 +3287,22 @@ class SessionManager
$getCount = false, $getCount = false,
$keyword = null $keyword = null
) { ) {
$platformCourses = null;
if (empty($sessionId)) { if (empty($sessionId)) {
$platformCourses = CourseManager::getCoursesFollowedByUser(
$userId,
DRH,
null,
null,
null,
null,
$getCount,
null,
null,
true
);
$sessionsSQL = SessionManager::get_sessions_followed_by_drh( $sessionsSQL = SessionManager::get_sessions_followed_by_drh(
$userId, $userId,
null, null,
@ -3327,7 +3342,7 @@ class SessionManager
if ($getCount) { if ($getCount) {
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result,'ASSOC'); $row = Database::fetch_array($result,'ASSOC');
return $row['count']; return $row['count'] + (int) $platformCourses;
} }
if (isset($from) && isset($limit)) { if (isset($from) && isset($limit)) {
@ -3346,6 +3361,12 @@ class SessionManager
} }
} }
if (!empty($platformCourses)) {
foreach ($platformCourses as $course) {
$courses[$course['real_id']] = $course;
}
}
return $courses; return $courses;
} }

@ -1200,9 +1200,11 @@ class Tracking
foreach ($platformCourses as $course) { foreach ($platformCourses as $course) {
$courses[$course['code']] = $course['code']; $courses[$course['code']] = $course['code'];
} }
$sessions = SessionManager::get_sessions_followed_by_drh($userId); $sessions = SessionManager::get_sessions_followed_by_drh($userId);
} else { } else {
$studentList = UserManager::getUsersFollowedByUser( $studentList = UserManager::getUsersFollowedByUser(
$userId, $userId,
STUDENT, STUDENT,

Loading…
Cancel
Save