Skip to content

Commit

Permalink
MDL-60082 assign: Grading worksheet with no grade
Browse files Browse the repository at this point in the history
If the grade type is NONE - do not include the maxgrade column.
  • Loading branch information
Damyon Wiese committed Dec 18, 2018
1 parent c8b4ee4 commit 1666832
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions mod/assign/gradingtable.php
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,11 @@ public function __construct(assign $assignment,
$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');
Expand All @@ -413,7 +414,7 @@ public function __construct(assign $assignment,
$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');
}
Expand Down Expand Up @@ -907,8 +908,12 @@ public function col_gradecanbechanged(stdClass $row) {
* @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 '';
}
}

/**
Expand Down

0 comments on commit 1666832

Please sign in to comment.