Fixes to Activity reports

diff --git a/course/user.php b/course/user.php
index c79ff1d39e5f2694117eb9e81d71db7a0d47ddf9..b314c19492fd6ebe50632863907b8ef238c73bad 100644 (file)
--- a/course/user.php
+++ b/course/user.php
@@ -53,7 +53,10 @@
 
     switch ($mode) {
         case "summary" :
-            echo "<P>Not supported yet</P>";
+            echo "<P>Not done yet</P>";
+            echo "<P>Graph goes here that shows accesses by day over the course</P>";
+            echo "<HR>";
+            echo "<P>Table goes here that summarises all activity by this student by module. eg 3/7 journals done, 3/3 surveys, 12 posts in all discussions. Each of these are links so that you can drill down to see all the surveys on one page, or all the posts, or all their journals.";
             break;
 
         case "outline" :
@@ -93,7 +96,15 @@
                                     $output = include($userfile);
                                     print_outline_row($mod, $instance, $output);
                                 } else {
+                                    
+                                    $image = "<IMG SRC=\"../mod/$mod->modname/icon.gif\" ".
+                                             "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">";
+                                    echo "<H3>$image $mod->modfullname: ".
+                                         "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
+                                         "$instance->name</A></H3>";
+                                    echo "<UL>";
                                     include($userfile);
+                                    echo "</UL>";
                                 }
                             }
                         }

diff --git a/mod/journal/user.php b/mod/journal/user.php
index 84a37f6e1d229721aa809fdd2a0b4f3b17f34b66..66e6593b62594ada4836d5787d6a575ad40d7082 100644 (file)
--- a/mod/journal/user.php
+++ b/mod/journal/user.php
@@ -40,9 +40,6 @@ function user_journal_outline($course, $user, $mod, $journal) {
 function user_journal_complete($course, $user, $mod, $journal) {
     global $CFG, $THEME;
 
-    echo "<H3>Journal: <A HREF=\"$CFG->wwwroot/mod/journal/view.php?id=$mod->id\">$journal->name</A></H3>";
-    echo "<UL>";
-
     if ($entry = get_record_sql("SELECT * FROM journal_entries 
                              WHERE user='$user->id' AND journal='$journal->id'")) {
 
@@ -74,7 +71,6 @@ function user_journal_complete($course, $user, $mod, $journal) {
     } else {
         echo "No entry";
     }
-    echo "</UL>";
 }
 
 ?>