Index: temp_moodle_dev/moodle/mod/quiz/lib.php
===================================================================
RCS file: /usr/local/cvsroot/temp_moodle_dev/moodle/mod/quiz/lib.php,v
diff -u -r1.3 -r1.4
--- temp_moodle_dev/moodle/mod/quiz/lib.php 11 Dec 2008 00:18:36 -0000 1.3
+++ temp_moodle_dev/moodle/mod/quiz/lib.php 28 Oct 2009 07:32:02 -0000 1.4
@@ -10,8 +10,6 @@
*/
require_once($CFG->libdir.'/pagelib.php');
-require_once($CFG->libdir.'/questionlib.php');
-require_once($CFG->dirroot.'/mod/quiz/editlib.php');
/// CONSTANTS ///////////////////////////////////////////////////////////////////
@@ -120,7 +118,6 @@
return true;
}
-
function quiz_delete_instance($id) {
/// Given an ID of an instance of this module,
/// this function will permanently delete the instance
@@ -133,8 +130,9 @@
$result = true;
if ($attempts = get_records("quiz_attempts", "quiz", "$quiz->id")) {
+ // TODO: this should use the delete_attempt($attempt->uniqueid) function in questionlib.php
+ // require_once($CFG->libdir.'/questionlib.php');
foreach ($attempts as $attempt) {
- // TODO: this should use the delete_attempt($attempt->uniqueid) function in questionlib.php
if (! delete_records("question_states", "attempt", "$attempt->uniqueid")) {
$result = false;
}
@@ -160,7 +158,7 @@
$pagetypes = page_import_types('mod/quiz/');
foreach($pagetypes as $pagetype) {
- if(!delete_records('block_instance', 'pageid', $quiz->id, 'pagetype', $pagetype)) {
+ if(!blocks_delete_all_on_page($pagetype, $quiz->id)) {
$result = false;
}
}
@@ -176,33 +174,47 @@
return $result;
}
+/**
+ * Get the best current grade for a particular user in a quiz.
+ *
+ * @param object $quiz the quiz object.
+ * @param integer $userid the id of the user.
+ * @return float the user's current grade for this quiz.
+ */
+function quiz_get_best_grade($quiz, $userid) {
+ $grade = get_field('quiz_grades', 'grade', 'quiz', $quiz->id, 'userid', $userid);
+ // Need to detect errors/no result, without catching 0 scores.
+ if (is_numeric($grade)) {
+ return round($grade, $quiz->decimalpoints);
+ } else {
+ return NULL;
+ }
+}
+
function quiz_user_outline($course, $user, $mod, $quiz) {
/// Return a small object with summary information about what a
/// user has done with a given particular instance of this module
/// Used for user activity reports.
/// $return->time = the time they did it
/// $return->info = a short text description
- if ($grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
-
- $result = new stdClass;
- if ((float)$grade->grade) {
- $result->info = get_string('grade').': '.round($grade->grade, $quiz->decimalpoints);
- }
- $result->time = $grade->timemodified;
- return $result;
+ $grade = quiz_get_best_grade($quiz, $user->id);
+ if (is_null($grade)) {
+ return NULL;
}
- return NULL;
+ $result = new stdClass;
+ $result->info = get_string('grade') . ': ' . $grade . '/' . $quiz->grade;
+ $result->time = get_field('quiz_attempts', 'MAX(timefinish)', 'userid', $user->id, 'quiz', $quiz->id);
+ return $result;
}
-
function quiz_user_complete($course, $user, $mod, $quiz) {
/// Print a detailed representation of what a user has done with
/// a given particular instance of this module, for user activity reports.
if ($attempts = get_records_select('quiz_attempts', "userid='$user->id' AND quiz='$quiz->id'", 'attempt ASC')) {
- if ($quiz->grade and $quiz->sumgrades && $grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
+ if ($quiz->grade && $quiz->sumgrades && $grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) {
echo get_string('grade').': '.round($grade->grade, $quiz->decimalpoints).'/'.$quiz->grade.'
';
}
foreach ($attempts as $attempt) {
@@ -221,8 +233,7 @@
return true;
}
-
-function quiz_cron () {
+function quiz_cron() {
/// Function to be run periodically according to the moodle cron
/// This function searches for things that need to be done, such
/// as sending out mail, toggling flags etc ...
@@ -416,7 +427,6 @@
return grade_update('mod/quiz', $quiz->course, 'mod', 'quiz', $quiz->id, 0, NULL, array('deleted'=>1));
}
-
function quiz_get_participants($quizid) {
/// Returns an array of users who have data in a given quiz
/// (users with records in quiz_attempts and quiz_question_versions)
@@ -449,8 +459,6 @@
}
function quiz_refresh_events($courseid = 0) {
-// This horrible function only seems to be called from mod/quiz/db/[dbtype].php.
-
// This standard function will check all instances of this module
// and make sure there are up-to-date events created for each of them.
// If courseid = 0, then every quiz event in the site is checked, else
@@ -574,7 +582,6 @@
return;
}
-
$cm_context = get_context_instance(CONTEXT_MODULE, $cm->id);
$grader = has_capability('moodle/grade:viewall', $cm_context);
$accessallgroups = has_capability('moodle/site:accessallgroups', $cm_context);
@@ -630,7 +637,6 @@
return;
}
-
function quiz_print_recent_mod_activity($activity, $courseid, $detail, $modnames) {
global $CFG;
@@ -732,9 +738,11 @@
$numboundaries = $i;
// Check there is nothing in the remaining unused fields.
- for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) {
- if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') {
- return get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
+ if (!empty($quiz->feedbackboundaries)) {
+ for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) {
+ if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') {
+ return get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
+ }
}
}
for ($i = $numboundaries + 1; $i < count($quiz->feedbacktext); $i += 1) {
@@ -866,12 +874,11 @@
$feedback->feedbacktext = $quiz->feedbacktext[$i];
$feedback->mingrade = $quiz->feedbackboundaries[$i];
$feedback->maxgrade = $quiz->feedbackboundaries[$i - 1];
- if (!insert_record('quiz_feedback', $feedback, false)) {
+ if (!insert_record('quiz_feedback', $feedback, false)) {
return "Could not save quiz feedback.";
}
}
-
// Update the events relating to this quiz.
// This is slightly inefficient, deleting the old events and creating new ones. However,
// there are at most two events, and this keeps the code simpler.
@@ -997,7 +1004,14 @@
*/
function quiz_reset_userdata($data) {
global $CFG, $QTYPES;
+
+ if (empty($QTYPES)) {
+ require_once($CFG->libdir . '/questionlib.php');
+ }
+ // TODO: this should use the delete_attempt($attempt->uniqueid) function in questionlib.php
+ // require_once($CFG->libdir.'/questionlib.php');
+
$componentstr = get_string('modulenameplural', 'quiz');
$status = array();
@@ -1055,14 +1069,14 @@
* Checks whether the current user is allowed to view a file uploaded in a quiz.
* Teachers can view any from their courses, students can only view their own.
*
- * @param int $attemptid int attempt id
+ * @param int $attemptuniqueid int attempt id
* @param int $questionid int question id
* @return boolean to indicate access granted or denied
*/
-function quiz_check_file_access($attemptid, $questionid) {
+function quiz_check_file_access($attemptuniqueid, $questionid) {
global $USER;
- $attempt = get_record("quiz_attempts", 'id', $attemptid);
+ $attempt = get_record("quiz_attempts", 'uniqueid', $attemptuniqueid);
$quiz = get_record("quiz", 'id', $attempt->quiz);
$context = get_context_instance(CONTEXT_COURSE, $quiz->course);
@@ -1115,7 +1129,7 @@
// The $quiz objects returned by get_all_instances_in_course have the necessary $cm
// fields set to make the following call work.
$str .= '' . quiz_num_attempt_summary($quiz, $quiz, true) . '
';
- } else if (has_capability('mod/quiz:attempt', $context)){ // Student
+ } else if (has_any_capability(array('mod/quiz:reviewmyattempts', 'mod/quiz:attempt'), $context)) { // Student
/// For student-like people, tell them how many attempts they have made.
if (isset($USER->id) && ($attempts = quiz_get_user_attempts($quiz->id, $USER->id))) {
$numattempts = count($attempts);
@@ -1177,6 +1191,25 @@
}
/**
+ * Returns all other caps used in module
+ */
+function quiz_get_extra_capabilities() {
+ return array(
+ 'moodle/site:accessallgroups',
+ 'moodle/question:add',
+ 'moodle/question:editmine',
+ 'moodle/question:editall',
+ 'moodle/question:viewmine',
+ 'moodle/question:viewall',
+ 'moodle/question:usemine',
+ 'moodle/question:useall',
+ 'moodle/question:movemine',
+ 'moodle/question:moveall',
+ 'moodle/question:managecategory',
+ );
+}
+
+/**
* LAMS Function
* This function clones an existing instance of Moodle quiz
* replacing the course and the userid
@@ -1334,4 +1367,5 @@
}
+
?>