Fixing user order see BT#4960

main/inc/lib/usermanager.lib.php

@@ -3135,9 +3135,9 @@ class UserManager {
 	 */
 	public static function get_users_followed_by_drh($hr_dept_id, $user_status = 0) {        
 		// Database Table Definitions
-		$tbl_user 			= 	Database::get_main_table(TABLE_MAIN_USER);
+		$tbl_user                = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_user_rel_user 	= 	Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+		$tbl_user_rel_user       = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-        $tbl_user_rel_access_url =   Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
 		$hr_dept_id = intval($hr_dept_id);
 		$assigned_users_to_hrm = array();
@@ -3151,14 +3151,26 @@ class UserManager {
             $sql = "SELECT u.user_id, u.username, u.lastname, u.firstname, u.email 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 relation_type = '".USER_RELATION_TYPE_RRHH."' $condition_status AND access_url_id = ".api_get_current_access_url_id()."
+                    WHERE   friend_user_id = '$hr_dept_id' AND 
+                            relation_type = '".USER_RELATION_TYPE_RRHH."' 
+                            $condition_status AND 
+                            access_url_id = ".api_get_current_access_url_id()."
                     ";
         } else {
             $sql = "SELECT u.user_id, u.username, u.lastname, u.firstname, u.email FROM $tbl_user u
-                    INNER JOIN $tbl_user_rel_user uru ON uru.user_id = u.user_id AND friend_user_id = '$hr_dept_id' AND relation_type = '".USER_RELATION_TYPE_RRHH."' $condition_status 
+                    INNER JOIN $tbl_user_rel_user uru 
-                    ";
+                    ON  uru.user_id = u.user_id AND 
+                        friend_user_id = '$hr_dept_id' AND 
+                        relation_type = '".USER_RELATION_TYPE_RRHH."' 
+                        $condition_status ";
         }
         
+        if (api_is_western_name_order()) {
+            $sql .= " ORDER BY u.firstname, u.lastname ";            
+        } else {
+            $sql .= " ORDER BY u.lastname, u.firstname ";
+        }        
+        
 		$rs_assigned_users = Database::query($sql);
 		if (Database::num_rows($rs_assigned_users) > 0) {
 			while ($row_assigned_users = Database::fetch_array($rs_assigned_users))	{

plugin/dashboard/block_student/block_student.class.php

@@ -201,7 +201,7 @@ class BlockStudent extends Block {
 
 	 				if (!empty($scoretotal)) {
 	 					$score  += $scoretotal[0];
-	 					$weight += $scoretotal[1];	
+	 					$weight += $scoretotal[1];
 	 				} 
 	 			}
 
@@ -216,8 +216,8 @@ class BlockStudent extends Block {
                 }
 	    		$students_table .= '<tr class="'.$class_tr.'">										
 										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>										
-										<td align="right">'.$attendances_faults_avg.'</td>
+										<td>'.$attendances_faults_avg.'</td>
-										<td align="right">'.$evaluations_avg.'</td>
+										<td>'.$evaluations_avg.'</td>
 									</tr>';
 	 			
 	 			$i++;