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

Merge branch 'MDL-57858-31' of git://github.com/pavelsokolov/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
David Monllao
2017-04-10 14:17:14 +02:00
parent e5a5962d00 97baaf9a53
commit 87562dbe24
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/lib.php
+5 -1
View File
@@ -592,10 +592,14 @@ function assign_get_grade_details_for_print_overview(&$unmarkedsubmissions, $sql
s.userid = g.userid AND
s.assignment = g.assignment AND
g.attemptnumber = s.attemptnumber
LEFT JOIN {assign} a ON
a.id = s.assignment
WHERE
( g.timemodified is NULL OR
s.timemodified >= g.timemodified OR
g.grade IS NULL ) AND
g.grade IS NULL OR
(g.grade = -1 AND
a.grade < 0)) AND
s.timemodified IS NOT NULL AND
s.status = ? AND
s.latest = 1 AND
mod/assign/locallib.php
+3 -1
View File
@@ -1753,6 +1753,7 @@ class assign {
$params['assignid'] = $this->get_instance()->id;
$params['submitted'] = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$sqlscalegrade = $this->get_instance()->grade < 0 ? ' OR g.grade = -1' : '';
$sql = 'SELECT COUNT(s.userid)
FROM {assign_submission} s
@@ -1766,7 +1767,8 @@ class assign {
s.assignment = :assignid AND
s.timemodified IS NOT NULL AND
s.status = :submitted AND
(s.timemodified >= g.timemodified OR g.timemodified IS NULL OR g.grade IS NULL)';
(s.timemodified >= g.timemodified OR g.timemodified IS NULL OR g.grade IS NULL '
. $sqlscalegrade . ')';
return $DB->count_records_sql($sql, $params);
}