diff --git a/lang/en/completion.php b/lang/en/completion.php index 689390e8290..e737dbf7495 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -118,7 +118,6 @@ $string['datepassed']='Date passed'; $string['daysafterenrolment']='Days after enrolment'; $string['durationafterenrolment']='Duration after enrolment'; $string['fraction']='Fraction'; -$string['gradetopass']='{$a} to pass'; $string['inprogress']='In progress'; $string['manualcompletionby']='Manual completion by'; $string['manualselfcompletion']='Manual self completion'; diff --git a/lib/completion/completion_criteria_grade.php b/lib/completion/completion_criteria_grade.php index ef195a22192..e452454d080 100644 --- a/lib/completion/completion_criteria_grade.php +++ b/lib/completion/completion_criteria_grade.php @@ -156,14 +156,14 @@ class completion_criteria_grade extends completion_criteria { * @return string */ public function get_status($completion) { - $grade = $this->get_grade($completion); - $gradepass = round($this->gradepass, 2).'%'; + // Cast as floats to get rid of excess decimal places + $grade = (float) $this->get_grade($completion); + $gradepass = (float) $this->gradepass; if ($grade) { - $grade = round($grade, 2); - return $grade.'% ('.get_string('gradetopass', 'completion', $gradepass).')'; + return $grade.'% ('.$gradepass.'% to pass)'; } else { - return get_string('gradetopass', 'completion', $gradetopass); + return $gradepass.'% to pass'; } } @@ -232,10 +232,10 @@ class completion_criteria_grade extends completion_criteria { $details = array(); $details['type'] = get_string('coursegrade', 'completion'); $details['criteria'] = get_string('passinggrade', 'completion'); - $details['requirement'] = round($this->gradepass, 2).'%'; + $details['requirement'] = ((float)$this->gradepass).'%'; $details['status'] = ''; - $grade = round($this->get_grade($completion), 2); + $grade = (float)$this->get_grade($completion); if ($grade) { $details['status'] = $grade.'%'; }