Improve presentation list users in users CT#968

main/inc/lib/course.lib.php

@@ -949,8 +949,8 @@ class CourseManager {
 		}
 
 		$sql = $session_id == 0
-			? 'SELECT DISTINCT course_rel_user.status, user.user_id, course_rel_user.role, course_rel_user.tutor_id, user.*  '
+			? 'SELECT DISTINCT course_rel_user.status as status_rel, user.user_id, course_rel_user.role, course_rel_user.tutor_id, user.*  '
-			: 'SELECT DISTINCT user.user_id, user.status, user.*  ';
+			: 'SELECT DISTINCT user.user_id, session_course_user.status as status_session, user.*  ';
 		$sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
 
 
@@ -995,7 +995,6 @@ class CourseManager {
 
 			$users[$user['user_id']] = $user_info;
 		}
-
 		return $users;
 	}
 

main/user/user.php

@@ -473,25 +473,12 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				$temp[] = $o_course_user['role'];
 				$temp[] = implode(', ', $groups_name); //Group
 				$temp[] = $o_course_user['official_code'];
-/*
-				// deprecated feature
-				if ((isset($o_course_user['tutor_id']) && $o_course_user['tutor_id'] == 1) || (isset($o_course_user['status_session']) && $o_course_user['status_session'] == 2)) {
-					$temp[] = get_lang('Tutor');
-				} else {
-					$temp[] = '-';
-				}
 
-				if (isset($o_course_user['status']) && $o_course_user['status'] == 1) {
-					$temp[] = get_lang('CourseManager');
-				} else {
-					$temp[] = '-';
-				}
-*/
 				// deprecated feature
-				if ((isset($o_course_user['tutor_id']) && $o_course_user['tutor_id'] == 1) || (isset($o_course_user['status_session']) && $o_course_user['status_session'] == 2)) {
+				if ((isset($o_course_user['status_rel']) && $o_course_user['status_rel'] == 1) || (isset($o_course_user['status_session']) && $o_course_user['status_session'] == 2)) {
-					$temp[] = get_lang('Tutor');
-				} elseif (isset($o_course_user['status']) && $o_course_user['status'] == 1) {
 					$temp[] = get_lang('CourseManager');
+				} elseif (isset($o_course_user['tutor_id']) && $o_course_user['tutor_id'] == 1) {
+					$temp[] = get_lang('Tutor');
 				} else {
 					$temp[] = '-';
 				}