L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,847 Commits 38 Branches 564 Tags
6830ae12c7d6101edc62987fcabe825252ab7bfc
Commit Graph

3817 Commits

Author SHA1 Message Date
Dan Poltawski 4f22bcbc41 Merge branch 'MDL-34066' of git://github.com/timhunt/moodle 2012-07-23 14:54:46 +08:00
Dan Poltawski 3fb8128fb6 Merge branch 'MDL-34251' of git://github.com/timhunt/moodle 2012-07-23 14:01:59 +08:00
Dan Poltawski bdaff201bb Merge branch 'MDL-34226' of git://github.com/timhunt/moodle 2012-07-23 13:53:46 +08:00
Dan Poltawski a5c8e33122 Merge branch 'wip-mdl-32945' of git://github.com/rajeshtaneja/moodle 2012-07-23 13:35:24 +08:00
Dan Poltawski ed25f64642 Merge branch 'wip-mdl-30651' of git://github.com/rajeshtaneja/moodle 2012-07-23 11:22:06 +08:00
Petr Škoda c8b3346cfd MDL-33180 delete the last traces of SimpleTest - ciao and thanks 2012-07-21 10:11:50 +02:00
Tim Hunt dd7aa58386 MDL-34251 question engine: possible infinite loop loading usages 
In the case where either a question_attempt had not steps, or a
question_usage had not question_attempts, the load_from_records methods
could get stuck in an infinite loop.

This fix ensures that does not happen, with unit tests to verify it. At
the same time, I noticed an error in the existing tests, which this
patch fixes.
 2012-07-19 12:51:00 +01:00
Tim Hunt be1d8ed194 MDL-34226 multianswer qtype: basic unit test. 
This verifies the previous fix, and gets rid of a rather embarassing TODO.
 2012-07-19 12:50:47 +01:00
Tim Hunt c0a912e5ac MDL-34226 multichoice qtype: correct is_complete_response for multianswer 
The multianswer qtype uses the multi-choice one, and the way it does its
responses array breaks an assumption that multi-choice was making.
 2012-07-19 12:50:47 +01:00
Tim Hunt a3e6ad77d2 MDL-34066 adaptive behaviour: refactor logic out of renderer. 
These changes move the logic to the behaviour class, which is how things
should be.

It also makes it easier to re-use the code that displays the messages
like "Marks for this submission: 1.00/1.00. Accounting for previous
tries, this gives 0.33/1.00." in other places.

To try to make it clearer what is going on, I introduced a new class
qbehaviour_adaptive_mark_details to hold and document the data that the
behaviour needs to return, and the renderer can base its display on.

As far as my testing can tell (and there are new unit tests), this
commit does not change the existing behaviour.

This commit also replaces all the string concatenation that is going on,
which should help translators. At the moment, a few of the old strings
are still in the language file, and are used in the unit tests to verify
that the behaviour has not changed.

Thanks to Oleg Sychev for making a helpful suggestion about the API.
 2012-07-19 12:50:17 +01:00
Rajesh Taneja 405aca3532 MDL-32942 libraries: Replaced deprecated PARAM_ACTION and PARAM_FORMAT with PARAM_ALPHANUMEXT 2012-07-19 15:46:10 +08:00
Rajesh Taneja 071e68f93e MDL-32945 libraries: Replaced deprecated PARAM_MULTILANG with PARAM_TEXT 2012-07-19 15:44:40 +08:00
Rajesh Taneja 1e12c1203b MDL-30651 libraries: Replaced deprecated PARAM_INTEGER with PARAM_INT 2012-07-19 15:37:46 +08:00
Dan Poltawski 7e867bb39f Merge branch 'MDL-26587' of git://github.com/nebgor/moodle 2012-07-16 15:50:44 +08:00
Aparup Banerjee 4b92f65351 MDL-26587 Question : fixed restoring shortanswer where answers are missing due to data error in mbz file. 2012-07-11 13:41:00 +08:00
Dan Poltawski c4f48b552f Merge branch 'MDL-34171' of git://github.com/timhunt/moodle 2012-07-10 09:24:56 +08:00
Tim Hunt 05038fcba0 MDL-34065 questions: also fix two typos in comments. 
Amended to change 2 accordin => according
 2012-07-05 13:49:05 +02:00
Tim Hunt d9299c349e MDL-34171 qformat_gift: Fix edge case with special character escaping. 
We need to escape \ on export, because it is un-escaped on import.
 2012-07-04 10:55:52 +01:00
Tim Hunt bf92acc253 MDL-32062 question engine: fixup tests that this change broke. 
The test data was wrong, and was triggering the work-around code that
MDL-32062 introduced. I fixed the test data.

Also, I fixed one of the tests, that had been broken.
 2012-07-04 10:47:03 +01:00
Sam Hemelryk 74abe5ce15 Merge branch 'MDL-32062' of git://github.com/timhunt/moodle 2012-07-04 09:54:06 +12:00
Dan Poltawski 7d27947851 Merge branch 'MDL-30883' of git://github.com/timhunt/moodle 2012-07-03 11:01:39 +08:00
Dan Poltawski b8b82c051d Merge branch 'MDL-33780' of git://github.com/timhunt/moodle 2012-07-02 16:07:13 +08:00
Aparup Banerjee 99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Tim Hunt 9212fe7a79 MDL-32062 question engine: fix re-grading attempts from 2.0 
The code to upgrade attempts from before Moodle 2.0 to 2.1 created
attempt data that was not exactly the same as a new attempt created in
2.1+. This did not matter very much - revew and the quiz reports all
worked OK - but it broke on re-grade.

These changes detect the problem data in the re-grade code, an apply a
work-around so that the re-grade gives the correct result.
 2012-06-26 10:11:15 +01:00
Tim Hunt 77c1f1605f MDL-33780 question import: strip UTF8 BOM 
Previously, if there was a byte-order mark at the start of the file, the
import would just break, which was silly. Much better to just strip it
off.
 2012-06-26 09:59:26 +01:00
Tim Hunt f1b3d3e08e MDL-30883 question flags: aria attributes for accessibility 
Also, update code to use html_writer, and fix pointer style when not
editable.
 2012-06-26 09:58:11 +01:00
Tim Hunt 9cc064abf8 MDL-47494 gapselect: Merge remote-tracking branch 'ou/MOODLE_21_STABLE' into MOODLE_22_STABLE 2012-06-21 10:24:40 +01:00
Tim Hunt 857b88d252 MDL-47494 ddwtos: Merge remote-tracking branch 'ou/MOODLE_21_STABLE' into MOODLE_22_STABLE 2012-06-21 10:22:31 +01:00
Jamie Pratt 3505610d11 MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 
Conflicts:
	lib.php
Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes

Conflicts:
	lib.php
 2012-06-21 14:22:00 +07:00
Jamie Pratt b0da01d272 MDL-47494 ddwtos: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 
Conflicts:
	lib.php
Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes

Conflicts:
	lib.php
 2012-06-21 14:21:59 +07:00
Jamie Pratt 5901152a05 MDL-47494 gapselect: NOBUG oops. Forgot to change plug in name inside function 2012-06-21 14:17:27 +07:00
Jamie Pratt 0ac7a9be18 MDL-47494 ddwtos: NOBUG oops. Forgot to change plug in name inside function 2012-06-21 14:17:26 +07:00
Jamie Pratt c48797ac26 MDL-47494 gapselect: NOBUG added extra options param for file access 2012-06-21 14:07:42 +07:00
Jamie Pratt 6ab6252f8a MDL-47494 ddwtos: NOBUG added extra options param for file access 2012-06-21 14:07:41 +07:00
Jamie Pratt 940c0c76cb MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 2012-06-21 13:42:52 +07:00
Jamie Pratt 5de5ae31ee MDL-47494 ddwtos: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 2012-06-21 13:42:44 +07:00
Jamie Pratt db344be62c MDL-47494 ddimageortext: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 2012-06-21 13:40:01 +07:00
Jamie Pratt 0749cc7c30 MDL-47494 ddimageortext: NOBUG fixes for fileaccess through lib.php 
added missing lib.php files and fixed comments
 2012-06-21 12:45:11 +07:00
Jamie Pratt 981f50588d MDL-47494 gapselect: NOBUG fixes for fileaccess through lib.php 
added missing lib.php files and fixed comments
 2012-06-21 12:45:11 +07:00
Jamie Pratt ceb9e80486 MDL-47494 ddwtos: NOBUG fixes for fileaccess through lib.php 
added missing lib.php files and fixed comments
 2012-06-21 12:45:11 +07:00
Tim Hunt 08b47def1f MDL-47494 ddwtos: Merge pull request #4 from jamiepratt/wip_unittestconversions 
NOBUG changed unit tests to use PHPUnit
 2012-06-20 04:21:55 -07:00
Tim Hunt d33e1b6a78 MDL-47494 gapselect: Merge pull request #4 from jamiepratt/wip_unittestconversions 
NOBUG changed unit tests to use PHPUnit
 2012-06-20 04:18:33 -07:00
Tim Hunt 77192cf305 MDL-47494 ddmarker: Merge remote-tracking branch 'jp/wip_unittestconversions' 
Conflicts:
	tests/question_test.php
	tests/questiontype_test.php
	tests/shapes_test.php
	tests/walkthrough_test.php
 2012-06-20 10:54:05 +01:00
Tim Hunt 41db46c6f9 MDL-47494 ddmarker: Merge pull request #7 from jamiepratt/wip_readme 
Wip readme
 2012-06-20 02:46:47 -07:00
Jamie Pratt bd6d6e4a87 MDL-47494 ddmarker: NOBUG change in file access api in 2.3 2012-06-19 20:11:44 +07:00
Jamie Pratt 4c0f4ffe8e MDL-47494 ddimageortext: NOBUG change in file access api in 2.3 2012-06-19 20:11:24 +07:00
Jamie Pratt 0291aa6672 MDL-47494 ddmarker: Merge branch 'wip_readme_2_1' into wip_readme 2012-06-19 19:16:09 +07:00
Jamie Pratt d7423110fd MDL-47494 ddmarker: NOBUG fixing sql for mysql. Thanks to Alain Roussel. 
removed usage of 'drop' keyword as table alias
 2012-06-19 19:14:08 +07:00
Jamie Pratt b3adccfb61 MDL-47494 gapselect: NOBUG changed unit tests to use PHPUnit 2012-06-19 14:55:21 +07:00
Jamie Pratt 543e4deef1 MDL-47494 ddwtos: NOBUG changed unit tests to use PHPUnit 2012-06-19 14:53:53 +07:00