Removal of diagnostic messages in Administration page; correction to

db/mysql.php

diff --git a/mod/exercise/db/mysql.php b/mod/exercise/db/mysql.php
index 15cba279301893f14265f7e5b341bb98e28e7d0c..fb4e3000907e8e197a916412f0636963b08e1ee5 100644 (file)
--- a/mod/exercise/db/mysql.php
+++ b/mod/exercise/db/mysql.php
@@ -10,7 +10,7 @@ function exercise_upgrade($oldversion) {
                execute_sql(" ALTER TABLE `{$CFG->prefix}exercise_submissions` ADD INDEX (`userid`)");
                execute_sql(" ALTER TABLE `{$CFG->prefix}exercise_submissions` DROP INDEX `title`");
                execute_sql(" ALTER TABLE `{$CFG->prefix}exercise_assessments` ADD INDEX (`submissionid`)");
-               execute_sql(" ALTER TABLE `{$CFG->prefix}exercise_submissions` ADD INDEX (`userid`)");
+               execute_sql(" ALTER TABLE `{$CFG->prefix}exercise_assessments` ADD INDEX (`userid`)");
                execute_sql(" ALTER TABLE `{$CFG->prefix}exercise_grades` ADD INDEX (`assessmentid`)");
                }
                

diff --git a/mod/exercise/lib.php b/mod/exercise/lib.php
index 38c57263b15214cfbccd1be428792d05b5516866..f0d1351c691ab103d47575bc0f13742cb9259605 100644 (file)
--- a/mod/exercise/lib.php
+++ b/mod/exercise/lib.php
@@ -1482,8 +1482,6 @@ function exercise_list_submissions_for_admin($exercise) {
                        print_table($table);
                        echo "<p align=\"center\">".get_string("noteonstudentassessments", "exercise")."</p>\n";
                }
-    $elapsed = time() - $timenow;
-       echo "<p>Elapsed time: $elapsed\n";
     }
 
        // now the sudent submissions
@@ -1496,6 +1494,7 @@ function exercise_list_submissions_for_admin($exercise) {
         $table->cellpadding = 2;
         $table->cellspacing = 0;
 
+        $nsubmissions = 0;
         foreach ($users as $user) {
             if ($submissions = exercise_get_user_submissions($exercise, $user)) {
                 foreach ($submissions as $submission) {
@@ -1531,17 +1530,16 @@ function exercise_list_submissions_for_admin($exercise) {
                     $table->data[] = array("$user->firstname $user->lastname", $title.
                             " ".exercise_print_submission_assessments($exercise, $submission), 
                             userdate($submission->timecreated), $action);
+                    $nsubmissions++;
                 }
             }
         }
-        print_heading(get_string("studentsubmissions", "exercise", $course->student)." [".
-                  count($submissions)."]", "center");
+        print_heading(get_string("studentsubmissions", "exercise", $course->student)." [$nsubmissions]",
+                "center");
         print_table($table);
         echo "<center><p>".get_string("resubmitnote", "exercise", $course->student)."</p>\n";
         echo "<p>".get_string("allgradeshaveamaximumof", "exercise", $exercise->grade)."</p></center>\n";
     }
-       $elapsed = time() - $timenow;
-       echo "<p>Elapsed time: $elapsed\n";
 }