mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-20154 quiz: Remove unused random questions

Browse Source 
When a random question is removed from a quiz, and it is not
in use elsewhere, it should be deleted.
This commit is contained in:
Eric Merrill 2014-05-29 14:20:26 -04:00
parent c1d0d73718
commit 828a4e9f6e
4 changed files with 128 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/quiz/editlib.php
View File

@ -84,6 +84,13 @@ function quiz_remove_slot($quiz, $slotnumber) {
$DB->set_field('quiz_slots', 'slot', $i - 1,
array('quizid' => $quiz->id, 'slot' => $i));
}
$qtype = $DB->get_field('question', 'qtype', array('id' => $slot->questionid));
if ($qtype === 'random') {
// This function automatically checks if the question is in use, and won't delete if it is.
question_delete_question($slot->questionid);
}
$trans->allow_commit();
}

13
mod/quiz/lib.php
View File

@ -166,7 +166,20 @@ function quiz_delete_instance($id) {
quiz_delete_all_attempts($quiz);
quiz_delete_all_overrides($quiz);
// Look for random questions that may no longer be used when this quiz is gone.
$sql = "SELECT q.id
FROM {quiz_slots} slot
JOIN {question} q ON q.id = slot.questionid
WHERE slot.quizid = ? AND q.qtype = ?";
$questionids = $DB->get_fieldset_sql($sql, array($quiz->id, 'random'));
// We need to do this before we try and delete randoms, otherwise they would still be 'in use'.
$DB->delete_records('quiz_slots', array('quizid' => $quiz->id));
foreach ($questionids as $questionid) {
question_delete_question($questionid);
}
$DB->delete_records('quiz_feedback', array('quizid' => $quiz->id));
quiz_access_manager::delete_settings($quiz);

67
mod/quiz/tests/editlib_test.php
View File

@ -36,7 +36,7 @@ require_once($CFG->dirroot . '/mod/quiz/editlib.php');
* @copyright 2009 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_editlib_testcase extends basic_testcase {
class mod_quiz_editlib_testcase extends advanced_testcase {
public function test_quiz_question_tostring() {
$question = new stdClass();
$question->qtype = 'multichoice';
@ -48,4 +48,69 @@ class mod_quiz_editlib_testcase extends basic_testcase {
$this->assertEquals('<span class="questionname">The question name</span>' .
'<span class="questiontext">What sort of INEQUALITY is x &lt; y[?]</span>', $summary);
}
/**
* Test removing slots from a quiz.
*/
public function test_quiz_remove_slot() {
global $SITE, $DB;
$this->resetAfterTest(true);
$this->setAdminUser();
// Setup a quiz with 1 standard and 1 random question.
$quizgenerator = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
$quiz = $quizgenerator->create_instance(array('course' => $SITE->id, 'questionsperpage' => 3, 'grade' => 100.0));
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();
$standardq = $questiongenerator->create_question('shortanswer', null, array('category' => $cat->id));
quiz_add_quiz_question($standardq->id, $quiz);
quiz_add_random_questions($quiz, 0, $cat->id, 1, false);
// Get the random question.
$randomq = $DB->get_record('question', array('qtype' => 'random'));
$slotssql = "SELECT qs.*, q.qtype AS qtype
FROM {quiz_slots} AS qs
JOIN {question} AS q ON qs.questionid = q.id
WHERE qs.quizid = ?
ORDER BY qs.slot";
$slots = $DB->get_records_sql($slotssql, array($quiz->id));
// Check that the setup looks right.
$this->assertEquals(2, count($slots));
$slot = array_shift($slots);
$this->assertEquals($standardq->id, $slot->questionid);
$slot = array_shift($slots);
$this->assertEquals($randomq->id, $slot->questionid);
$this->assertEquals(2, $slot->slot);
// Remove the standard question.
quiz_remove_slot($quiz, 1);
$slots = $DB->get_records_sql($slotssql, array($quiz->id));
// Check the new ordering, and that the slot number was updated.
$this->assertEquals(1, count($slots));
$slot = array_shift($slots);
$this->assertEquals($randomq->id, $slot->questionid);
$this->assertEquals(1, $slot->slot);
// Check the the standard question was not deleted.
$count = $DB->count_records('question', array('id' => $standardq->id));
$this->assertEquals(1, $count);
// Remove the random question.
quiz_remove_slot($quiz, 1);
$slots = $DB->get_records_sql($slotssql, array($quiz->id));
// Check that new ordering.
$this->assertEquals(0, count($slots));
// Check that the random question was deleted.
$count = $DB->count_records('question', array('id' => $randomq->id));
$this->assertEquals(0, $count);
}
}

44
mod/quiz/tests/lib_test.php
View File

@ -27,14 +27,14 @@
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/quiz/lib.php');
require_once($CFG->dirroot . '/mod/quiz/editlib.php');
/**
* @copyright 2008 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/
class mod_quiz_lib_testcase extends basic_testcase {
class mod_quiz_lib_testcase extends advanced_testcase {
public function test_quiz_has_grades() {
$quiz = new stdClass();
$quiz->grade = '100.0000';
@ -75,4 +75,44 @@ class mod_quiz_lib_testcase extends basic_testcase {
$this->assertEquals(quiz_format_question_grade($quiz, 0), format_float(0, 4));
$this->assertEquals(quiz_format_question_grade($quiz, 1.000000000000), format_float(1, 4));
}
/**
* Test deleting a quiz instance.
*/
public function test_quiz_delete_instance() {
global $SITE, $DB;
$this->resetAfterTest(true);
$this->setAdminUser();
// Setup a quiz with 1 standard and 1 random question.
$quizgenerator = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
$quiz = $quizgenerator->create_instance(array('course' => $SITE->id, 'questionsperpage' => 3, 'grade' => 100.0));
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();
$standardq = $questiongenerator->create_question('shortanswer', null, array('category' => $cat->id));
quiz_add_quiz_question($standardq->id, $quiz);
quiz_add_random_questions($quiz, 0, $cat->id, 1, false);
// Get the random question.
$randomq = $DB->get_record('question', array('qtype' => 'random'));
quiz_delete_instance($quiz->id);
// Check that the random question was deleted.
$count = $DB->count_records('question', array('id' => $randomq->id));
$this->assertEquals(0, $count);
// Check that the standard question was not deleted.
$count = $DB->count_records('question', array('id' => $standardq->id));
$this->assertEquals(1, $count);
// Check that all the slots were removed.
$count = $DB->count_records('quiz_slots', array('quizid' => $quiz->id));
$this->assertEquals(0, $count);
// Check that the quiz was removed.
$count = $DB->count_records('quiz', array('id' => $quiz->id));
$this->assertEquals(0, $count);
}
}