From e50b26fa7ca1c7f0a6c52c6970c9c4f862003ded Mon Sep 17 00:00:00 2001 From: Brendan Anderson Date: Mon, 24 Oct 2016 15:22:13 -0400 Subject: [PATCH] MDL-54112 mod_assign: Add scale null grade filter --- mod/assign/gradingtable.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index 421b3b8c49a..ade35cfdc73 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -206,7 +206,14 @@ class assign_grading_table extends table_sql implements renderable { } else if ($filter == ASSIGN_FILTER_REQUIRE_GRADING) { $where .= ' AND (s.timemodified IS NOT NULL AND s.status = :submitted AND - (s.timemodified >= g.timemodified OR g.timemodified IS NULL OR g.grade IS NULL))'; + (s.timemodified >= g.timemodified OR g.timemodified IS NULL OR g.grade IS NULL'; + + if ($this->assignment->get_grade_item()->gradetype == GRADE_TYPE_SCALE) { + // Scale grades are set to -1 when not graded. + $where .= ' OR g.grade = -1'; + } + + $where .= '))'; $params['submitted'] = ASSIGN_SUBMISSION_STATUS_SUBMITTED; } else if (strpos($filter, ASSIGN_FILTER_SINGLE_USER) === 0) {