From 559cfa03f4a94671cd7b747a5610ace94164a787 Mon Sep 17 00:00:00 2001 From: Mike Churchward Date: Mon, 14 Nov 2016 16:04:10 -0500 Subject: [PATCH] MDL-36233 mod_assign: fixed submission time comparison sql and test. --- mod/assign/lib.php | 2 +- mod/assign/tests/lib_test.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mod/assign/lib.php b/mod/assign/lib.php index 78a4ec21853..81f13c9a834 100644 --- a/mod/assign/lib.php +++ b/mod/assign/lib.php @@ -758,7 +758,7 @@ function assign_get_grade_details_for_print_overview(&$unmarkedsubmissions, $sql g.attemptnumber = s.attemptnumber WHERE ( g.timemodified is NULL OR - s.timemodified > g.timemodified OR + s.timemodified >= g.timemodified OR g.grade IS NULL ) AND s.timemodified IS NOT NULL AND s.status = ? AND diff --git a/mod/assign/tests/lib_test.php b/mod/assign/tests/lib_test.php index 34e52194a15..7ef88c2885f 100644 --- a/mod/assign/tests/lib_test.php +++ b/mod/assign/tests/lib_test.php @@ -158,6 +158,13 @@ class mod_assign_lib_testcase extends mod_assign_base_testcase { $data = new stdClass(); $data->grade = '50.0'; $openassign->testable_apply_grade_to_user($data, $this->students[0]->id, 0); + + // The assign_print_overview expects the grade date to be after the submission date. + $graderecord = $DB->get_record('assign_grades', array('assignment' => $openassign->get_instance()->id, + 'userid' => $this->students[0]->id, 'attemptnumber' => 0)); + $graderecord->timemodified += 1; + $DB->update_record('assign_grades', $graderecord); + $overview = array(); assign_print_overview($courses, $overview); $this->assertEquals(1, count($overview)); -- 2.11.4.GIT