MDL-10846 Sorting submitted assignments by status makes all assignments disappear

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index fd24b3db3749709ff9707e5a28e5c2c545dc53a1..bf7c5ad61ba431df7b46699342543966c6f1c53b 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -794,7 +794,7 @@ class assignment_base {
 
         $select = 'SELECT u.id, u.firstname, u.lastname, u.picture,
                           s.id AS submissionid, s.grade, s.submissioncomment,
-                          s.timemodified, s.timemarked ';
+                          s.timemodified, s.timemarked, (s.timemarked > 0 AND s.timemarked>=s.timemodified) AS status ';
         $sql = 'FROM '.$CFG->prefix.'user u '.
                'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid
                                                                   AND s.assignment = '.$this->assignment->id.' '.
@@ -1107,7 +1107,7 @@ class assignment_base {
 
         $select = 'SELECT u.id, u.firstname, u.lastname, u.picture,
                           s.id AS submissionid, s.grade, s.submissioncomment,
-                          s.timemodified, s.timemarked ';
+                          s.timemodified, s.timemarked, (s.timemarked > 0 AND s.timemarked >= s.timemodified) AS status ';
         $sql = 'FROM '.$CFG->prefix.'user u '.
                'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid
                                                                   AND s.assignment = '.$this->assignment->id.' '.
@@ -1126,7 +1126,6 @@ class assignment_base {
 
             foreach ($ausers as $auser) {
             /// Calculate user status
-                $auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified);
                 $picture = print_user_picture($auser->id, $course->id, $auser->picture, false, true);
 
                 if (empty($auser->submissionid)) {