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

MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display

Browse Source
This commit is contained in:
Tony Butler
2016-10-12 17:33:23 +01:00
parent d9520bc04e
commit 23f2f64452
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/offline/importgradesform.php
+2 -1
View File
@@ -134,7 +134,8 @@ class assignfeedback_offline_import_grades_form extends moodleform implements re
if (!empty($scaleoptions)) {
$formattedgrade = $scaleoptions[$grade];
} else {
$formattedgrade = format_float($grade, 2);
$gradeitem = $assignment->get_grade_item();
$formattedgrade = format_float($grade, $gradeitem->get_decimals());
}
$updates[] = get_string('gradeupdate', 'assignfeedback_offline',
array('grade'=>$formattedgrade, 'student'=>$userdesc));
mod/assign/gradingtable.php
+4 -2
View File
@@ -628,7 +628,8 @@ class assign_grading_table extends table_sql implements renderable {
if ($grade == -1 || $grade === null) {
return '';
}
return format_float($grade, 2);
$gradeitem = $this->assignment->get_grade_item();
return format_float($grade, $gradeitem->get_decimals());
} else {
// This is a custom scale.
$scale = $this->assignment->display_grade($grade, false);
@@ -825,7 +826,8 @@ class assign_grading_table extends table_sql implements renderable {
* @return string
*/
public function col_grademax(stdClass $row) {
return format_float($this->assignment->get_instance()->grade, 2);
$gradeitem = $this->assignment->get_grade_item();
return format_float($this->assignment->get_instance()->grade, $gradeitem->get_decimals());
}
/**
mod/assign/locallib.php
+6 -5
View File
@@ -1371,6 +1371,7 @@ class assign {
static $scalegrades = array();
$decimals = $this->get_grade_item()->get_decimals();
$o = '';
if ($this->get_instance()->grade >= 0) {
@@ -1379,7 +1380,7 @@ class assign {
if ($grade < 0) {
$displaygrade = '';
} else {
$displaygrade = format_float($grade, 2);
$displaygrade = format_float($grade, $decimals);
}
$o .= '<label class="accesshide" for="quickgrade_' . $userid . '">' .
get_string('usergrade', 'assign') .
@@ -1391,7 +1392,7 @@ class assign {
size="6"
maxlength="10"
class="quickgrade"/>';
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, 2);
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, $decimals);
return $o;
} else {
if ($grade == -1 || $grade === null) {
@@ -1401,7 +1402,7 @@ class assign {
$o .= grade_format_gradevalue($grade, $item);
if ($item->get_displaytype() == GRADE_DISPLAY_TYPE_REAL) {
// If displaying the raw grade, also display the total value.
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, 2);
$o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade, $decimals);
}
}
return $o;
@@ -3307,7 +3308,7 @@ class assign {
if ($grade) {
$data = new stdClass();
if ($grade->grade !== null && $grade->grade >= 0) {
$data->grade = format_float($grade->grade, 2);
$data->grade = format_float($grade->grade, $this->get_grade_item()->get_decimals());
}
} else {
$data = new stdClass();
@@ -3504,7 +3505,7 @@ class assign {
if ($grade) {
$data = new stdClass();
if ($grade->grade !== null && $grade->grade >= 0) {
$data->grade = format_float($grade->grade, 2);
$data->grade = format_float($grade->grade, $this->get_grade_item()->get_decimals());
}
} else {
$data = new stdClass();