forked from moodle/moodle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'MDL-61380-master' of git://github.com/rezaies/moodle
- Loading branch information
Showing
24 changed files
with
897 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?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/>. | ||
|
|
||
| /** | ||
| * Defines the editing form for random questions. | ||
| * | ||
| * @package mod_quiz | ||
| * @copyright 2018 Shamim Rezaie <[email protected]> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| namespace mod_quiz\form; | ||
|
|
||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| require_once($CFG->dirroot.'/lib/formslib.php'); | ||
|
|
||
| /** | ||
| * Class randomquestion_form | ||
| * | ||
| * @package mod_quiz | ||
| * @copyright 2018 Shamim Rezaie <[email protected]> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class randomquestion_form extends \moodleform { | ||
|
|
||
| /** | ||
| * Form definiton. | ||
| */ | ||
| public function definition() { | ||
| $mform = $this->_form; | ||
|
|
||
| $contexts = $this->_customdata['contexts']; | ||
| $usablecontexts = $contexts->having_cap('moodle/question:useall'); | ||
|
|
||
| // Standard fields at the start of the form. | ||
| $mform->addElement('header', 'generalheader', get_string("general", 'form')); | ||
|
|
||
| $mform->addElement('questioncategory', 'category', get_string('category', 'question'), | ||
| array('contexts' => $usablecontexts, 'top' => true)); | ||
|
|
||
| $mform->addElement('advcheckbox', 'includesubcategories', get_string('recurse', 'quiz'), null, null, array(0, 1)); | ||
|
|
||
| $tops = question_get_top_categories_for_contexts(array_column($contexts->all(), 'id')); | ||
| $mform->hideIf('includesubcategories', 'category', 'in', $tops); | ||
|
|
||
| $tags = \core_tag_tag::get_tags_by_area_in_contexts('core_question', 'question', $usablecontexts); | ||
| $tagstrings = array(); | ||
| foreach ($tags as $tag) { | ||
| $tagstrings["{$tag->id},{$tag->name}"] = $tag->name; | ||
| } | ||
| $options = array( | ||
| 'multiple' => true, | ||
| 'noselectionstring' => get_string('anytags', 'quiz'), | ||
| ); | ||
| $mform->addElement('autocomplete', 'fromtags', get_string('randomquestiontags', 'mod_quiz'), $tagstrings, $options); | ||
| $mform->addHelpButton('fromtags', 'randomquestiontags', 'mod_quiz'); | ||
|
|
||
| $mform->addElement('hidden', 'slotid'); | ||
| $mform->setType('slotid', PARAM_INT); | ||
|
|
||
| $mform->addElement('hidden', 'returnurl'); | ||
| $mform->setType('returnurl', PARAM_LOCALURL); | ||
|
|
||
| $buttonarray = array(); | ||
| $buttonarray[] = $mform->createElement('submit', 'submitbutton', get_string('savechanges')); | ||
| $buttonarray[] = $mform->createElement('cancel'); | ||
| $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); | ||
| $mform->closeHeaderBefore('buttonar'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| <?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/>. | ||
|
|
||
| /** | ||
| * Defines the \mod_quiz\local\structure\slot_random class. | ||
| * | ||
| * @package mod_quiz | ||
| * @copyright 2018 Shamim Rezaie <[email protected]> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| namespace mod_quiz\local\structure; | ||
|
|
||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| /** | ||
| * Class slot_random, represents a random question slot type. | ||
| * | ||
| * @package mod_quiz | ||
| * @copyright 2018 Shamim Rezaie <[email protected]> | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class slot_random { | ||
|
|
||
| /** @var \stdClass Slot's properties. A record retrieved from the quiz_slots table. */ | ||
| protected $record; | ||
|
|
||
| /** | ||
| * @var \stdClass The quiz this question slot belongs to. | ||
| */ | ||
| protected $quiz = null; | ||
|
|
||
| /** | ||
| * slot_random constructor. | ||
| * | ||
| * @param \stdClass $slotrecord Represents a record in the quiz_slots table. | ||
| */ | ||
| public function __construct($slotrecord = null) { | ||
| $this->record = new \stdClass(); | ||
|
|
||
| $properties = array( | ||
| 'id', 'slot', 'quizid', 'page', 'requireprevious', | ||
| 'questionid', 'questioncategoryid', 'includingsubcategories', | ||
| 'tags', 'maxmark'); | ||
|
|
||
| foreach ($properties as $property) { | ||
| if (isset($slotrecord->$property)) { | ||
| $this->record->$property = $slotrecord->$property; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the quiz for this question slot. | ||
| * The quiz is fetched the first time it is requested and then stored in a member variable to be returned each subsequent time. | ||
| * | ||
| * @return mixed | ||
| * @throws \coding_exception | ||
| */ | ||
| public function get_quiz() { | ||
| global $DB; | ||
|
|
||
| if (empty($this->quiz)) { | ||
| if (empty($this->record->quizid)) { | ||
| throw new \coding_exception('quizid is not set.'); | ||
| } | ||
| $this->quiz = $DB->get_record('quiz', array('id' => $this->record->quizid)); | ||
| } | ||
|
|
||
| return $this->quiz; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the quiz object for the quiz slot. | ||
| * It is not mandatory to set the quiz as the quiz slot can fetch it the first time it is accessed, | ||
| * however it helps with the performance to set the quiz if you already have it. | ||
| * | ||
| * @param \stdClass $quiz The qui object. | ||
| */ | ||
| public function set_quiz($quiz) { | ||
| $this->quiz = $quiz; | ||
| $this->record->quizid = $quiz->id; | ||
| } | ||
|
|
||
| /** | ||
| * Inserts the quiz slot at the $page page. | ||
| * It is required to call this function if you are building a quiz slot object from scratch. | ||
| * | ||
| * @param int $page The page that this slot will be inserted at. | ||
| */ | ||
| public function insert($page) { | ||
| global $DB; | ||
|
|
||
| $slots = $DB->get_records('quiz_slots', array('quizid' => $this->record->quizid), | ||
| 'slot', 'id, slot, page'); | ||
|
|
||
| $trans = $DB->start_delegated_transaction(); | ||
|
|
||
| $maxpage = 1; | ||
| $numonlastpage = 0; | ||
| foreach ($slots as $slot) { | ||
| if ($slot->page > $maxpage) { | ||
| $maxpage = $slot->page; | ||
| $numonlastpage = 1; | ||
| } else { | ||
| $numonlastpage += 1; | ||
| } | ||
| } | ||
|
|
||
| if (is_int($page) && $page >= 1) { | ||
| // Adding on a given page. | ||
| $lastslotbefore = 0; | ||
| foreach (array_reverse($slots) as $otherslot) { | ||
| if ($otherslot->page > $page) { | ||
| $DB->set_field('quiz_slots', 'slot', $otherslot->slot + 1, array('id' => $otherslot->id)); | ||
| } else { | ||
| $lastslotbefore = $otherslot->slot; | ||
| break; | ||
| } | ||
| } | ||
| $this->record->slot = $lastslotbefore + 1; | ||
| $this->record->page = min($page, $maxpage + 1); | ||
|
|
||
| quiz_update_section_firstslots($this->record->quizid, 1, max($lastslotbefore, 1)); | ||
| } else { | ||
| $lastslot = end($slots); | ||
| $quiz = $this->get_quiz(); | ||
| if ($lastslot) { | ||
| $this->record->slot = $lastslot->slot + 1; | ||
| } else { | ||
| $this->record->slot = 1; | ||
| } | ||
| if ($quiz->questionsperpage && $numonlastpage >= $quiz->questionsperpage) { | ||
| $this->record->page = $maxpage + 1; | ||
| } else { | ||
| $this->record->page = $maxpage; | ||
| } | ||
| } | ||
|
|
||
| $this->record->id = $DB->insert_record('quiz_slots', $this->record); | ||
| $trans->allow_commit(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.