From 412cecc32bd33b108008791090f420b6892b4cac Mon Sep 17 00:00:00 2001
From: Aaron Barnes <aaronb@catalyst.net.nz>
Date: Wed, 11 Apr 2012 18:54:40 +1200
Subject: [PATCH] MDL-32249 completion: Round course grades and remove
 hardcoded string

---
 lang/en/completion.php                       |  1 +
 lib/completion/completion_criteria_grade.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lang/en/completion.php b/lang/en/completion.php
index c55779e23dc..93ed60847ed 100644
--- a/lang/en/completion.php
+++ b/lang/en/completion.php
@@ -118,6 +118,7 @@ $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 e452454d080..ef195a22192 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) {
-        // Cast as floats to get rid of excess decimal places
-        $grade = (float) $this->get_grade($completion);
-        $gradepass = (float) $this->gradepass;
+        $grade = $this->get_grade($completion);
+        $gradepass = round($this->gradepass, 2).'%';
 
         if ($grade) {
-            return $grade.'% ('.$gradepass.'% to pass)';
+            $grade = round($grade, 2);
+            return $grade.'% ('.get_string('gradetopass', 'completion', $gradepass).')';
         } else {
-            return $gradepass.'% to pass';
+            return get_string('gradetopass', 'completion', $gradetopass);
         }
     }
 
@@ -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'] = ((float)$this->gradepass).'%';
+        $details['requirement'] = round($this->gradepass, 2).'%';
         $details['status'] = '';
 
-        $grade = (float)$this->get_grade($completion);
+        $grade = round($this->get_grade($completion), 2);
         if ($grade) {
             $details['status'] = $grade.'%';
         }
-- 
2.43.0