From a80112f0b24ddb8da58a502da3f0e1f6975aad8d Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Mon, 3 Dec 2007 02:03:38 +0000 Subject: [PATCH] MDL-12397, gradebook sort by names should start with ASC --- grade/report/grader/lib.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index b927977297..d01e8ca059 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -227,11 +227,19 @@ class grade_report_grader extends grade_report { if ($this->sortitemid) { if (!isset($SESSION->gradeuserreport->sort)) { - $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC'; + if ($this->sortitemid == 'firstname' || $this->sortitemid == 'lastname') { + $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC'; + } else { + $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC'; + } } else { // this is the first sort, i.e. by last name if (!isset($SESSION->gradeuserreport->sortitemid)) { - $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC'; + if ($this->sortitemid == 'firstname' || $this->sortitemid == 'lastname') { + $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC'; + } else { + $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC'; + } } else if ($SESSION->gradeuserreport->sortitemid == $this->sortitemid) { // same as last sort if ($SESSION->gradeuserreport->sort == 'ASC') { @@ -240,7 +248,11 @@ class grade_report_grader extends grade_report { $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC'; } } else { - $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC'; + if ($this->sortitemid == 'firstname' || $this->sortitemid == 'lastname') { + $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC'; + } else { + $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC'; + } } } $SESSION->gradeuserreport->sortitemid = $this->sortitemid; -- 2.39.5