When displaying a user's logs for the current day, make the graph

display ALL courses (ie to match the logs printed below).

diff --git a/course/loggraph.php b/course/loggraph.php
index 83c3a88e2fde924c893dabcd1b02ac23b87e7d9a..faf9f108700c705dfcfdd814692a94d1524c38e0 100644 (file)
--- a/course/loggraph.php
+++ b/course/loggraph.php
@@ -97,6 +97,14 @@
 
      case "userday.png":
 
+       $site = get_site();
+        
+       if ($course->id == $site->id) {
+           $courseselect = 0;
+       } else {
+           $courseselect = $course->id;
+       }
+
        if ($date) {
            $daystart = usergetmidnight($date);
        } else {
@@ -111,7 +119,7 @@
            $hours[$i] = userdate($hour, "$hh %p");
        }
 
-       if ($rawlogs = get_logs_userday($user->id, $course->id, $daystart)) {
+       if ($rawlogs = get_logs_userday($user->id, $courseselect, $daystart)) {
            foreach ($rawlogs as $rawlog) {
                $logs[$rawlog->hour] = $rawlog->num;
            }

diff --git a/lib/datalib.php b/lib/datalib.php
index df060091eb012546a48b87659b136f85cdb8f90d..7ad75db571e588795250d2e933c54c1aaf72d0cf 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1260,11 +1260,14 @@ function get_logs_usercourse($userid, $courseid, $coursestart) {
 function get_logs_userday($userid, $courseid, $daystart) {
     global $CFG;
 
+    if ($courseid) {
+       $courseselect = " AND course = '$courseid' ";
+    }
+
     return get_records_sql("SELECT floor((`time` - $daystart)/3600) as hour, count(*) as num
                             FROM {$CFG->prefix}log
                            WHERE userid = '$userid' 
-                             AND course = '$courseid'
-                             AND `time` > '$daystart'
+                             AND `time` > '$daystart' $courseselect
                         GROUP BY hour ");
 }