Skip to content

Commit

Permalink
MDL-75125 mod_quiz: Use custom columns for question bank actions
Browse files Browse the repository at this point in the history
We no longer support action columns in the core question bank,
but the "add from question bank" view still needs to display a
couple of actions, so this implements them as custom columns.
  • Loading branch information
marxjohnson committed Jun 2, 2023
1 parent 359bb7e commit 327f23b
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 17 deletions.
19 changes: 17 additions & 2 deletions mod/quiz/classes/question/bank/add_action_column.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author 2021 Safat Shahin <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class add_action_column extends \core_question\local\bank\action_column_base {
class add_action_column extends \core_question\local\bank\column_base {

/** @var string caches a lang string used repeatedly. */
protected $stradd;
Expand All @@ -35,14 +35,29 @@ public function init(): void {
$this->stradd = get_string('addtoquiz', 'quiz');
}

public function get_extra_classes(): array {
return ['iconcol'];
}

public function get_title(): string {
return '&#160;';
}

public function get_name() {
return 'addtoquizaction';
}

protected function display_content($question, $rowclasses) {
global $OUTPUT;
if (!question_has_capability_on($question, 'use')) {
return;
}
$this->print_icon('t/add', $this->stradd, $this->qbank->add_to_quiz_url($question->id));
$link = new \action_link(
$this->qbank->add_to_quiz_url($question->id),
'',
null,
['title' => $this->stradd],
new \pix_icon('t/add', $this->stradd));
echo $OUTPUT->render($link);
}
}
25 changes: 10 additions & 15 deletions mod/quiz/classes/question/bank/custom_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,21 +260,7 @@ protected function init_sort_from_params(): void {

protected function build_query(): void {
// Get the required tables and fields.
$joins = [];
$fields = ['qv.status', 'qc.id as categoryid', 'qv.version', 'qv.id as versionid', 'qbe.id as questionbankentryid'];
if (!empty($this->requiredcolumns)) {
foreach ($this->requiredcolumns as $column) {
$extrajoins = $column->get_extra_joins();
foreach ($extrajoins as $prefix => $join) {
if (isset($joins[$prefix]) && $joins[$prefix] != $join) {
throw new \coding_exception('Join ' . $join . ' conflicts with previous join ' . $joins[$prefix]);
}
$joins[$prefix] = $join;
}
$fields = array_merge($fields, $column->get_required_fields());
}
}
$fields = array_unique($fields);
[$fields, $joins] = $this->get_component_requirements(array_merge($this->requiredcolumns, $this->questionactions));

// Build the order by clause.
$sorts = [];
Expand Down Expand Up @@ -334,4 +320,13 @@ public function wanted_filters($cat, $tagids, $showhidden, $recurse, $editcontex
}
$this->display_options_form($showquestiontext);
}

/**
* Return the quiz settings for the quiz this question bank is displayed in.
*
* @return bool|\stdClass
*/
public function get_quiz() {
return $this->quiz;
}
}
50 changes: 50 additions & 0 deletions mod/quiz/classes/question/bank/preview_action_column.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?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\question\bank;

/**
* A column type for the preview question action.
*
* @package mod_quiz
* @category question
* @copyright 2023 Catalyst IT Europe Ltd.
* @author Mark Johnson <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class preview_action_column extends \core_question\local\bank\column_base {

public function get_extra_classes(): array {
return ['iconcol'];
}

public function get_title(): string {
return '&#160;';
}

public function get_name() {
return 'previewquestionaction';
}

protected function display_content($question, $rowclasses) {
global $PAGE;
if (!question_has_capability_on($question, 'use')) {
return;
}
$editrenderer = $PAGE->get_renderer('quiz', 'edit');
echo $editrenderer->question_preview_icon($this->qbank->get_quiz(), $question);
}
}

0 comments on commit 327f23b

Please sign in to comment.