MDL-78729 grade: Improve grade library to support dynamic name handli…

…ng for non-English names
SysBind · Nov 30, 2024 · 925aeec · 925aeec
1 parent e5211c6
commit 925aeec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/grade/lib.php b/grade/lib.php
@@ -2489,11 +2489,12 @@ public function get_cell_action_menu(array $element, string $mode, grade_plugin_
                     }
 
                     if (($element['type'] == 'userfield') && ($element['name'] == 'fullname')) {
-                        $sortlink->param('sortitemid', 'firstname');
+                        $usernamefields = core_user::get_user_full_name_fields();
+                        $sortlink->param('sortitemid', reset($usernamefields));
                         $context->ascendingfirstnameurl = $this->get_sorting_link($sortlink, $gpr);
                         $context->descendingfirstnameurl = $this->get_sorting_link($sortlink, $gpr, 'desc');
 
-                        $sortlink->param('sortitemid', 'lastname');
+                        $sortlink->param('sortitemid', end($usernamefields));
                         $context->ascendinglastnameurl = $this->get_sorting_link($sortlink, $gpr);
                         $context->descendinglastnameurl = $this->get_sorting_link($sortlink, $gpr, 'desc');
                     } else {

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -356,6 +356,7 @@ private function setup_sortitemid(string $sort = '') {
             $SESSION->gradeuserreport = new stdClass();
         }
 
+        $namefields = core_user::get_user_full_name_fields();
         if ($this->sortitemid) {
             if (!isset($SESSION->gradeuserreport->sort)) {
                 $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
@@ -378,10 +379,10 @@ private function setup_sortitemid(string $sort = '') {
         } else {
             // not requesting sort, use last setting (for paging)
 
-            if (isset($SESSION->gradeuserreport->sortitemid)) {
+            if (isset($SESSION->gradeuserreport->sortitemid) && in_array($SESSION->gradeuserreport->sortitemid, $namefields)) {
                 $this->sortitemid = $SESSION->gradeuserreport->sortitemid;
             } else {
-                $this->sortitemid = 'lastname';
+                $this->sortitemid = end($namefields);
             }
 
             if (isset($SESSION->gradeuserreport->sort)) {

diff --git a/grade/report/lib.php b/grade/report/lib.php
@@ -466,13 +466,14 @@ public function setup_users() {
         $filtersurnamekey = "filtersurname-{$this->context->id}";
 
         $this->userwheresql = "";
+        $usernamefields = core_user::get_user_full_name_fields();
         $this->userwheresql_params = array();
         if (!empty($SESSION->gradereport[$filterfirstnamekey])) {
-            $this->userwheresql .= ' AND '.$DB->sql_like('u.firstname', ':firstname', false, false);
+            $this->userwheresql .= ' AND '.$DB->sql_like('u.' . reset($usernamefields), ':firstname', false, false);
             $this->userwheresql_params['firstname'] = $SESSION->gradereport[$filterfirstnamekey] . '%';
         }
         if (!empty($SESSION->gradereport[$filtersurnamekey])) {
-            $this->userwheresql .= ' AND '.$DB->sql_like('u.lastname', ':lastname', false, false);
+            $this->userwheresql .= ' AND '.$DB->sql_like('u.' . end($usernamefields), ':lastname', false, false);
             $this->userwheresql_params['lastname'] = $SESSION->gradereport[$filtersurnamekey] . '%';
         }