moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-46044 Assign: Modify myhome query to only use the maxattempt from the submission

Browse source 
Using mismatches from the submissions/grades tables does not make much sense, we
should always only consider only the maxattempt from the submissions table.
This commit is contained in:
Damyon Wiese 2014-06-27 14:14:14 +08:00
parent 6c489d2cd0
commit 6447021bc0
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
mod/assign/lib.php
View file

@ -393,9 +393,6 @@ function assign_print_overview($courses, &$htmlarray) {
$submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment $submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment
FROM {assign_submission} mxs FROM {assign_submission} mxs
GROUP BY mxs.userid, mxs.assignment'; GROUP BY mxs.userid, mxs.assignment';
$grademaxattempt = 'SELECT mxg.userid, MAX(mxg.attemptnumber) AS maxattempt, mxg.assignment
FROM {assign_grades} mxg
GROUP BY mxg.userid, mxg.assignment';
// Build up and array of unmarked submissions indexed by assignment id/ userid // Build up and array of unmarked submissions indexed by assignment id/ userid
// for use where the user has grading rights on assignment. // for use where the user has grading rights on assignment.
@ -410,13 +407,10 @@ function assign_print_overview($courses, &$htmlarray) {
LEFT JOIN ( ' . $submissionmaxattempt . ' ) smx ON LEFT JOIN ( ' . $submissionmaxattempt . ' ) smx ON
smx.userid = s.userid AND smx.userid = s.userid AND
smx.assignment = s.id smx.assignment = s.id
LEFT JOIN ( ' . $grademaxattempt . ' ) gmx ON
gmx.userid = s.userid AND
gmx.assignment = s.id
LEFT JOIN {assign_grades} g ON LEFT JOIN {assign_grades} g ON
s.userid = g.userid AND s.userid = g.userid AND
s.assignment = g.assignment AND s.assignment = g.assignment AND
g.attemptnumber = gmx.maxattempt g.attemptnumber = smx.maxattempt
WHERE WHERE
( g.timemodified is NULL OR ( g.timemodified is NULL OR
s.timemodified > g.timemodified ) AND s.timemodified > g.timemodified ) AND
@ -458,9 +452,6 @@ function assign_print_overview($courses, &$htmlarray) {
$submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment $submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt, mxs.assignment
FROM {assign_submission} mxs FROM {assign_submission} mxs
GROUP BY mxs.userid, mxs.assignment'; GROUP BY mxs.userid, mxs.assignment';
$grademaxattempt = 'SELECT mxg.userid, MAX(mxg.attemptnumber) AS maxattempt, mxg.assignment
FROM {assign_grades} mxg
GROUP BY mxg.userid, mxg.assignment';
// Get all user submissions, indexed by assignment id. // Get all user submissions, indexed by assignment id.
$dbparams = array_merge(array($USER->id, $USER->id, $USER->id, $USER->id), $assignmentidparams); $dbparams = array_merge(array($USER->id, $USER->id, $USER->id, $USER->id), $assignmentidparams);
@ -475,13 +466,10 @@ function assign_print_overview($courses, &$htmlarray) {
LEFT JOIN ( ' . $submissionmaxattempt . ' ) smx ON LEFT JOIN ( ' . $submissionmaxattempt . ' ) smx ON
smx.userid = ? AND smx.userid = ? AND
smx.assignment = a.id smx.assignment = a.id
LEFT JOIN ( ' . $grademaxattempt . ' ) gmx ON
gmx.userid = ? AND
gmx.assignment = a.id
LEFT JOIN {assign_grades} g ON LEFT JOIN {assign_grades} g ON
g.assignment = a.id AND g.assignment = a.id AND
g.userid = ? AND g.userid = ? AND
g.attemptnumber = gmx.maxattempt g.attemptnumber = smx.maxattempt
LEFT JOIN {assign_submission} s ON LEFT JOIN {assign_submission} s ON
s.attemptnumber = smx.maxattempt AND s.attemptnumber = smx.maxattempt AND
s.assignment = a.id AND s.assignment = a.id AND
@ -491,15 +479,18 @@ function assign_print_overview($courses, &$htmlarray) {
$str .= '<div class="details">'; $str .= '<div class="details">';
$str .= get_string('mysubmission', 'assign'); $str .= get_string('mysubmission', 'assign');
$submission = $mysubmissions[$assignment->id]; $submission = false;
if ($submission->nosubmissions) { if (isset($mysubmissions[$assignment->id])) {
$str .= get_string('offline', 'assign'); $submission = $mysubmissions[$assignment->id];
} else if (!$submission->status || $submission->status == 'draft') { }
if (!$submission || !$submission->status || $submission->status == 'draft') {
$str .= $strnotsubmittedyet; $str .= $strnotsubmittedyet;
} else if ($submission->nosubmissions) {
$str .= get_string('offline', 'assign');
} else { } else {
$str .= get_string('submissionstatus_' . $submission->status, 'assign'); $str .= get_string('submissionstatus_' . $submission->status, 'assign');
} }
if (!$submission->grade || $submission->grade < 0) { if (!$submission || !$submission->grade || $submission->grade < 0) {
$str .= ', ' . get_string('notgraded', 'assign'); $str .= ', ' . get_string('notgraded', 'assign');
} else { } else {
$str .= ', ' . get_string('graded', 'assign'); $str .= ', ' . get_string('graded', 'assign');