Skip to content

Commit

Permalink
Merge branch 'MDL-80880' of https://github.com/timhunt/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyatregubov committed Mar 6, 2024
2 parents 9283444 + a57d88b commit 8e99589
Show file tree
Hide file tree
Showing 19 changed files with 559 additions and 288 deletions.
250 changes: 250 additions & 0 deletions mod/quiz/classes/output/attempt_summary_information.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

namespace mod_quiz\output;

use action_link;
use core\output\named_templatable;
use html_writer;
use mod_quiz\quiz_attempt;
use moodle_url;
use mod_quiz\question\display_options;
use question_display_options;
use renderable;
use renderer_base;
use stdClass;
use user_picture;

/**
* A summary of a single quiz attempt for rendering.
*
* This is used in places like
* - at the top of the review attempt page (review.php)
* - at the top of the review single question page (reviewquestion.php)
* - on the quiz entry page (view.php).
*
* @package mod_quiz
* @copyright 2024 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class attempt_summary_information implements renderable, named_templatable {

/** @var array[] The rows of summary data. {@see add_item()} should make the structure clear. */
protected array $summarydata = [];

/**
* Add an item to the summary.
*
* @param string $shortname unique identifier of this item (not displayed).
* @param string|renderable $title the title of this item.
* @param string|renderable $content the content of this item.
*/
public function add_item(string $shortname, string|renderable $title, string|renderable $content): void {
$this->summarydata[$shortname] = [
'title' => $title,
'content' => $content,
];
}

/**
* Filter the data held, to keep only the information with the given shortnames.
*
* @param array $shortnames items to keep.
*/
public function filter_keeping_only(array $shortnames): void {
foreach ($this->summarydata as $shortname => $rowdata) {
if (!in_array($shortname, $shortnames)) {
unset($this->summarydata[$shortname]);
}
}
}

/**
* To aid conversion of old code. This converts the old array format into an instance of this class.
*
* @param array $items array of $shortname => [$title, $content].
* @return static
*/
public static function create_from_legacy_array(array $items): static {
$summary = new static();
foreach ($items as $shortname => $item) {
$summary->add_item($shortname, $item['title'], $item['content']);
}
return $summary;
}

/**
* Initialise an instance of this class for a particular quiz attempt.
*
* @param quiz_attempt $attemptobj the attempt to summarise.
* @param display_options $options options for what can be seen.
* @param int|null $pageforlinkingtootherattempts if null, no links to other attempsts will be created.
* If specified, the URL of this particular page of the attempt, otherwise
* the URL will go to the first page. If -1, deduce $page from $slot.
* @param bool|null $showall if true, the URL will be to review the entire attempt on one page,
* and $page will be ignored. If null, a sensible default will be chosen.
* @return self summary information.
*/
public static function create_for_attempt(
quiz_attempt $attemptobj,
display_options $options,
?int $pageforlinkingtootherattempts = null,
?bool $showall = null,
): static {
global $DB, $USER;
$summary = new static();

// Prepare summary information about the whole attempt.
if (!$attemptobj->get_quiz()->showuserpicture && $attemptobj->get_userid() != $USER->id) {
// If showuserpicture is true, the picture is shown elsewhere, so don't repeat it.
$student = $DB->get_record('user', ['id' => $attemptobj->get_userid()]);
$userpicture = new user_picture($student);
$userpicture->courseid = $attemptobj->get_courseid();
$summary->add_item('user', $userpicture,
new action_link(
new moodle_url('/user/view.php', ['id' => $student->id, 'course' => $attemptobj->get_courseid()]),
fullname($student, true),
)
);
}

if ($pageforlinkingtootherattempts !== null && $attemptobj->has_capability('mod/quiz:viewreports')) {
$attemptlist = $attemptobj->links_to_other_attempts(
$attemptobj->review_url(null, $pageforlinkingtootherattempts, $showall));
if ($attemptlist) {
$summary->add_item('attemptlist', get_string('attempts', 'quiz'), $attemptlist);
}
}

// Timing information.
$attempt = $attemptobj->get_attempt();
$quiz = $attemptobj->get_quiz();
$overtime = 0;

if ($attempt->state == quiz_attempt::FINISHED) {
if ($timetaken = ($attempt->timefinish - $attempt->timestart)) {
if ($quiz->timelimit && $timetaken > ($quiz->timelimit + 60)) {
$overtime = $timetaken - $quiz->timelimit;
$overtime = format_time($overtime);
}
$timetaken = format_time($timetaken);
} else {
$timetaken = "-";
}
} else {
$timetaken = get_string('unfinished', 'quiz');
}

$summary->add_item('startedon', get_string('startedon', 'quiz'), userdate($attempt->timestart));

$summary->add_item('state', get_string('attemptstate', 'quiz'),
quiz_attempt::state_name($attemptobj->get_attempt()->state));

if ($attempt->state == quiz_attempt::FINISHED) {
$summary->add_item('completedon', get_string('completedon', 'quiz'),
userdate($attempt->timefinish));
$summary->add_item('timetaken', get_string('timetaken', 'quiz'), $timetaken);
}

if (!empty($overtime)) {
$summary->add_item('overdue', get_string('overdue', 'quiz'), $overtime);
}

// Show marks (if the user is allowed to see marks at the moment).
$grade = quiz_rescale_grade($attempt->sumgrades, $quiz, false);
if ($options->marks >= question_display_options::MARK_AND_MAX && quiz_has_grades($quiz)) {

if ($attempt->state != quiz_attempt::FINISHED) {
// Cannot display grade.

} else if (is_null($grade)) {
$summary->add_item('grade', get_string('gradenoun'),
quiz_format_grade($quiz, $grade));

} else {
// Show raw marks only if they are different from the grade (like on the view page).
if ($quiz->grade != $quiz->sumgrades) {
$a = new stdClass();
$a->grade = quiz_format_grade($quiz, $attempt->sumgrades);
$a->maxgrade = quiz_format_grade($quiz, $quiz->sumgrades);
$summary->add_item('marks', get_string('marks', 'quiz'),
get_string('outofshort', 'quiz', $a));
}

// Now the scaled grade.
$a = new stdClass();
$a->grade = html_writer::tag('b', quiz_format_grade($quiz, $grade));
$a->maxgrade = quiz_format_grade($quiz, $quiz->grade);
if ($quiz->grade != 100) {
// Show the percentage using the configured number of decimal places,
// but without trailing zeroes.
$a->percent = html_writer::tag('b', format_float(
$attempt->sumgrades * 100 / $quiz->sumgrades,
$quiz->decimalpoints, true, true));
$formattedgrade = get_string('outofpercent', 'quiz', $a);
} else {
$formattedgrade = get_string('outof', 'quiz', $a);
}
$summary->add_item('grade', get_string('gradenoun'),
$formattedgrade);
}
}

// Any additional summary data from the behaviour.
foreach ($attemptobj->get_additional_summary_data($options) as $shortname => $data) {
$summary->add_item($shortname, $data['title'], $data['content']);
}

// Feedback if there is any, and the user is allowed to see it now.
$feedback = $attemptobj->get_overall_feedback($grade);
if ($options->overallfeedback && $feedback) {
$summary->add_item('feedback', get_string('feedback', 'quiz'), $feedback);
}

return $summary;
}

public function export_for_template(renderer_base $output): array {

$templatecontext = [
'hasitems' => !empty($this->summarydata),
'items' => [],
];
foreach ($this->summarydata as $item) {
if ($item['title'] instanceof renderable) {
$title = $output->render($item['title']);
} else {
$title = $item['title'];
}

if ($item['content'] instanceof renderable) {
$content = $output->render($item['content']);
} else {
$content = $item['content'];
}

$templatecontext['items'][] = (object) ['title' => $title, 'content' => $content];
}

return $templatecontext;
}

public function get_template_name(\renderer_base $renderer): string {
// Only reason we are forced to implement this is that we want the quiz renderer
// passed to export_for_template, not a core_renderer.
return 'mod_quiz/attempt_summary_information';
}
}
85 changes: 85 additions & 0 deletions mod/quiz/classes/output/list_of_attempts.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

namespace mod_quiz\output;

use core\output\named_templatable;
use mod_quiz\quiz_attempt;
use renderable;
use renderer_base;

/**
* Display summary information about a list of attempts.
*
* This is used on the front page of the quiz (view.php).
*
* @package mod_quiz
* @copyright 2024 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class list_of_attempts implements renderable, named_templatable {

/** @var int time to consider as now. */
protected int $timenow;

/** @var quiz_attempt[] The list of attempts to summarise. */
protected array $attempts = [];

/**
* Constructor.
*
* @param int $timenow time that is now.
*/
public function __construct(int $timenow) {
$this->timenow = $timenow;
}

/**
* Add an event to the list.
*
* @param quiz_attempt $attemptobj
*/
public function add_attempt(quiz_attempt $attemptobj): void {
$this->attempts[] = $attemptobj;
}

public function export_for_template(renderer_base $output): array {

$templatecontext = [
'hasattempts' => !empty($this->attempts),
'attempts' => [],
];

foreach ($this->attempts as $attemptobj) {
$displayoptions = $attemptobj->get_display_options(true);
$templatecontext['attempts'][] = (object) [
'name' => get_string('attempt', 'mod_quiz', $attemptobj->get_attempt_number()),
'summarydata' => attempt_summary_information::create_for_attempt(
$attemptobj, $displayoptions)->export_for_template($output),
'reviewlink' => $attemptobj->get_access_manager($this->timenow)->make_review_link(
$attemptobj->get_attempt(), $displayoptions, $output),
];
}

return $templatecontext;
}

public function get_template_name(\renderer_base $renderer): string {
// Only reason we are forced to implement this is that we want the quiz renderer
// passed to export_for_template, not a core_renderer.
return 'mod_quiz/list_of_attempts';
}
}
Loading

0 comments on commit 8e99589

Please sign in to comment.