MDL-48861 mod_assign: use >= for requires grading filter
authorDamyon Wiese <damyon@moodle.com>
Fri, 9 Oct 2015 07:08:06 +0000 (15:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 9 Oct 2015 07:08:06 +0000 (15:08 +0800)
If the grade and submission were modified at exactly the same time,
assume that this means the grade was automatically created for the submission
and is not a real grade from a teacher interaction.

mod/assign/gradingtable.php
mod/assign/locallib.php

index eeec278..c995acf 100644 (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))';
                 $params['submitted'] = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
 
             } else if (strpos($filter, ASSIGN_FILTER_SINGLE_USER) === 0) {
index effc0bf..6a9d791 100644 (file)
@@ -1518,7 +1518,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)';
 
         return $DB->count_records_sql($sql, $params);
     }