mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-27 11:23:06 +02:00
Code Issues Projects Releases Wiki Activity

MDL-48861 assign: Make the requires grading filter consistent

Browse Source 
Consistently include submissions with a null grade (see MDL-47694).
This commit is contained in:
Damyon Wiese 2015-10-13 14:24:08 +08:00
parent fb6bae3eae
commit ab848fea81
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/assign/gradingtable.php
View File

@ -198,7 +198,7 @@ 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))';
(s.timemodified >= g.timemodified OR g.timemodified IS NULL OR g.grade IS NULL))';
$params['submitted'] = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
} else if (strpos($filter, ASSIGN_FILTER_SINGLE_USER) === 0) {

2
mod/assign/locallib.php
View File

@ -1521,7 +1521,7 @@ class assign {
s.assignment = :assignid AND
s.timemodified IS NOT NULL AND
s.status = :submitted AND
(s.timemodified >= g.timemodified OR g.timemodified IS NULL)';
(s.timemodified >= g.timemodified OR g.timemodified IS NULL OR g.grade IS NULL)';
return $DB->count_records_sql($sql, $params);
}