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

diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index f44316730665fdfa2a818c16891c8e3c4adf0242..5c16ee08225a2df73c28f40c7d20a836c8a5b8bd 100644 (file)
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -53,7 +53,7 @@
                 $submitted =  "<a href=\"submissions.php?id=$assignment->id\">" .
                                 get_string("viewfeedback", "assignment") . "</a>";
             } else {
-                $count = count(assignment_get_all_submissions($assignment));
+                $count = assignment_count_real_submissions($assignment);
                 $submitted = "<a href=\"submissions.php?id=$assignment->id\">" .
                              get_string("viewsubmissions", "assignment", $count) . "</A>";
             }

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 8a8e666d94ff810d3bb72afe5ab3c669a2f3687f..ceff2480cb6a0ab1a9441574be6177ea5c334057 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -308,8 +308,23 @@ function assignment_log_info($log) {
                               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") {
-/// Return all assignment submissions by ENROLLED students
+/// Return all assignment submissions by ENROLLED students (even empty)
     global $CFG;
 
     if ($sort == "lastname" or $sort == "firstname") {

diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index 8b440cc522697f12e681f1d94b67e09e06a85c91..28df88b6e89318e8ea095890b9a17ff503dcb9c7 100644 (file)
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -52,7 +52,7 @@
             echo "<a href=\"submissions.php?id=$assignment->id\">".
                   get_string("viewfeedback", "assignment")."</a>";
         } else {
-            $count = count(assignment_get_all_submissions($assignment));
+            $count = assignment_count_real_submissions($assignment);
             echo "<a href=\"submissions.php?id=$assignment->id\">".
                   get_string("viewsubmissions", "assignment", $count)."</a>";
         }