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

Adding order by see BT#9287

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 7820985bdd
commit ead31e12f1
3 changed files with 66 additions and 25 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. 2
      main/gradebook/gradebook_flatview.php
  2. 11
      main/gradebook/lib/flatview_data_generator.class.php
  3. 60
      main/gradebook/lib/gradebook_functions_users.inc.php

2
main/gradebook/gradebook_flatview.php
Unescape View File

@ -99,7 +99,6 @@ if ($simple_search_form->validate() && (empty($keyword))) {
if (!empty($keyword)) {
$users = find_students($keyword);
} else {
if (isset($alleval) && isset($alllinks)) {
$users = get_all_users($alleval, $alllinks);
@ -107,7 +106,6 @@ if (!empty($keyword)) {
$users = null;
}
}
$offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
// Main course category

11
main/gradebook/lib/flatview_data_generator.class.php
Unescape View File

@ -273,6 +273,7 @@ class FlatViewDataGenerator
// sort users array
if ($users_sorting & self :: FVDG_SORT_LASTNAME) {
usort($userTable, array('FlatViewDataGenerator','sort_by_last_name'));
} elseif ($users_sorting & self :: FVDG_SORT_FIRSTNAME) {
usort($userTable, array('FlatViewDataGenerator','sort_by_first_name'));
}
@ -796,11 +797,21 @@ class FlatViewDataGenerator
return $data;
}
/**
* @param $item1
* @param $item2
* @return int
*/
public function sort_by_last_name($item1, $item2)
{
return api_strcmp($item1[2], $item2[2]);
}
/**
* @param $item1
* @param $item2
* @return int
*/
public function sort_by_first_name($item1, $item2)
{
return api_strcmp($item1[3], $item2[3]);

60
main/gradebook/lib/gradebook_functions_users.inc.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Various user related functions
* @author Julio Montoya <gugli100@gmail.com> adding security functions
@ -23,17 +24,25 @@ function get_users_in_course($course_id)
if (!empty($current_session)) {
$sql = "SELECT user.user_id, user.username, lastname, firstname, official_code
FROM $tbl_session_course_user as scru, $tbl_user as user
WHERE scru.id_user=user.user_id
AND scru.status=0
AND scru.course_code='$course_id' AND id_session ='$current_session' $order_clause ";
WHERE
scru.id_user=user.user_id AND
scru.status=0 AND
scru.course_code='$course_id' AND
id_session ='$current_session'
$order_clause
";
} else {
$sql = 'SELECT user.user_id, user.username, lastname, firstname, official_code
FROM '.$tbl_course_user.' as course_rel_user, '.$tbl_user.' as user
WHERE course_rel_user.user_id=user.user_id AND
WHERE
course_rel_user.user_id=user.user_id AND
course_rel_user.status='.STUDENT.' AND
course_rel_user.course_code = "'.$course_id.'" '.$order_clause;
course_rel_user.course_code = "'.$course_id.'" '.
$order_clause;
}
$result = Database::query($sql);
return get_user_array_from_sql_result($result);
}
@ -68,14 +77,22 @@ function get_all_users ($evals = array(), $links = array())
$coursecodes[$coursecode] = '1';
$users = array_merge($users, get_users_in_course($coursecode));
}
} else {// course independent evaluation
} else {
// course independent evaluation
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_res = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
$sql = 'SELECT user.user_id, lastname, firstname, user.official_code
FROM '.$tbl_res.' as res, '.$tbl_user.' as user
WHERE res.evaluation_id = '.intval($eval->get_id())
.' AND res.user_id = user.user_id';
WHERE
res.evaluation_id = '.intval($eval->get_id()).' AND
res.user_id = user.user_id
';
$sql .= ' ORDER BY lastname, firstname';
if (api_is_western_name_order()) {
$sql .= ' ORDER BY firstname, lastname';
}
$result = Database::query($sql);
$users = array_merge($users, get_user_array_from_sql_result($result));
}
@ -89,7 +106,7 @@ function get_all_users ($evals = array(), $links = array())
$users = array_merge($users, get_users_in_course($coursecode));
}
}
unset ($coursecodes);
return $users;
}
@ -107,7 +124,8 @@ function find_students($mask= '')
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_cru = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql= 'SELECT DISTINCT user.user_id, user.lastname, user.firstname, user.email, user.official_code ' . ' FROM ' . $tbl_user . ' user';
$sql = 'SELECT DISTINCT user.user_id, user.lastname, user.firstname, user.email, user.official_code
FROM ' . $tbl_user . ' user';
if (!api_is_platform_admin()) {
$sql .= ', ' . $tbl_cru . ' cru';
}
@ -117,12 +135,26 @@ function find_students($mask= '')
$sql .= ' OR user.firstname LIKE '."'%" . $mask . "%')";
if (!api_is_platform_admin()) {
$sql .= ' AND user.user_id = cru.user_id AND cru.relation_type<>'.COURSE_RELATION_TYPE_RRHH.' ' . ' AND cru.course_code in' . ' (SELECT course_code' . ' FROM ' . $tbl_cru . ' WHERE user_id = ' . api_get_user_id() . ' AND status = ' . COURSEMANAGER . ')';
$sql .= ' AND user.user_id = cru.user_id AND
cru.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' AND
cru.course_code in (
SELECT course_code FROM '.$tbl_cru . '
WHERE
user_id = ' . api_get_user_id() . ' AND
status = ' . COURSEMANAGER . '
)
';
}
$sql .= ' ORDER BY lastname, firstname';
if (api_is_western_name_order()) {
$sql .= ' ORDER BY firstname, lastname';
}
$sql .= ' ORDER BY lastname';
$result = Database::query($sql);
$db_users= Database::store_result($result);
return $db_users;
$users = Database::store_result($result);
return $users;
}
/**

Write Preview
Loading…
Cancel
Save