Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-32249-21' of github.com:srynot4sale/moodle into MOO…

…DLE_21_STABLE
  • Loading branch information...
commit 04cc6a1ba1ac7cb42df3e4afc1edd820cd1d6fdb 2 parents 4ca8983 + 2e67e5e
@stronk7 stronk7 authored
View
1  lang/en/completion.php
@@ -118,6 +118,7 @@
$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';
View
14 lib/completion/completion_criteria_grade.php
@@ -154,14 +154,14 @@ public function get_type_title() {
* @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);
}
}
@@ -231,10 +231,10 @@ public function get_details($completion) {
$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.'%';
}
Please sign in to comment.
Something went wrong with that request. Please try again.