mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

MDL-32249 completion: Round course grades and remove hardcoded string

Browse Source
This commit is contained in:
Aaron Barnes 2012-04-11 18:54:40 +12:00
parent ead4f180a0
commit 412cecc32b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en/completion.php
View File

@ -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';

14
lib/completion/completion_criteria_grade.php
View File

@ -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.'%';
}