Adding order by see BT#9287

main/gradebook/gradebook_flatview.php

@@ -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

main/gradebook/lib/flatview_data_generator.class.php

@@ -272,9 +272,10 @@ class FlatViewDataGenerator
 
         // sort users array
         if ($users_sorting & self :: FVDG_SORT_LASTNAME) {
-            usort($userTable, array ('FlatViewDataGenerator','sort_by_last_name'));
+            usort($userTable, array('FlatViewDataGenerator','sort_by_last_name'));
+
         } elseif ($users_sorting & self :: FVDG_SORT_FIRSTNAME) {
-            usort($userTable, array ('FlatViewDataGenerator','sort_by_first_name'));
+            usort($userTable, array('FlatViewDataGenerator','sort_by_first_name'));
         }
 
         if ($users_sorting & self :: FVDG_SORT_DESC) {
@@ -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]);

main/gradebook/lib/gradebook_functions_users.inc.php

@@ -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
+			 	WHERE
-			 	AND scru.status=0
+			 		scru.id_user=user.user_id AND
-			 	AND scru.course_code='$course_id' AND id_session ='$current_session' $order_clause ";
+			 		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.status='.STUDENT.' AND
+                	course_rel_user.user_id=user.user_id AND
-                        course_rel_user.course_code = "'.$course_id.'" '.$order_clause;
+                    course_rel_user.status='.STUDENT.' AND
+                    course_rel_user.course_code = "'.$course_id.'" '.
+				$order_clause;
 	}
+
 	$result = Database::query($sql);
+
 	return get_user_array_from_sql_result($result);
 }
 
@@ -55,7 +64,7 @@ function get_user_array_from_sql_result($result)
 	return $a_students;
 }
 
-function get_all_users ($evals = array(), $links = array())
+function get_all_users($evals = array(), $links = array())
 {
 	$coursecodes = array();
 	$users = array();
@@ -64,18 +73,26 @@ function get_all_users ($evals = array(), $links = array())
 		$coursecode = $eval->get_course_code();
 		// evaluation in course
 		if (isset($coursecode) && !empty($coursecode)) {
-			if (!array_key_exists($coursecode,$coursecodes)) {
+			if (!array_key_exists($coursecode, $coursecodes)) {
 				$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
+			$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())
+                    WHERE
-				.' AND res.user_id = user.user_id';
+                    	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;
 }
 
@@ -105,9 +122,10 @@ function find_students($mask= '')
 	}
 	$mask = Database::escape_string($mask);
 
-	$tbl_user= Database :: get_main_table(TABLE_MAIN_USER);
+	$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-	$tbl_cru= Database :: get_main_table(TABLE_MAIN_COURSE_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';
+
-	$result= Database::query($sql);
+	$sql .= ' ORDER BY lastname, firstname';
-	$db_users= Database::store_result($result);
+	if (api_is_western_name_order()) {
-	return $db_users;
+		$sql .= ' ORDER BY firstname, lastname';
+	}
+
+	$result = Database::query($sql);
+	$users = Database::store_result($result);
+
+	return $users;
 }
 
 /**