From 6710ec8713e8594c6f2fec7596ed7148e6d3e0d2 Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 13 Jan 2005 03:04:48 +0000 Subject: [PATCH] Recent activity functions should have been in lib.php, not locallib.php --- mod/quiz/lib.php | 103 ++++++++++++++++++++++++++++++++++++++++++ mod/quiz/locallib.php | 101 ----------------------------------------- 2 files changed, 103 insertions(+), 101 deletions(-) diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 6e256d89d6..ecb53d03c6 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -394,4 +394,107 @@ function quiz_refresh_events($courseid = 0) { return true; } + +function quiz_get_recent_mod_activity(&$activities, &$index, $sincetime, $courseid, $quiz="0", $user="", $groupid="") { +// Returns all quizzes since a given time. If quiz is specified then +// this restricts the results + + global $CFG; + + if ($quiz) { + $quizselect = " AND cm.id = '$quiz'"; + } else { + $quizselect = ""; + } + if ($user) { + $userselect = " AND u.id = '$user'"; + } else { + $userselect = ""; + } + + $quizzes = get_records_sql("SELECT qa.*, q.name, u.firstname, u.lastname, u.picture, + q.course, q.sumgrades as maxgrade, cm.instance, cm.section + FROM {$CFG->prefix}quiz_attempts qa, + {$CFG->prefix}quiz q, + {$CFG->prefix}user u, + {$CFG->prefix}course_modules cm + WHERE qa.timefinish > '$sincetime' + AND qa.userid = u.id $userselect + AND qa.quiz = q.id $quizselect + AND cm.instance = q.id + AND cm.course = '$courseid' + AND q.course = cm.course + ORDER BY qa.timefinish ASC"); + + if (empty($quizzes)) + return; + + foreach ($quizzes as $quiz) { + if (empty($groupid) || ismember($groupid, $quiz->userid)) { + + $tmpactivity->type = "quiz"; + $tmpactivity->defaultindex = $index; + $tmpactivity->instance = $quiz->quiz; + + $tmpactivity->name = $quiz->name; + $tmpactivity->section = $quiz->section; + + $tmpactivity->content->attemptid = $quiz->id; + $tmpactivity->content->sumgrades = $quiz->sumgrades; + $tmpactivity->content->maxgrade = $quiz->maxgrade; + $tmpactivity->content->attempt = $quiz->attempt; + + $tmpactivity->user->userid = $quiz->userid; + $tmpactivity->user->fullname = fullname($quiz); + $tmpactivity->user->picture = $quiz->picture; + + $tmpactivity->timestamp = $quiz->timefinish; + + $activities[] = $tmpactivity; + + $index++; + } + } + + return; +} + + +function quiz_print_recent_mod_activity($activity, $course, $detail=false) { + global $CFG, $THEME; + + echo ''; + + echo ""; + echo "
cellcontent2\" class=\"forumpostpicture\" width=\"35\" valign=\"top\">"; + print_user_picture($activity->user->userid, $course, $activity->user->picture); + echo ""; + + if ($detail) { + echo "modpixpath/$activity->type/icon.gif\" ". + "height=\"16\" width=\"16\" alt=\"$activity->type\" /> "; + echo "wwwroot/mod/quiz/view.php?id=" . $activity->instance . "\">" + . $activity->name . " - "; + + } + + if (isteacher($course)) { + $grades = "(" . $activity->content->sumgrades . " / " . $activity->content->maxgrade . ") "; + echo "wwwroot/mod/quiz/review.php?q=" + . $activity->instance . "&attempt=" + . $activity->content->attemptid . "\">" . $grades . " "; + + echo get_string("attempt", "quiz") . " - " . $activity->content->attempt . "
"; + } + echo "wwwroot/user/view.php?id=" + . $activity->user->userid . "&course=$course\">" + . $activity->user->fullname . " "; + + echo " - " . userdate($activity->timestamp); + + echo "
"; + + return; +} + ?> diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index 65cf19090a..f6e0d4b572 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -1650,107 +1650,6 @@ function quiz_grade_responses($quiz, $questions, $attemptid=0) { return $result; } -function quiz_get_recent_mod_activity(&$activities, &$index, $sincetime, $courseid, $quiz="0", $user="", $groupid="") { -// Returns all quizzes since a given time. If quiz is specified then -// this restricts the results - - global $CFG; - - if ($quiz) { - $quizselect = " AND cm.id = '$quiz'"; - } else { - $quizselect = ""; - } - if ($user) { - $userselect = " AND u.id = '$user'"; - } else { - $userselect = ""; - } - - $quizzes = get_records_sql("SELECT qa.*, q.name, u.firstname, u.lastname, u.picture, - q.course, q.sumgrades as maxgrade, cm.instance, cm.section - FROM {$CFG->prefix}quiz_attempts qa, - {$CFG->prefix}quiz q, - {$CFG->prefix}user u, - {$CFG->prefix}course_modules cm - WHERE qa.timefinish > '$sincetime' - AND qa.userid = u.id $userselect - AND qa.quiz = q.id $quizselect - AND cm.instance = q.id - AND cm.course = '$courseid' - AND q.course = cm.course - ORDER BY qa.timefinish ASC"); - - if (empty($quizzes)) - return; - - foreach ($quizzes as $quiz) { - if (empty($groupid) || ismember($groupid, $quiz->userid)) { - - $tmpactivity->type = "quiz"; - $tmpactivity->defaultindex = $index; - $tmpactivity->instance = $quiz->quiz; - - $tmpactivity->name = $quiz->name; - $tmpactivity->section = $quiz->section; - - $tmpactivity->content->attemptid = $quiz->id; - $tmpactivity->content->sumgrades = $quiz->sumgrades; - $tmpactivity->content->maxgrade = $quiz->maxgrade; - $tmpactivity->content->attempt = $quiz->attempt; - - $tmpactivity->user->userid = $quiz->userid; - $tmpactivity->user->fullname = fullname($quiz); - $tmpactivity->user->picture = $quiz->picture; - - $tmpactivity->timestamp = $quiz->timefinish; - - $activities[] = $tmpactivity; - - $index++; - } - } - - return; -} - - -function quiz_print_recent_mod_activity($activity, $course, $detail=false) { - global $CFG, $THEME; - - echo ''; - - echo ""; - echo "
cellcontent2\" class=\"forumpostpicture\" width=\"35\" valign=\"top\">"; - print_user_picture($activity->user->userid, $course, $activity->user->picture); - echo ""; - - if ($detail) { - echo "modpixpath/$activity->type/icon.gif\" ". - "height=\"16\" width=\"16\" alt=\"$activity->type\" /> "; - echo "wwwroot/mod/quiz/view.php?id=" . $activity->instance . "\">" - . $activity->name . " - "; - - } - - if (isteacher($USER)) { - $grades = "(" . $activity->content->sumgrades . " / " . $activity->content->maxgrade . ") "; - echo "wwwroot/mod/quiz/review.php?q=" - . $activity->instance . "&attempt=" - . $activity->content->attemptid . "\">" . $grades . " "; - - echo get_string("attempt", "quiz") . " - " . $activity->content->attempt . "
"; - } - echo "wwwroot/user/view.php?id=" - . $activity->user->userid . "&course=$course\">" - . $activity->user->fullname . " "; - - echo " - " . userdate($activity->timestamp); - - echo "
"; - - return; -} // this function creates default export filename function default_export_filename($course,$category) { -- 2.39.5