diff --git a/question/type/ordering/.github/workflows/ci.yml b/question/type/ordering/.github/workflows/ci.yml deleted file mode 100644 index 628e4b395fb..00000000000 --- a/question/type/ordering/.github/workflows/ci.yml +++ /dev/null @@ -1,127 +0,0 @@ -name: Moodle plugin CI -on: [push, pull_request] - -jobs: - test: - runs-on: 'ubuntu-latest' - - strategy: - fail-fast: false - matrix: - include: - - php: '8.2' - moodle-branch: 'master' - database: 'mariadb' - - php: '8.2' - moodle-branch: 'MOODLE_403_STABLE' - database: 'pgsql' - - php: '8.1' - moodle-branch: 'MOODLE_402_STABLE' - database: 'mariadb' - - php: '8.0' - moodle-branch: 'MOODLE_401_STABLE' - database: 'pgsql' - - php: '7.4' - moodle-branch: 'MOODLE_400_STABLE' - database: 'mariadb' - - php: '7.3' - moodle-branch: 'MOODLE_311_STABLE' - database: 'pgsql' - - services: - postgres: - image: postgres:13 - env: - POSTGRES_USER: 'postgres' - POSTGRES_HOST_AUTH_METHOD: 'trust' - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 3 - ports: - - 5432:5432 - - mariadb: - image: mariadb:10 - env: - MYSQL_USER: 'root' - MYSQL_ALLOW_EMPTY_PASSWORD: "true" - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3 - - steps: - - name: Check out out repository code - uses: actions/checkout@v2 - with: - path: plugin - - - name: Setup PHP ${{ matrix.php }} - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: ${{ matrix.extensions }} - ini-values: max_input_vars=5000 - coverage: none - - - name: Initialise moodle-plugin-ci - run: | - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3 - echo $(cd ci/bin; pwd) >> $GITHUB_PATH - echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH - sudo locale-gen en_AU.UTF-8 - echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV - - - name: Install Moodle - run: | - moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1 - env: - DB: ${{ matrix.database }} - MOODLE_BRANCH: ${{ matrix.moodle-branch }} - - - name: PHP Lint - if: ${{ always() }} - run: moodle-plugin-ci phplint - - - name: PHP Copy/Paste Detector - continue-on-error: true # This step will show errors but will not fail. - if: ${{ always() }} - run: moodle-plugin-ci phpcpd - - - name: PHP Mess Detector - if: ${{ always() }} - run: moodle-plugin-ci phpmd - - - name: Moodle Code Checker - if: ${{ always() }} - run: moodle-plugin-ci codechecker --max-warnings 0 - - - name: Moodle PHPDoc Checker - continue-on-error: true # This step will show errors but will not fail. - if: ${{ always() }} - run: moodle-plugin-ci phpdoc - - - name: Validating - if: ${{ always() }} - run: moodle-plugin-ci validate - - - name: Check upgrade savepoints - if: ${{ always() }} - run: moodle-plugin-ci savepoints - - - name: Mustache Lint - if: ${{ always() }} - run: moodle-plugin-ci mustache - - - name: Grunt - if: ${{ matrix.moodle-branch == 'MOODLE_400_STABLE' }} - run: moodle-plugin-ci grunt --max-lint-warnings 0 - - - name: PHPUnit tests - if: ${{ always() }} - run: moodle-plugin-ci phpunit --fail-on-warning - - - name: Behat features - if: ${{ always() }} - run: moodle-plugin-ci behat --profile chrome diff --git a/question/type/ordering/.travis.yml b/question/type/ordering/.travis.yml deleted file mode 100644 index 1e678968213..00000000000 --- a/question/type/ordering/.travis.yml +++ /dev/null @@ -1,72 +0,0 @@ -language: php - -sudo: required - -addons: - firefox: "47.0.1" - postgresql: "9.4" - apt: - packages: - - oracle-java8-installer - - oracle-java8-set-default - - chromium-chromedriver - -cache: - directories: - - $HOME/.composer/cache - - $HOME/.npm - -matrix: - include: - - php: 7.2 - env: - - MOODLE_BRANCH=master - - DB=mysqli - - - php: 7.1 - env: - - MOODLE_BRANCH=MOODLE_36_STABLE - - DB=pgsql - - - php: 7.2 - env: - - MOODLE_BRANCH=MOODLE_35_STABLE - - DB=mysqli - - - php: 7.1 - env: - - MOODLE_BRANCH=MOODLE_34_STABLE - - DB=pgsql - - - php: 7.0 - env: - - MOODLE_BRANCH=MOODLE_33_STABLE - - DB=mysqli - - - php: 5.6 - env: - - MOODLE_BRANCH=MOODLE_32_STABLE - - DB=pgsql - -before_install: -- phpenv config-rm xdebug.ini -- nvm install 8.9 -- nvm use 8.9 -- cd ../.. -- composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2 -- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" - -install: -- moodle-plugin-ci install - -script: -- moodle-plugin-ci phplint -# - moodle-plugin-ci phpcpd -# - moodle-plugin-ci phpmd -- moodle-plugin-ci codechecker || true # report issues, but don't fail the build. -- moodle-plugin-ci validate -- moodle-plugin-ci savepoints -- moodle-plugin-ci mustache -- moodle-plugin-ci grunt || true # report issues, but don't fail the build. -- moodle-plugin-ci phpunit -- moodle-plugin-ci behat --profile chrome diff --git a/question/type/ordering/CHANGES.txt b/question/type/ordering/CHANGES.txt deleted file mode 100644 index 6e92515b3e6..00000000000 --- a/question/type/ordering/CHANGES.txt +++ /dev/null @@ -1,415 +0,0 @@ -======================================== -Change log for qtype_ordering -======================================== - -2023-09-29 (10) - - small fix to download URLs in readme.txt - -2023-05-31 (08) - - * Fix Behat failure following button change in Moodle master branch - -2023-04-29 (07) - - Co-authored-by: Anupama Sarjoshi - -2022-09-27 (07) - - This version works with Moodle 4.0, 4.1 and 4.2. - - New option to tell students how many choices were right, as part of the automatic feedback. - - Fixed some bugs with the layout of horizontal ordering questions. - -2022-07-08 (06) - - optimize code to ensure that recorded responses are no longer than 100 bytes. - -2021-09-14 (04) - - modify markdown syntax for long help messages (for compatability with Moodle 3.11) - -2021-06-13 (03) - - fix Issue #63. Restore missing method 'set_default_value()' - -2021-06-09 (02) - - add message to CHANGES.txt - -2021-06-09 (02) - - in edit form, rename 'get_default_value()' method to 'get_my_default_value()' for compatability with Moodle >= 3.10 - -2021-06-08 (01) - - modify declaration of parameters accepted by get_default_value method in the edit form - -2019-12-14 (00) - - Thanks Tim Hunt: (1) Update Behat tests to use the MDL-66821 changes (2) Fix Behat test that was failing - - Thanks HuongNV13: (1) Items crash together horizontally (2) Number/letter no longer tracks with dragged item - -2019-12-12 (98) - - fix JS error on Moodle >= 3.7 caused by incorrect syntax in 'define' statement in key_codes.js - -2019-10-24 (96) - - standardize layout and spelling in CHANGES.txt - -2019-10-06 (94) - - fix behavior in Adaptive mode, with 'Whether correct' review option enabled - -2019-07-31 (93) - - (github-issue #43 and #44): rename upper case numberstyles to ABCD and IIII in order to - differentiate from lower case styles on DBs, such as MySQL, which use case insensitive indexes. - -2019-07-12 (92) - - rename 'answernumbering' to 'numberingstyle' and include this field in import/export of xml/gift formats. - -2019-07-11 (91) - - intermittent commit to rename answeringnumbering to numberingstyle - -2019-07-11 (90) - - Qtype_ordering: Numbering for lists (123.., abc...) (#42) Thanks Mahmoud. Great job! - -2019-03-06 (89) - - fix URL of secondary zip download site - -2019-03-06 (89) - - fix small typo in behat test file - -2019-03-06 (88) - - fix small typo in language file and optimize logic in form validation - -2019-03-05 (87) - - Qtype ordering should not allow duplicatue items (#40) - Thank you Mahmoud Kassaei for your continuing work to improve the Ordering question type - -2019-02-19 (86) - - small fix to spelling and whitespace - -2019-02-19 (86) - - qtype_ordering: Ordering codechecker (#39) - * Code checker issues on edit_ordering_form.php *function question_register_questiontype() not needed in questiontype.php - * Code checker issues in questiontype.php - * Code checker issues in question.php - * Code checker issues in renderer.php - * Code checker issues in version.php - -2019-02-08 (85) - - Merge pull request #38 from mkassaei/ordering_cleanup Ordering cleanup - thanks Mahmoud Kassaei! - -2019-01-25 (84) - - remove deprecated jquery folder and amd/*.js files - -2019-01-25 (84) - - Merge pull request #37 from timhunt/qtype-ordering-js-css New JavaScript implementation - - many thanks to Tim Hunt and Mahmoud Kassei of Open University - -2019-01-08 (83) - - add showgrading field to backup file - -2018-12-26 (82) - - restore accidentally removed settings.php - -2018-12-26 (82) - - (readme.txt) added credits for recent improvements: Thanks to Tim Hunt, Mahmoud Kassaei, and Dominique Bauer - -2018-12-22 (81) - - fix Github issue #36: remove contenteditable from LI element, and instead attach to ancestor element in DOM - -2018-12-22 (80) - - fix Github issue #36: draggable items become stuck to cursor when logged as student in Boost theme on Moodle 3.6 - -2018-12-21 (79) - - improve logic and of code to get_subset and code to add repeated elements to form - -2018-12-15 (78) - - fix Github issue #35: Clicking Add to add items more than once without saving the question - in between has incorrect and unwanted behavior - -2018-12-12 (77) - - rename variables to improve readability of loop that detects ordered subsets - -2018-12-12 (77) - - optimize code and comments in loop to detect ordered subsets - - Merge pull request #34 from timhunt/walkthrough-unit-test Unit tests of the question as a whole - Thanks to Tim Hunt - -2018-12-11 (76) - - fix detection of longest ordered/contiguous subset grading type - -2018-11-29 (75) - - fix detection of longest ordered/contiguous subset grading type - - fix detection of Longest ordered/contiguous subset where two or more such subsets exist - - Merge pull request #32 from timhunt/response-analysis Response analysis - many thank Tim Hunt - - fix detection of Longest ordered/contiguous subset where two or more such subsets exist - -2018-11-26 (74) - - fix indexing of items when "Item selection type" is "Select a contiguous subset of items". - The incorrect indexing resulted in less than the exptected number of items being displayed. - -2018-11-19 (73) - - update version.php for recent BEHAT modifications - -2018-11-01 (72) - - added new setting to specify number of new draggable items to be added to a question - -2018-06-29 (71) - - ensure get_possible_responses does not fail even if there is no correct response - -2018-06-18 (70) - - add standard syntax for ::name:: in improve export/import of GIFT format - -2018-05-24 (69) - - fix import of GIFT text files - -2018-01-17 (68) - - improvements for compatability with AMD in Moodle >= 2.9. Many thanks to Jakob Ackermann (github.com/jacac) - -2018-01-16 (67) - - improvements for compatability with AMD in Moodle >= 2.9. Many thanks to Jakob Ackermann (github.com/jacac) - -2017-11-23 (66) - - recognize RELATIVE_TO_CORRECT in gift import file - -2017-11-22 (65) - - fix issue in Moodle 3.4 in which sorted order is not returned to server for processing - -2017-08-01 (64) - - release new grading method: relative to correct - thanks to Anatoliy Markiv and Kings College London, UK - -2017-07-25 (63) - - fix score calculation for individual items on RELATIVE_TO_CORRET grading method - -2017-07-22 (62) - - refine scoring on relative-to-correct grading method - -2017-07-21 (61) - - add preliminary version of new grading type: RELATIVE_TO_CORRECT - -2017-07-01 (60) - - return result from 'summarize_response' for use in 'Technical information' and Response report - -2017-05-08 (59) - - restore functionality on Moodle 2.0 - -2017-04-26 (58) - - fix display of images in feedback and explanatino of correct response - -2016-10-26 (57) - - small improvements to the wording in a couple of code comments - - imrpove code readability when setting flags to pass to methods to retrieve/check answers - -2016-10-26 (56) - - fix behavior of Ordering question when the quiz is in adaptive mode (with or without penalties) - -2016-08-16 (55) - - add new option to SHOW/HIDE score calculations when a student reviews a response to an Ordering qusetion - -2016-05-11 (54) - - added development history and credits to the readme.txt file - - added development history and credits to the readme.txt file - -2016-05-11 (53) - - added development history and credits to the readme.txt file - - merge Vadim's PULL request for phpdocs and code style - -2016-05-03 (53) - - improve commenting and add failsafe 'default' block to 'switch' statement - -2016-05-02 (52) - - add missing settings.php from recent merge - -2016-05-02 (51) - - allow images in backup/restore of ordering questions - thanks vadimonus \! - -2016-04-27 (50) - - fix grade calculation for LONGEST_CONTIGUOUS_SUBSET when longest subset starts in a middle position - -2016-03-29 (49) - - force standard settings for Ordering questions used by Reader quizzes - -2016-03-29 (48) - - force standard settings for Ordering questions used by Reader quizzes - -2016-03-29 (47) - - force standard settings for Ordering questions used by Reader quizzes - -2016-03-28 (46) - - make default selection type 'random' - -2016-02-24 (45) - - set default layout to VERTICAL when importing from GIFT or XML file - -2016-02-24 (44) - - replace numeric literals with class constants to represent grading methog values - -2016-02-24 (43) - - improve correctness report for incorrect respones in ALL_OR_NOTHING grading type - -2016-02-24 (42) - - add new grading method: ALL_OR_NOTHING - -2016-02-24 (41) - - fix export/import of gradingtype for Ordering questions - -2016-01-23 (40) - - add new grading type: LONGEST_CONTIGUOUS_SUBSET - -2016-01-11 (39) - - add new gradetype: LONGEST_ORDERED_SUBSET - -2016-01-02 (38) - - fix display of number when showing correct order of items in a horizontal list - -2016-01-02 (37) - - fix handling of unscored items in grading details during review of question attempt - - fix handling of unscored items in grading details during review of question attempt - -2016-01-01 (36) - - fix grade calculation for RELATIVE_ONE_PREVIOUS_AND_NEXT and RELATIVE_ALL_PREVIOUS_AND_NEXT, - and add grade/score details for less than perfect grades - -2015-12-31 (35) - - finish implementation of new setting, gradingtype, to allow different grading methods for ordering questions - -2015-11-23 (33) - - fix errors creating new question on Moodle 3.0 - -2015-11-18 (32) - - fix errors related to html editors when creating new Ordering questions - -2015-11-18 (31) - - allow full HTML editors on answers in order to allow images and pictures - -2015-11-15 (30) - - increase padding of draggable elements to allow easier dropping in first and last positions - -2015-11-14 (29) - - remove duplicate code and unnecessary comments from legacy/questionlib for Moodle 2.0 - - fix display and state storage of Moodle 2.0 - -2015-11-13 (28) - - mod/reader small fixes for Moodle 2.0 - -2015-11-11 (27) - - fix missing vairable DB in Moodle 2.0 - - remove excess vertical white space below sortable list DIV - -2015-11-09 (26) - - add interactive settings to question creation form - -2015-11-07 (25) - - add horizontal layout, and fix feedback fieds on import from xml and gift formats - -2015-07-31 (24) - - remove unnecessary stripslashes when formatting question text - -2015-07-13 (23) - - change CSS draggable item width to 80% instead of fixed 360px in order to improve display on small screens - -2015-02-21 (22) - - fix restoring or options in ordering questions - -2015-02-21 (21) - - fix restoring or options in ordering questions - - fix restoring or options in ordering questions - -2015-02-15 (20) - - ensure JQuery is high enough version to allow drag-and-drop when Quiz is in a popup window - - ensure JQuery is high enough version to allow drag-and-drop when Quiz is in a popup window - -2015-02-05 (19) - - fix restore error message about missing table: (should be qtype_ordering_options) - -2015-01-30 (18) - - cater for missing data about responses when reviewing an attempt at an Ordering question - -2015-01-24 (17) - - fix "undefined index" error when viewing results for old ordering attempts which have no reponse details - -2015-01-23 (16) - - fix error upgrading when there are duplicate questionids in qtype_ordering_options table - -2015-01-19 (15) - - fix installation error: Key column 'question' doesn't exist in table - -2015-01-17 (14) - - reliminary code to get implement questiontypebase.php on Moodle 2.0 - - remember ordering question state when moving between pages in a quiz - -2015-01-17 (13) - - remember ordering question state when moving between pages in a quiz - -2015-01-17 (13) - - remember ordering question state when moving between pages in a quiz - -2015-01-17 (12) - - remember ordering question state when moving between pages in a quiz - -2015-01-17 (11) - - remember ordering question state when moving between pages in a quiz - -2015-01-14 (10) - - improve display of reviously stored response in incomplete attempts - - fix typo in ordering/question.php - -2015-01-14 (09) - - fix compatibility of feedback fields in Moodle 2.0 - -2015-01-14 (08) - - use standard methods to add feedback in edit form - -2014-12-19 (07) - - allow images to embedded in question text and feedback - -2014-12-08 (06) - - rename 'jquery.ui.touch-punch.js' to 'jquery-ui.touch-punch.js' - -2014-12-04 (05) - - try a few improvements for Moodle 2.0 - - small improvement to code that accesses $SESSION values - -2014-12-04 (05) - - replace use of $_SESSION variable with Moodle's $SESSION array - - replace use of $_SESSION variable with Moodle's $SESSION array - - restrict scope of css on ordering question - - fix upgrade script to check for existence of reader_question_instances before attempting to acces sit - - improve compatability with Moodle 2.0 - - use Moodle's standard jquery libraries in Moodle >= 2.5 - -2014-11-30 (03) - - update to latest version of JQuery (11.1) and add mouse-punch to handle drag-drop events on touchscreens - - update to latest version of JQuery (11.1) and add mouse-punch to handle drag-drop events on touchscreens - -2014-07-26 (02) - - always show correct answer in review mode - - fix display of correct/wrong items for question review - - fix display of correct/wrong items for question review - - fix display of correct/wrong items for question review - -2014-05-14 (01) - - fix display of correct/wrong items for question review - - fix display of correct/wrong items for question review - - add method to intialize new ordering question - - half fix for delays and cheating - - fix undefined passwordsaltmain in Moodle >= 2.6 - -2013-06-28 (00) - - standardize version.php and add readme.txt - -2013-06-28 (00) - - standardize version.php and add readme.txt - - replace __DIR__ with dirname(__FILE__) for compatability with PHP 5.2 - - fix REFTABLE 'questions' -> 'question' in db/install.xml - - add print_question_formulation_and_controls method required to display ordering questions in Moodle 2.0 - - add print_question_formulation_and_controls method required to display ordering questions in Moodle 2.0 - - use standard message to report DB insert/update errors - - use standard message to report DB insert/update errors - - fix any badly formed ordering questions that were added by earlier versions of GIFT/XML import - - fix error 'logical cannot be NULL' when importing from GIFT file - - add import/export GIFT/XML - - increment version number to be instep with Reader module - - remove debug statements which caused scoring of ordering questions to be lower than it should be - - use md5 instead of fraction field as id in ordering questions - - add first attempt at backup/restore - - tidy up and optimze javascript - - tidy up and optimze javascript - - tidy up and optimze javascript - - remove unnecessary print_r statement, and and tidy up some whitespace - - fix cvs/git/svn ignore files - - fix cvs/git/svn ignore files - - add cvs/git/svn ignore files - - add strings and classes required by Moodle 2.0 - - fix undefined question_type on Moodle 2.0 - - add new plugin strings required by Moodle 2.3 - - question/type/ordering: add plugin strings required for Moodle 2.3 - - add reader module for Moodle 2.x diff --git a/question/type/ordering/classes/output/formulation_and_controls.php b/question/type/ordering/classes/output/formulation_and_controls.php index a50ec89441e..195fdaa5fb3 100644 --- a/question/type/ordering/classes/output/formulation_and_controls.php +++ b/question/type/ordering/classes/output/formulation_and_controls.php @@ -35,6 +35,7 @@ class formulation_and_controls extends renderable_base { * The class constructor. * * @param question_attempt $qa The question attempt object. + * @param question_display_options $options The question options. */ public function __construct(question_attempt $qa, question_display_options $options) { $this->options = $options; diff --git a/question/type/ordering/classes/question_hint_ordering.php b/question/type/ordering/classes/question_hint_ordering.php index 2f7a56cd26b..2f40a849062 100644 --- a/question/type/ordering/classes/question_hint_ordering.php +++ b/question/type/ordering/classes/question_hint_ordering.php @@ -14,13 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * Question hint for ordering. - * - * @package qtype_ordering - * @copyright 2021 The Open University - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ namespace qtype_ordering; use question_display_options; @@ -38,7 +31,7 @@ use question_hint_with_parts; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class question_hint_ordering extends question_hint_with_parts { - /** Highlight response in the hint options. */ + /** @var bool $highlightresponse Highlight response in the hint options. */ public bool $highlightresponse; /** diff --git a/question/type/ordering/db/install.xml b/question/type/ordering/db/install.xml index fe4a49a9b0f..e25198ab655 100644 --- a/question/type/ordering/db/install.xml +++ b/question/type/ordering/db/install.xml @@ -1,5 +1,8 @@ - + diff --git a/question/type/ordering/question.php b/question/type/ordering/question.php index 1fff8da6e91..5d8df10995f 100644 --- a/question/type/ordering/question.php +++ b/question/type/ordering/question.php @@ -14,20 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * Ordering question definition classes. - * - * @package qtype_ordering - * - * @copyright 2013 Gordon Bateson (gordon.bateson@gmail.com) - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -// Prevent direct access to this script. - /** * Represents an ordering question. * + * @package qtype_ordering * @copyright 2013 Gordon Bateson (gordon.bateson@gmail.com) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ @@ -196,6 +186,15 @@ class qtype_ordering_question extends question_graded_automatically { $this->correctresponse = array_filter(explode(',', $step->get_qt_var('_correctresponse'))); } + /** + * When a question is updated to a new version, this method is called to + * check whether the question can be regraded with the new version. + * + * @param question_definition $otherversion The new version of the question. + * @return string|null If the question can be regraded, this method should return null. + * If the question cannot be regraded, this method should return a string + * explaining why not. + */ public function validate_can_regrade_with_other_version(question_definition $otherversion): ?string { $basemessage = parent::validate_can_regrade_with_other_version($otherversion); if ($basemessage) { @@ -209,6 +208,17 @@ class qtype_ordering_question extends question_graded_automatically { return null; } + /** + * Update the attempt state data for a new version of the question. + * + * This method is called when a question is updated to a new version, and + * the question_attempt_step data needs to be updated to reflect the new + * version of the question. + * + * @param question_attempt_step $oldstep The step data for the old version of the question. + * @param question_definition $otherversion The new version of the question. + * @return array An array of key-value pairs to be merged into the step data. + */ public function update_attempt_state_data_for_new_version( question_attempt_step $oldstep, question_definition $otherversion) { parent::update_attempt_state_data_for_new_version($oldstep, $otherversion); diff --git a/question/type/ordering/questiontype.php b/question/type/ordering/questiontype.php index 35b79da86e9..32a6a06c777 100644 --- a/question/type/ordering/questiontype.php +++ b/question/type/ordering/questiontype.php @@ -14,19 +14,12 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * The questiontype class for the multiple choice question type. - * - * @package qtype_ordering - * @copyright 2013 Gordon Bateson (gordon.bateson@gmail.com) - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - use qtype_ordering\question_hint_ordering; /** * The ordering question type. * + * @package qtype_ordering * @copyright 2013 Gordon Bateson (gordon.bateson@gmail.com) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ @@ -793,9 +786,9 @@ class qtype_ordering extends question_type { /** * Fix empty or long question name * - * @param string $name - * @param string $defaultname (optional, default='') - * @param integer $maxnamelength (optional, default=42) + * @param string $name The name of the question + * @param string $defaultname (optional, default='') The default name of the question + * @param integer $maxnamelength (optional, default=42) The maximum length of the name * @return string Fixed name */ public function fix_questionname(string $name, string $defaultname = '', int $maxnamelength = 42): string { diff --git a/question/type/ordering/readme.txt b/question/type/ordering/readme.txt deleted file mode 100644 index 992ff9db6e0..00000000000 --- a/question/type/ordering/readme.txt +++ /dev/null @@ -1,71 +0,0 @@ -============================================= -The Ordering question type for Moodle >= 3.11 -============================================= - -The ordering question type displays several items in a random order -which the user then drags into the correct sequential order. - - * an ordering question can display all items or a subset of items - - * items can be plain text or formatted HTML, including text, - images, audio and video. - - * items can be listed vertically or horizontally - - * several grading methods are available, ranging from a simple - all-or-nothing grade, to more complex partial grades that - consider the placement of each item relative to other items - -============================================ -To INSTALL or UPDATE this plugin -============================================ - - 1. get the files for this plugin from any one of the following locations: - - (a) GIT: https://github.com/gbateson/moodle-qtype_ordering.git - (b) zip: the Moodle.org -> Plugins repository (search for Ordering) - (c) zip: https://bateson.kochi-tech.ac.jp/zip/plugins_qtype_ordering.zip - - If you are installing from a zip file, unzip the zip file, to create a folder - called "ordering" and upload or move this folder into the "question/type" folder - on your Moodle >= 2.9 site, to create a new folder at "question/type/ordering". - - 2. log in to Moodle as administrator to initiate install/upgrade - - if install/upgrade does not begin automatically, you can initiate it manually - by navigating to the following link: - Settings -> Site administration -> Notifications - -============================================ -Further information -============================================ - - For more information, tutorials and online discussion forums, please visit: - http://moodlereader.org/ - - -============================================ -Development history and credits -============================================ - -This plugin was originally developed by Thomas Robb (Kyoto Sangyo University, Japan) -and Serafim Panov for the ordering questions in the Reader activity module for Moodle 1.x. - -Moodle 2.x development was passed to Gordon Bateson (Kochi University of Technology, Japan) -funded by the Moodle Association of Japan, with partial funding from Sapporo Gakuin University. - -Coding enhancements and standardization in preparation for future merging into Moodle core -were undertaken by Vadim Dvorovenko (Kemerovo State University of Culture and Arts, Russia). - -Development of "relative to correct" grading method commissioned by Anatoliy Markiv and -sponsored by Kings College London, UK. - -Code for privacy, automatic testing, keyboard interaction (for accessibility) and -standardization of Javascript to extend standard Moodle's Drag-and_Drop was added -by Tim Hunt and Mahmoud Kassaei of Open University, UK. - -Thanks also to Dominique Bauer (ETS, University of Quebec, Canada) for his help and ideas -in testing the "Item selection type" and "Grading type", particularly the "Longest -ordered/contiguous subset" grading type. - -many thanks to all concerned! diff --git a/question/type/ordering/tests/coverage.php b/question/type/ordering/tests/coverage.php index d40a9126f94..ac3bc97e5a5 100644 --- a/question/type/ordering/tests/coverage.php +++ b/question/type/ordering/tests/coverage.php @@ -19,6 +19,7 @@ defined('MOODLE_INTERNAL') || die(); /** * Coverage information for the qtype_ordering subsystem. * + * @package qtype_ordering * @copyright 2023 Mathew May * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/question/type/ordering/version.php b/question/type/ordering/version.php index 52320bc02ae..11f7551bec4 100644 --- a/question/type/ordering/version.php +++ b/question/type/ordering/version.php @@ -25,8 +25,6 @@ // Prevent direct access to this script. defined('MOODLE_INTERNAL') || die(); -$plugin->cron = 0; $plugin->component = 'qtype_ordering'; -$plugin->maturity = MATURITY_STABLE; $plugin->requires = 2021051700; // Moodle 3.11. $plugin->version = 2024040401; // The current plugin version (Date: YYYYMMDDXX).