2135 Commits

Author SHA1 Message Date
Tim Hunt
453022307e MDL-34483 qformat_examview: Commit example file.
Supplied by Rick Jerz.
2012-07-30 11:57:36 +01:00
Jean-Michel Vedrine
3a24ae8b17 MDL-34483 qformat_examview: handle more questions.
These fixes come from testing with the example file supplied by Rick
Jerz.
2012-07-27 12:13:38 +01:00
Jean-Michel Vedrine
9c3afc5bb6 MDL-34483 qformat_examview: clean the code to make codechecker happy 2012-07-26 18:54:31 +01:00
Jean-Michel Vedrine
2562c138ec MDL-34483 qformat_examview: changes required to make it basically work. 2012-07-26 18:54:30 +01:00
Frederic Massart
21c08c63ca MDL-34458 Librairies: Replaced deprecated get_context_instance() 2012-07-24 16:58:17 +08:00
Dan Poltawski
5082d87c03 Merge branch 'wip-mdl-32940' of git://github.com/rajeshtaneja/moodle 2012-07-24 13:39:59 +08:00
Aparup Banerjee
acb88dbed3 Merge branch 'wip-mdl-32942' of git://github.com/rajeshtaneja/moodle 2012-07-24 12:14:17 +08:00
Rajesh Taneja
61cca0b7fc MDL-32940 libraries: Replaced deprecated PARAM_NUMBER with PARAM_FLOAT 2012-07-23 17:21:05 +08:00
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
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
Conflicts:
	mod/assign/version.php
2012-06-18 16:08:39 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
130aed6e7e MDL-33794 version.php: Fix some missing bits before bump. 2012-06-17 19:29:44 +02:00
Tim Hunt
ba6425ab3d MDL-33779 question: code clean-up 2012-06-15 14:02:15 +01:00
Marina Glancy
c469b3963b MDL-33446 Editor form field can filter return types
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
2012-06-12 11:03:43 +08:00
Aparup Banerjee
42fd396171 Merge branch 'MDL-33548' of git://github.com/timhunt/moodle 2012-06-11 13:55:20 +08:00
Dan Poltawski
55244f8527 Merge branch 'MDL-33577' of git://github.com/timhunt/moodle 2012-06-07 23:15:45 +08:00
Tim Hunt
b84477000a MDL-33577 qtype_multianswer: Fix strict syntax warning. 2012-06-07 12:32:41 +01:00
Tim Hunt
ee326d5e7d MDL-33548 quiz manual grading: check the grade is in range.
To do this nicely, I refactored some code out of the quiz manual grading
report.
2012-06-06 20:21:33 +01:00
Marina Glancy
2aad62e93c MDL-33467 fixed variable name conflict 2012-06-06 11:17:07 +01:00
Dan Poltawski
995e479067 Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle 2012-05-28 15:43:33 +08:00
Dan Poltawski
830fdc8ce8 Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle 2012-05-28 15:37:31 +08:00
Dan Poltawski
ffec9bc70f Merge branch 'MDL-31393' of git://github.com/timhunt/moodle 2012-05-28 15:23:01 +08:00
Marina Glancy
4c2fcbfc85 MDL-33338 recognising the mimetype for uploaded files
- when file is uploaded in php, the tmpname does not have initial extension and mimetype recognition by extension fails
- another issue is that import form for questions fails with fatal error when it should just say that field is required
2012-05-28 15:19:41 +08:00
Marina Glancy
6adb5f1363 MDL-33356 fixed a regression after function form_filemanager_redner() was deleted 2012-05-28 13:52:32 +08:00
Dan Poltawski
8119141b91 Merge branch 'MDL-33020' of git://github.com/timhunt/moodle 2012-05-25 10:14:17 +08:00