L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-37533 Assign: assign_print_overview does not correctly display assignments that need grading

Browse Source 
Conflicts:

	mod/assign/lib.php
This commit is contained in:
Stephen Bourget
2013-01-24 11:06:33 +08:00
committed by Damyon Wiese
parent 8ca54dbbf3
commit 153292da44
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/lib.php
+18 -6
View File
@@ -327,12 +327,24 @@ function assign_print_overview($courses, &$htmlarray) {
//
list($sqlassignmentids, $assignmentidparams) = $DB->get_in_or_equal($assignmentids);
// build up and array of unmarked submissions indexed by assignment id/ userid
// for use where the user has grading rights on assignment
$rs = $DB->get_recordset_sql("SELECT s.assignment as assignment, s.userid as userid, s.id as id, s.status as status, g.timemodified as timegraded
FROM {assign_submission} s LEFT JOIN {assign_grades} g ON s.userid = g.userid and s.assignment = g.assignment
WHERE g.timemodified = 0 OR s.timemodified > g.timemodified
AND s.assignment $sqlassignmentids", $assignmentidparams);
// Build up and array of unmarked submissions indexed by assignment id/ userid
// for use where the user has grading rights on assignment.
$rs = $DB->get_recordset_sql('SELECT
s.assignment as assignment,
s.userid as userid,
s.id as id,
s.status as status,
g.timemodified as timegraded
FROM {assign_submission} s
LEFT JOIN {assign_grades} g ON
s.userid = g.userid AND
s.assignment = g.assignment
WHERE
( g.timemodified is NULL OR
s.timemodified > g.timemodified ) AND
s.timemodified IS NOT NULL AND
s.status = "submitted" AND
s.assignment ' . $sqlassignmentids, $assignmentidparams);
$unmarkedsubmissions = array();
foreach ($rs as $rd) {