Eloy Lafuente (stronk7)
3bdc10150c
Merge branch 'MDL-28049' of git://github.com/timhunt/moodle
2011-06-27 15:56:03 +02:00
Tim Hunt
19f7bb5b7e
MDL-28049 conditional include so xml question format can work for both lesson and 3rd party qtypes.
...
This is a regression caused by MDL-27956.
2011-06-27 13:59:57 +01:00
Tim Hunt
2779cc7d89
MDL-28033 Fatal error upgrading form 1.9 to 2.1 due to missing include.
2011-06-27 13:43:16 +01:00
Sam Hemelryk
29e2d0a820
Merge branch 'MDL-26199' of git://github.com/timhunt/moodle
2011-06-27 16:03:48 +08:00
Tim Hunt
5cc532e8e9
MDL-28024 adaptive qbehaviour. Displayed penalties not rounded correctly.
2011-06-24 14:26:49 +01:00
Tim Hunt
f19ed874ee
MDL-26199 further changes needed to make the question bank navigation behave.
2011-06-23 07:18:49 +01:00
Eloy Lafuente (stronk7)
4c15bde8f1
Merge branch 'MDL-27948' of git://github.com/timhunt/moodle
2011-06-23 01:14:19 +02:00
Eloy Lafuente (stronk7)
e345969ae2
Merge branch 'MDL-27937' of git://github.com/timhunt/moodle
2011-06-23 00:46:29 +02:00
Eloy Lafuente (stronk7)
e059fa90b1
Merge branch 'MDL-27973' of git://github.com/timhunt/moodle
2011-06-23 00:43:11 +02:00
Eloy Lafuente (stronk7)
4d05c972ea
Merge branch 'MDL-27974' of git://github.com/timhunt/moodle
2011-06-23 00:37:13 +02:00
Eloy Lafuente (stronk7)
a2854474ce
Merge branch 'MDL-27979' of git://github.com/timhunt/moodle
2011-06-23 00:34:03 +02:00
Tim Hunt
da72991636
MDL-27979 Should be an edit link for each question when previewing or reviewing a quiz.
2011-06-22 21:07:40 +01:00
Tim Hunt
eb624cf7e0
MDL-27937 Calculated tolerance field should have the label Tolerance +-
2011-06-22 19:49:39 +01:00
Tim Hunt
35d5f1c28d
MDL-27948 The question engine should use recordsets to load attempt data
...
This should be good for performance (memory usage). It also avoids having to construct a meaningless, unique, first column, which is a pain on MyQSL.
2011-06-22 18:53:15 +01:00
Tim Hunt
ef01d2c8f5
MDL-27973 hopefully fix QTI2 question export.
...
Well, at least fix the most obvious notices.
2011-06-22 15:56:05 +01:00
Tim Hunt
3c78184552
MDL-27974 problems with gift question import/export.
...
Double-escapeing in match export and not initialising combined feedback on import.
Also remove a lot of redundant breaks.
2011-06-22 15:26:34 +01:00
Rajesh Taneja
ba15c346b1
MDL-27956 Lesson - Fixed strings and readquestions scope
2011-06-22 09:11:32 +08:00
Eloy Lafuente (stronk7)
8edbfba909
Merge branch 'MDL-24594_wip' of git://github.com/timhunt/moodle
2011-06-20 12:48:55 +02:00
Sam Hemelryk
8a322fc19b
Merge branch 'MDL-24255' of git://github.com/timhunt/moodle
2011-06-20 15:51:59 +08:00
Sam Hemelryk
8e307054d3
Merge branch 'MDL-27907' of git://github.com/timhunt/moodle
2011-06-20 14:10:41 +08:00
Sam Hemelryk
70e35c4d1d
Merge branch 'MDL-27916' of git://github.com/timhunt/moodle
2011-06-20 13:45:12 +08:00
Tim Hunt
635971c750
MDL-27927 qtype_multianswer remove hard-coded string.
2011-06-19 10:34:39 +01:00
Tim Hunt
928e7d2a33
MDL-27927 Fix invalid HTML in the multianswer editing form.
2011-06-19 10:27:24 +01:00
Tim Hunt
2d6829727d
MDL-24255 Use the proper editor element for manual grading comments.
...
It would be nice if someone imporoved the API for using the HTML editor outside formslib.
2011-06-18 21:15:40 +01:00
Tim Hunt
88ef9d0b2b
MDL-27916 Question state was described wrongly in adaptive and immediate feedback behaviours.
2011-06-18 13:29:39 +01:00
Tim Hunt
fb17f129a3
MDL-27907 calculated* editing form inheritance mix up.
...
Lead to duplicate fields appearing on the editing forms.
2011-06-18 12:53:32 +01:00
Tim Hunt
35c9b65274
MDL-24594 Fix some issues with the display of HTML choices.
...
The most significant issue is that the HTML editor alwasy wraps <p> tags round the input, but that is not appropriate for the choices. It is especially not appropriate because we want to display the choices in a <lable> for accessibility and usability reasons. In valid HTML label can only contain inline elemnts. Therefore, I introduced a make_html_inline method, with a minimal implementation. (It could be improved in future.)
Long term, I think the best option would be a new form field type, editorinline, or something like that. That would be a smaller version of TinyMCE that only lets you enter inline elements.
2011-06-17 18:41:15 +01:00
ppichet
2a6c5c52ee
MDL-24594 qtype_multichoice should allow images in the choices.
...
This change was massively re-worked by Tim Hunt to update Pierre Pichet's original patch for Moodle 2.0 to work in Moodle 2.1.
2011-06-17 18:41:13 +01:00
Eloy Lafuente (stronk7)
fd8f24dba8
Merge branch 'MDL-27869' of git://github.com/timhunt/moodle
2011-06-17 18:32:00 +02:00
Eloy Lafuente (stronk7)
faf1f957ac
Merge branch 'MDL-27490' of git://github.com/timhunt/moodle
2011-06-17 17:24:51 +02:00
Tim Hunt
fde4560dae
MDL-27490 Implement a manage question behaviours admin page
...
While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.
AMOS BEGIN
MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
MOV [deletingqtype,admin],[deletingqtype,question]
MOV [numquestions,admin],[numquestions,question]
MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END
2011-06-17 16:21:32 +01:00
Eloy Lafuente (stronk7)
3c158ff95e
Merge branch 'MDL-27868' of git://github.com/timhunt/moodle
2011-06-17 16:45:30 +02:00
Tim Hunt
5cf69d7ff5
MDL-27868 Hints (and some other things) lost when re-editing calculated* questions.
2011-06-17 15:42:03 +01:00
Eloy Lafuente (stronk7)
5df6b3c87e
Merge branch 'MDL-27877' of git://github.com/timhunt/moodle
2011-06-17 15:32:10 +02:00
Tim Hunt
5f79a9bcb6
MDL-27898 fix question/engine/simpletest/testdatalib.php unit tests.
...
Now that MDL-27897 is fixed.
2011-06-17 11:28:05 +01:00
Tim Hunt
03b2b8fa29
MDL-27869 Fix images in numerical and calculated questions.
...
Also fix an embarassing TODO in multianswer quetsions.
2011-06-16 18:56:37 +01:00
Tim Hunt
08c458d10f
MDL-27877 question engine progress bars not working.
2011-06-16 18:55:10 +01:00
Eloy Lafuente (stronk7)
192026f6e5
Merge branch 'MDL-27797_fixup' of git://github.com/timhunt/moodle
2011-06-15 18:18:26 +02:00
Tim Hunt
1f1c60c6a7
MDL-27797 supplimental. Fix two minor issues found by Sam H during testing.
2011-06-15 15:38:46 +01:00
Tim Hunt
e6d7658337
MDL-27865 fix editing of calculated* questions.
2011-06-15 12:20:26 +01:00
Eloy Lafuente (stronk7)
31c7fbafa6
Merge branch 'MDL-27797' of git://github.com/timhunt/moodle
2011-06-15 02:00:23 +02:00
Eloy Lafuente (stronk7)
a16e137f21
Merge branch 'MDL-27639_wip' of git://github.com/timhunt/moodle
2011-06-15 01:30:59 +02:00
Eloy Lafuente (stronk7)
ee1235e7af
Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle
2011-06-14 22:38:27 +02:00
Tim Hunt
8a5d05eea8
MDL-27854 qformat_xml fix import/export of essay questions to include the new options.
2011-06-14 17:36:11 +01:00
Tim Hunt
79e25fb456
MDL-27797 fix all the codechecker issues in format_xml
...
After this change, I can still export my test course with one of each question type, and all the unit tests still pass.
2011-06-14 17:06:55 +01:00
Tim Hunt
67b8b40cfa
MDL-27797 fix bugs with Moodle XML export.
2011-06-14 16:34:14 +01:00
Tim Hunt
98a3898efc
MDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1).
...
Also, refactor calculatedmulti restore to avoid duplication.
2011-06-14 15:17:50 +01:00
Tim Hunt
5b64e32645
MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data
2011-06-14 12:11:23 +01:00
Tim Hunt
18ab06bac5
MDL-27639 restore of attempt data from 2.0 - first attempt.
...
This is now at the stage where it mostly appears to work, at lease on
one backup file.
2011-06-14 12:11:19 +01:00
Tim Hunt
cee74600fa
MDL-27839 supply default qtype_essay_options if they are not present in the XML.
2011-06-14 12:10:25 +01:00
