Merge branch 'MDL-54112-30' of https://github.com/hcpss-banderson/moodle

into MOODLE_30_STABLE
moodle · Nov 1, 2016 · 7c889e2 · 7c889e2
2 parents 8976674 + b6ed8fd
commit 7c889e2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
@@ -198,7 +198,14 @@ public function __construct(assign $assignment,
             } 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) {