moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-6376 - fix minor errors in the previous commit.

Browse source 
More significantly, this patch changes the '1 Students have made 1 attempts' string.

To start with, this code was being produced in five different places, so I made a function to do the work!. Next, as you can see, it is not gramatical. Also, some people find it confusing, as in MDL-6376.

Therefore, it now just says 'Attempts: 1'.

Merged from MOODLE_19_STABLE.
This commit is contained in:
tjhunt 2007-10-30 19:29:45 +00:00
parent f63d29223e
commit 6c58e1985b
7 changed files with 25 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

27
mod/quiz/lib.php
View file

@ -1023,7 +1023,7 @@ function quiz_print_overview($courses, &$htmlarray) {
/// We want to list quizzes that are currently available, and which have a close date.
/// This is the same as what the lesson does, and the dabate is in MDL-10568.
$now = date();
$now = time();
foreach ($quizs as $quiz) {
if ($quiz->timeclose >= $now && $quiz->timeopen < $now) {
/// Give a link to the quiz, and the deadline.
@ -1037,15 +1037,7 @@ function quiz_print_overview($courses, &$htmlarray) {
$context = get_context_instance(CONTEXT_MODULE, $quiz->coursemodule);
if (has_capability('mod/quiz:viewreports', $context)) {
/// For teacher-like people, show a summary of the number of student attempts.
$a = new stdClass;
if ($a->attemptnum = count_records('quiz_attempts', 'quiz', $quiz->id, 'preview', 0)) {
$a->studentnum = count_records_select('quiz_attempts', "quiz = '$quiz->id' AND preview = '0'", 'COUNT(DISTINCT userid)');
} else {
$a->studentnum = 0;
$a->attemptnum = 0;
}
$a->studentstring = $course->students;
$str .= '<div class="info">' . get_string('numattempts', 'quiz', $a) . '</div>';
$str .= '<div class="info">' . quiz_num_attempt_summary($quiz, true) . '</div>';
} else if (has_capability('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))) {
@ -1069,4 +1061,19 @@ function quiz_print_overview($courses, &$htmlarray) {
}
}
}
/**
* Return a textual summary of the number of attemtps that have been made at a particular quiz,
* returns '' if no attemtps have been made yet, unless $returnzero is passed as true.
* @param object $quiz the quiz object. Only $quiz->id is used at the moment.
* @param boolean $returnzero if false (default), when no attempts have been made '' is returned instead of 'Attempts: 0'.
* @return string a string like "Attempts: 123".
*/
function quiz_num_attempt_summary($quiz, $returnzero = false) {
$numattempts = count_records('quiz_attempts', 'quiz', $quiz->id, 'preview', 0);
if ($numattempts || $returnzero) {
return get_string('attemptsnum', 'quiz', $numattempts);
}
return '';
}
?>