L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit b795d69cc3.
This commit is contained in:
Eloy Lafuente (stronk7)
2012-04-27 12:06:39 +02:00
parent 47a6c7ee31
commit 0baa0a305d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/completion.php
-1
View File
@@ -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';
lib/completion/completion_criteria_grade.php
+7 -7
View File
@@ -154,14 +154,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';
}
}
@@ -231,10 +231,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.'%';
}