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

Improving queries see BT#7297

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 62e385a0b2
commit a9d99243db
2 changed files with 48 additions and 17 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. 57
      main/inc/lib/sessionmanager.lib.php
  2. 8
      main/mySpace/index.php

57
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -3449,6 +3449,8 @@ class SessionManager
* @param string $keyword
* @param string $active
* @param string $lastConnectionDate
* @param array $sessionIdList
* @param array $studentIdList
* @return array|int
*/
public static function getAllUsersFromCoursesFromAllSessionFromStatus(
@ -3461,7 +3463,9 @@ class SessionManager
$direction = 'asc',
$keyword = null,
$active = null,
$lastConnectionDate = null
$lastConnectionDate = null,
$sessionIdList = array(),
$studentIdList = array()
) {
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
@ -3492,16 +3496,30 @@ class SessionManager
switch ($status) {
case 'drh':
// Classic DRH
$studentListSql = UserManager::get_users_followed_by_drh($userId, STUDENT, true, true);
$statusConditions = " AND u.user_id IN (".$studentListSql.") ";
if (empty($sessionIdList)) {
$studentListSql = UserManager::get_users_followed_by_drh($userId, STUDENT, true, true);
} else {
$studentListSql = $studentIdList;
}
if (!empty($studentListSql)) {
$studentListSql = array_map('intval', $studentListSql);
$statusConditions = " AND u.user_id IN (".$studentListSql.") ";
}
break;
case 'drh_all':
// Show all by DRH
$sessionsListSql = SessionManager::get_sessions_followed_by_drh($userId, null, null, false, true, true);
$statusConditions = " AND s.id IN (".$sessionsListSql.") ";
if (empty($sessionIdList)) {
$sessionsListSql = SessionManager::get_sessions_followed_by_drh($userId, null, null, false, true, true);
} else {
$sessionsListSql = $sessionIdList;
}
if (!empty($sessionsListSql)) {
$sessionsListSql = array_map('intval', $sessionsListSql);
$statusConditions = " AND s.id IN (".$sessionsListSql.") ";
}
break;
case 'session_admin';
$statusConditions = " AND s.id_coach = $userId";
$statusConditions = " AND s.id_coach = $userId ";
break;
case 'admin':
break;
@ -3716,10 +3734,17 @@ class SessionManager
* @param string $keyword
* @param string $active
* @param string $lastConnectionDate
* @param array $sessionIdList
* @param array $studentIdList
* @return array|int
*/
public static function getCountUserTracking($keyword = null, $active = null, $lastConnectionDate = null)
{
public static function getCountUserTracking(
$keyword = null,
$active = null,
$lastConnectionDate = null,
$sessionIdList = array(),
$studentIdList = array()
) {
if (!isset($keyword)) {
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
}
@ -3740,7 +3765,9 @@ class SessionManager
null,
$keyword,
$active,
$lastConnectionDate
$lastConnectionDate,
$sessionIdList,
$studentIdList
);
} else {
$count = self::getAllUsersFromCoursesFromAllSessionFromStatus(
@ -3753,7 +3780,9 @@ class SessionManager
null,
$keyword,
$active,
$lastConnectionDate
$lastConnectionDate,
$sessionIdList,
$studentIdList
);
}
} else {
@ -3768,7 +3797,9 @@ class SessionManager
null,
$keyword,
$active,
$lastConnectionDate
$lastConnectionDate,
$sessionIdList,
$studentIdList
);
} else {
$count = self::getAllUsersFromCoursesFromAllSessionFromStatus(
@ -3781,7 +3812,9 @@ class SessionManager
null,
$keyword,
$active,
$lastConnectionDate
$lastConnectionDate,
$sessionIdList,
$studentIdList
);
}
}

8
main/mySpace/index.php
Unescape View File

@ -280,7 +280,6 @@ if (!empty($students)) {
// Inactive students
$inactiveUsers = Tracking::getInactiveUsers($studentIds, $daysAgo);
$totalTimeSpent = Tracking::get_time_spent_on_the_platform($studentIds);
$posts = Tracking::count_student_messages($studentIds);
$countAssignments = Tracking::count_student_assignments($studentIds);
$progress = Tracking::get_avg_student_progress($studentIds);
@ -333,11 +332,10 @@ if (!empty($students)) {
$csv_content[] = array();
} else {
$lastConnectionDate = api_get_utc_datetime(strtotime('15 days ago'));
$countActiveUsers = SessionManager::getCountUserTracking(null, 1);
$countInactiveUsers = SessionManager::getCountUserTracking(null, 0);
$countActiveUsers = $nb_students; //SessionManager::getCountUserTracking(null, 1);
$countInactiveUsers = SessionManager::getCountUserTracking(null, 0, null, $sessionIdList, $studentIds);
$countSleepingTeachers = SessionManager::getTeacherTracking(api_get_user_id(), 1, $lastConnectionDate, true, $sessionIdList);
$countSleepingStudents = SessionManager::getCountUserTracking(null, 1, $lastConnectionDate);
$countSleepingStudents = SessionManager::getCountUserTracking(null, 1, $lastConnectionDate, $sessionIdList, $studentIds);
$form = new FormValidator('search_user', 'get', api_get_path(WEB_CODE_PATH).'mySpace/student.php');
$form->addElement('text', 'keyword', get_lang('User'));

Write Preview
Loading…
Cancel
Save