moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 93fb7b528b
commit b795d69cc3
2 changed files with 8 additions and 7 deletions
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['daysafterenrolment']='Days after enrolment';
$string['durationafterenrolment']='Duration after enrolment'; $string['durationafterenrolment']='Duration after enrolment';
$string['fraction']='Fraction'; $string['fraction']='Fraction';
$string['gradetopass']='{$a} to pass';
$string['inprogress']='In progress'; $string['inprogress']='In progress';
$string['manualcompletionby']='Manual completion by'; $string['manualcompletionby']='Manual completion by';
$string['manualselfcompletion']='Manual self completion'; $string['manualselfcompletion']='Manual self completion';

14
lib/completion/completion_criteria_grade.php
View file

@ -154,14 +154,14 @@ class completion_criteria_grade extends completion_criteria {
* @return string * @return string
*/ */
public function get_status($completion) { public function get_status($completion) {
// Cast as floats to get rid of excess decimal places $grade = $this->get_grade($completion);
$grade = (float) $this->get_grade($completion); $gradepass = round($this->gradepass, 2).'%';
$gradepass = (float) $this->gradepass;
if ($grade) { if ($grade) {
return $grade.'% ('.$gradepass.'% to pass)'; $grade = round($grade, 2);
return $grade.'% ('.get_string('gradetopass', 'completion', $gradepass).')';
} else { } else {
return $gradepass.'% to pass'; return get_string('gradetopass', 'completion', $gradetopass);
} }
} }
@ -231,10 +231,10 @@ class completion_criteria_grade extends completion_criteria {
$details = array(); $details = array();
$details['type'] = get_string('coursegrade', 'completion'); $details['type'] = get_string('coursegrade', 'completion');
$details['criteria'] = get_string('passinggrade', 'completion'); $details['criteria'] = get_string('passinggrade', 'completion');
$details['requirement'] = ((float)$this->gradepass).'%'; $details['requirement'] = round($this->gradepass, 2).'%';
$details['status'] = ''; $details['status'] = '';
$grade = (float)$this->get_grade($completion); $grade = round($this->get_grade($completion), 2);
if ($grade) { if ($grade) {
$details['status'] = $grade.'%'; $details['status'] = $grade.'%';
} }