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

Merge branch 'MDL-60082-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2019-01-14 12:28:30 +01:00
parent 4c6ae316d8 16668320a6
commit fcd19e1faf
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+10 -5
View File
@@ -399,10 +399,11 @@ class assign_grading_table extends table_sql implements renderable {
$columns[] = 'grade';
$headers[] = get_string('grade');
if ($this->is_downloading()) {
if ($this->assignment->get_instance()->grade >= 0) {
$gradetype = $this->assignment->get_instance()->grade;
if ($gradetype > 0) {
$columns[] = 'grademax';
$headers[] = get_string('maxgrade', 'assign');
} else {
} else if ($gradetype < 0) {
// This is a custom scale.
$columns[] = 'scale';
$headers[] = get_string('scale', 'assign');
@@ -413,7 +414,7 @@ class assign_grading_table extends table_sql implements renderable {
$columns[] = 'workflowstate';
$headers[] = get_string('markingworkflowstate', 'assign');
}
// Add a column for the list of valid marking workflow states.
// Add a column to show if this grade can be changed.
$columns[] = 'gradecanbechanged';
$headers[] = get_string('gradecanbechanged', 'assign');
}
@@ -907,8 +908,12 @@ class assign_grading_table extends table_sql implements renderable {
* @return string
*/
public function col_grademax(stdClass $row) {
$gradeitem = $this->assignment->get_grade_item();
return format_float($this->assignment->get_instance()->grade, $gradeitem->get_decimals());
if ($this->assignment->get_instance()->grade > 0) {
$gradeitem = $this->assignment->get_grade_item();
return format_float($this->assignment->get_instance()->grade, $gradeitem->get_decimals());
} else {
return '';
}
}
/**