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

Fixed the counting of submissions for a new function assignment_count_real_submissions()

Browse source
This commit is contained in:
moodler 2004-01-30 16:53:01 +00:00
parent d98579dbc9
commit 8ff79e8c5b
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/assignment/index.php
View file

@ -53,7 +53,7 @@
$submitted = "<a href=\"submissions.php?id=$assignment->id\">" . $submitted = "<a href=\"submissions.php?id=$assignment->id\">" .
get_string("viewfeedback", "assignment") . "</a>"; get_string("viewfeedback", "assignment") . "</a>";
} else { } else {
$count = count(assignment_get_all_submissions($assignment)); $count = assignment_count_real_submissions($assignment);
$submitted = "<a href=\"submissions.php?id=$assignment->id\">" . $submitted = "<a href=\"submissions.php?id=$assignment->id\">" .
get_string("viewsubmissions", "assignment", $count) . "</A>"; get_string("viewsubmissions", "assignment", $count) . "</A>";
} }

17
mod/assignment/lib.php
View file

@ -308,8 +308,23 @@ function assignment_log_info($log) {
AND u.id = '$log->userid'"); AND u.id = '$log->userid'");
} }
function assignment_count_real_submissions($assignment) {
/// Return all real assignment submissions by ENROLLED students (not empty ones)
global $CFG;
return count_records_sql("SELECT count(a.id)
FROM {$CFG->prefix}assignment_submissions a,
{$CFG->prefix}user_students s,
{$CFG->prefix}user u
WHERE a.userid = s.userid
AND u.id = a.userid
AND s.course = '$assignment->course'
AND a.assignment = '$assignment->id'
AND a.timemodified > 0");
}
function assignment_get_all_submissions($assignment, $sort="", $dir="DESC") { function assignment_get_all_submissions($assignment, $sort="", $dir="DESC") {
/// Return all assignment submissions by ENROLLED students /// Return all assignment submissions by ENROLLED students (even empty)
global $CFG; global $CFG;
if ($sort == "lastname" or $sort == "firstname") { if ($sort == "lastname" or $sort == "firstname") {

2
mod/assignment/view.php
View file

@ -52,7 +52,7 @@
echo "<a href=\"submissions.php?id=$assignment->id\">". echo "<a href=\"submissions.php?id=$assignment->id\">".
get_string("viewfeedback", "assignment")."</a>"; get_string("viewfeedback", "assignment")."</a>";
} else { } else {
$count = count(assignment_get_all_submissions($assignment)); $count = assignment_count_real_submissions($assignment);
echo "<a href=\"submissions.php?id=$assignment->id\">". echo "<a href=\"submissions.php?id=$assignment->id\">".
get_string("viewsubmissions", "assignment", $count)."</a>"; get_string("viewsubmissions", "assignment", $count)."</a>";
} }