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

Merge branch 'MDL-57228' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2017-10-04 13:42:51 +08:00
commit 32c369818c
3 changed files with 82 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mod/quiz/classes/structure.php
View File

@ -802,14 +802,8 @@ class structure {
}
// Update section fist slots.
$DB->execute("
UPDATE {quiz_sections}
SET firstslot = firstslot + ?
WHERE quizid = ?
AND firstslot > ?
AND firstslot < ?
", array($headingmovedirection, $this->get_quizid(),
$headingmoveafter, $headingmovebefore));
quiz_update_section_firstslots($this->get_quizid(), $headingmovedirection,
$headingmoveafter, $headingmovebefore);
// If any pages are now empty, remove them.
$emptypages = $DB->get_fieldset_sql("
@ -915,12 +909,7 @@ class structure {
question_delete_question($slot->questionid);
}
$DB->execute("
UPDATE {quiz_sections}
SET firstslot = firstslot - 1
WHERE quizid = ?
AND firstslot > ?
", array($this->get_quizid(), $slotnumber));
quiz_update_section_firstslots($this->get_quizid(), -1, $slotnumber);
unset($this->questions[$slot->questionid]);
$this->refresh_page_numbers_and_update_db();

28
mod/quiz/locallib.php
View File

@ -2063,12 +2063,7 @@ function quiz_add_quiz_question($questionid, $quiz, $page = 0, $maxmark = null)
$slot->slot = $lastslotbefore + 1;
$slot->page = min($page, $maxpage + 1);
$DB->execute("
UPDATE {quiz_sections}
SET firstslot = firstslot + 1
WHERE quizid = ?
AND firstslot > ?
", array($quiz->id, max($lastslotbefore, 1)));
quiz_update_section_firstslots($quiz->id, 1, max($lastslotbefore, 1));
} else {
$lastslot = end($slots);
@ -2088,6 +2083,27 @@ function quiz_add_quiz_question($questionid, $quiz, $page = 0, $maxmark = null)
$trans->allow_commit();
}
/**
* Move all the section headings in a certain slot range by a certain offset.
*
* @param int $quizid the id of a quiz
* @param int $direction amount to adjust section heading positions. Normally +1 or -1.
* @param int $afterslot adjust headings that start after this slot.
* @param int|null $beforeslot optionally, only adjust headings before this slot.
*/
function quiz_update_section_firstslots($quizid, $direction, $afterslot, $beforeslot = null) {
global $DB;
$where = 'quizid = ? AND firstslot > ?';
$params = [$direction, $quizid, $afterslot];
if ($beforeslot) {
$where .= ' AND firstslot < ?';
$params[] = $beforeslot;
}
$firstslotschanges = $DB->get_records_select_menu('quiz_sections',
$where, $params, '', 'firstslot, firstslot + ?');
update_field_with_unique_index('quiz_sections', 'firstslot', $firstslotschanges, ['quizid' => $quizid]);
}
/**
* Add a random question to the quiz at a given point.
* @param object $quiz the quiz settings.

59
mod/quiz/tests/structure_test.php
View File

@ -648,6 +648,34 @@ class mod_quiz_structure_testcase extends advanced_testcase {
), $structure);
}
public function test_move_slot_does_not_violate_heading_unique_key() {
$quizobj = $this->create_test_quiz(array(
'Heading 1',
array('TF1', 1, 'truefalse'),
'Heading 2',
array('TF2', 2, 'truefalse'),
'Heading 3',
array('TF3', 3, 'truefalse'),
array('TF4', 3, 'truefalse'),
));
$structure = \mod_quiz\structure::create_for_quiz($quizobj);
$idtomove = $structure->get_question_in_slot(4)->slotid;
$idmoveafter = $structure->get_question_in_slot(1)->slotid;
$structure->move_slot($idtomove, $idmoveafter, 1);
$structure = \mod_quiz\structure::create_for_quiz($quizobj);
$this->assert_quiz_layout(array(
'Heading 1',
array('TF1', 1, 'truefalse'),
array('TF4', 1, 'truefalse'),
'Heading 2',
array('TF2', 2, 'truefalse'),
'Heading 3',
array('TF3', 3, 'truefalse'),
), $structure);
}
public function test_quiz_remove_slot() {
$quizobj = $this->create_test_quiz(array(
array('TF1', 1, 'truefalse'),
@ -736,7 +764,6 @@ class mod_quiz_structure_testcase extends advanced_testcase {
'Heading 2',
array('TF2', 2, 'truefalse'),
));
$structure = \mod_quiz\structure::create_for_quiz($quizobj);
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();
@ -754,13 +781,41 @@ class mod_quiz_structure_testcase extends advanced_testcase {
), $structure);
}
public function test_add_question_updates_headings_even_with_one_question_sections() {
$quizobj = $this->create_test_quiz(array(
'Heading 1',
array('TF1', 1, 'truefalse'),
'Heading 2',
array('TF2', 2, 'truefalse'),
'Heading 3',
array('TF3', 3, 'truefalse'),
));
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();
$q = $questiongenerator->create_question('truefalse', null,
array('name' => 'TF4', 'category' => $cat->id));
quiz_add_quiz_question($q->id, $quizobj->get_quiz(), 1);
$structure = \mod_quiz\structure::create_for_quiz($quizobj);
$this->assert_quiz_layout(array(
'Heading 1',
array('TF1', 1, 'truefalse'),
array('TF4', 1, 'truefalse'),
'Heading 2',
array('TF2', 2, 'truefalse'),
'Heading 3',
array('TF3', 3, 'truefalse'),
), $structure);
}
public function test_add_question_at_end_does_not_update_headings() {
$quizobj = $this->create_test_quiz(array(
array('TF1', 1, 'truefalse'),
'Heading 2',
array('TF2', 2, 'truefalse'),
));
$structure = \mod_quiz\structure::create_for_quiz($quizobj);
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();