From e64779883b22da32c0f5ec0aca88a0ae2dc2161c Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Fri, 7 Mar 2008 14:09:43 +0000 Subject: [PATCH] MDL-12356 Patched grade_grade->is_passed() method so that it returns null when the gradepass value is null or equal to grademin, or when the finalgrade is null. Merging from MOODLE_19_STABLE --- grade/report/grader/lib.php | 2 ++ lib/grade/grade_grade.php | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index de5d91b59d..557462c27f 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -762,6 +762,8 @@ class grade_report_grader extends grade_report { $gradepass = ' gradefail '; if ($grade->is_passed($item)) { $gradepass = ' gradepass '; + } elseif (is_null($grade->is_passed($item))) { + $gradepass = ''; } // if in editting mode, we need to print either a text box diff --git a/lib/grade/grade_grade.php b/lib/grade/grade_grade.php index 45813d48eb..7c72ef4bcc 100644 --- a/lib/grade/grade_grade.php +++ b/lib/grade/grade_grade.php @@ -701,6 +701,17 @@ class grade_grade extends grade_object { $this->grade_item = $grade_item; $this->itemid = $grade_item->id; } + + // Return null if finalgrade is null + if (is_null($this->finalgrade)) { + return null; + } + + // Return null if gradepass == grademin or gradepass is null + if (is_null($this->grade_item->gradepass) || $this->grade_item->gradepass == $this->grade_item->grademin) { + return null; + } + return $this->finalgrade >= $this->grade_item->gradepass; } -- 2.39.5