User submission can be display in 3 different ways.
+
+All - display all user that participate in the course.
+
+Submitted - display user that had submitted the assignment
+
+Require grading - dislay submitted assignemnt that need to be graded.
Selected preference is saved and will apply to all assignments in all courses.
+ Index: moodle/lang/en_utf8/help/assignment/savepreferences.html --- moodle/lang/en_utf8/help/assignment/savepreferences.html No Base Revision +++ moodle/lang/en_utf8/help/assignment/savepreferences.html Locally New @@ -0,0 +1,5 @@ +The selected preference options will be saved and apply to all assignments in all courses.
+ + Index: moodle/mod/assignment/lib.php --- moodle/mod/assignment/lib.php Base (1.434) +++ moodle/mod/assignment/lib.php Locally Modified (Based On 1.434) @@ -860,6 +860,7 @@ $userid = required_param('userid', PARAM_INT); $offset = required_param('offset', PARAM_INT);//offset for where to start looking for student. + $filter = optional_param('filter', PARAM_INT); if (!$user = $DB->get_record('user', array('id'=>$userid))) { print_error('nousers'); @@ -898,16 +899,24 @@ } $nextid = 0; + $where = ''; + if($filter == 'submitted') { + $where .= 's.timemodified > 0 AND '; + } + if($filter == 'requiregrading') { + $where .= 's.timemarked < s.timemodified AND '; + } + if ($users) { $select = 'SELECT u.id, u.firstname, u.lastname, u.picture, u.imagealt, s.id AS submissionid, s.grade, s.submissioncomment, s.timemodified, s.timemarked, COALESCE(SIGN(SIGN(s.timemarked) + SIGN(s.timemarked - s.timemodified)), 0) AS status '; $sql = 'FROM {user} u '. - 'LEFT JOIN {assignment_submissions} s ON u.id = s.userid - AND s.assignment = '.$this->assignment->id.' '. - 'WHERE u.id IN ('.implode(',', $users).') '; + 'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid ' . + 'AND s.assignment = '.$this->assignment->id.' '. + 'WHERE '.$where.'u.id IN ('.implode(',', $users).') '; if ($sort = flexible_table::get_sql_sort('mod-assignment-submissions')) { $sort = 'ORDER BY '.$sort.' '; @@ -952,6 +961,8 @@ echo ''; echo ''; echo '';//selected menu index + //for filter mode + echo ''; //new hidden field, initialized to -1. echo ''; @@ -1080,21 +1091,30 @@ /* first we check to see if the form has just been submitted * to request user_preference updates */ + define('ALL', 0); + define('SUBMITTED', 1); + define('REQUIRE_GRADING', 2); - if (isset($_POST['updatepref'])){ + $filters = array(ALL => get_string('all'), + SUBMITTED => get_string('submitted', 'assignment'), + REQUIRE_GRADING => get_string('requiregrading', 'assignment')); + + $updatepref = optional_param('updatepref', 0, PARAM_INT); + if ($updatepref) { $perpage = optional_param('perpage', 10, PARAM_INT); $perpage = ($perpage <= 0) ? 10 : $perpage ; + $filter = optional_param('filter', 0, PARAM_INT); set_user_preference('assignment_perpage', $perpage); set_user_preference('assignment_quickgrade', optional_param('quickgrade', 0, PARAM_BOOL)); + set_user_preference('assignment_filter', $filter); } /* next we get perpage and quickgrade (allow quick grade) params * from database */ $perpage = get_user_preferences('assignment_perpage', 10); - $quickgrade = get_user_preferences('assignment_quickgrade', 0); - + $filter = get_user_preferences('assignment_filter', 0); $grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id); if (!empty($CFG->enableoutcomes) and !empty($grading_info->outcomes)) { @@ -1214,7 +1234,12 @@ if ($where = $table->get_sql_where()) { $where .= ' AND '; } - + if($filter == SUBMITTED) { + $where .= 's.timemodified > 0 AND '; + } + if($filter == REQUIRE_GRADING) { + $where .= 's.timemarked < s.timemodified AND '; + } if ($sort = $table->get_sql_sort()) { $sort = ' ORDER BY '.$sort; } @@ -1228,18 +1253,30 @@ AND s.assignment = '.$this->assignment->id.' '. 'WHERE '.$where.'u.id IN ('.implode(',',$users).') '; - $table->pagesize($perpage, count($users)); + $ausers = $DB->get_records_sql($select.$sql.$sort, null, $table->get_page_start(), $table->get_page_size()); + $table->pagesize($perpage, count($ausers)); ///offset used to calculate index of student in that particular query, needed for the pop up to know who's next $offset = $page * $perpage; - $strupdate = get_string('update'); $strgrade = get_string('grade'); $grademenu = make_grades_menu($this->assignment->grade); - if (($ausers = $DB->get_records_sql($select.$sql.$sort, null, $table->get_page_start(), $table->get_page_size())) !== false) { + /// Print quickgrade form around the table + if ($quickgrade){ + echo ''; + + echo '