Improving query see BT#6770

1.9.x
Julio Montoya 11 years ago
parent eec08e8eb6
commit 3076f7c177
  1. 8
      main/inc/lib/sessionmanager.lib.php
  2. 11
      main/inc/lib/usermanager.lib.php

@ -521,10 +521,10 @@ class SessionManager
$where = " WHERE a.session_id = %d
AND a.course_code = '%s'
AND q.id = %d";
if ($answer != 2)
if ($answer != 2)
{
$where .= sprintf(' AND qa.correct = %d', $answer);
$where .= sprintf(' AND qa.correct = %d', $answer);
}
$limit = null;
@ -3332,7 +3332,7 @@ class SessionManager
switch ($status) {
// Classic DRH
case 'drh':
$studentListSql = UserManager::get_users_followed_by_drh($userId, STUDENT, true);
$studentListSql = UserManager::get_users_followed_by_drh($userId, STUDENT, true, true);
$statusConditions = " AND u.user_id IN (".$studentListSql.") ";
break;
// Show all by DRH

@ -3453,9 +3453,11 @@ class UserManager
* get users followed by human resource manager
* @param int hr_dept id
* @param int user status (optional)
* @param bool $getOnlyUserId
* @param bool $getSql
* @return array users
*/
public static function get_users_followed_by_drh($hr_dept_id, $user_status = 0, $getSql = false)
public static function get_users_followed_by_drh($hr_dept_id, $user_status = 0, $getOnlyUserId = false, $getSql = false)
{
// Database Table Definitions
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@ -3468,8 +3470,11 @@ class UserManager
if (!empty($user_status)) {
$condition_status = ' AND u.status = '.$user_status;
}
$sql = "SELECT u.user_id, u.username, u.lastname, u.firstname, u.email FROM $tbl_user u
$select = " SELECT u.user_id, u.username, u.lastname, u.firstname, u.email ";
if ($getOnlyUserId) {
$select = " SELECT u.user_id";
}
$sql = " $select FROM $tbl_user u
INNER JOIN $tbl_user_rel_user uru ON (uru.user_id = u.user_id)
LEFT JOIN $tbl_user_rel_access_url a ON (a.user_id = u.user_id)
WHERE friend_user_id = '$hr_dept_id' AND

Loading…
Cancel
Save