Commit Graph

3817 Commits

Author SHA1 Message Date
Dan Poltawski 2e6aff57e5 Merge branch 'MDL-35404' of git://github.com/timhunt/moodle 2012-12-10 11:36:38 +08:00
Jean-Michel Vedrine 7980a381cc MDL-36243 question->questiontext and question->generalfeedback should always be strings 2012-12-08 14:09:26 +01:00
Tim Hunt 7e252acff1 MDL-36942 xml question import: don't add spaces.
They are not necessary anyway, there is a \n character at the end of
each line.

Thanks to Richard Lobb for fining the problem and how to fix it.
2012-11-30 15:59:11 +00:00
Tim Hunt 6b290a491c MDL-36732 Cloze qtype: review marks should not depend on feedback.
The various review options should be independent.
2012-11-30 15:58:12 +00:00
Tim Hunt 7c86af621e MDL-35404 question export: make it work with slasharguments off.
Thanks to Brian King for working out the problem and how to fix it. I am
just committing his patch.
2012-11-30 11:48:26 +00:00
Dan Poltawski 054124a3ed MDL-36887 quiz: reorder upgrade.txt's 2012-11-30 11:41:01 +08:00
Eloy Lafuente (stronk7) 663dbbc2e6 MDL-36933 Bump everything to 2012112900
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Tim Hunt 6e4a2acf93 MDL-36916 quiz/questions: simplify code after MDL-36638. 2012-11-29 09:28:36 +00:00
Frederic Massart c384744304 MDL-36638 usability: Core changes for new quiz/question icons 2012-11-29 12:41:29 +08:00
Dan Poltawski 513c64c303 Merge branch 'MDL-36806' of git://github.com/timhunt/moodle 2012-11-27 13:26:38 +08:00
Tim Hunt 97f1137a61 MDL-36806 question files: fix unnecessary require_login call.
quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.
2012-11-23 15:54:58 +00:00
Tim Hunt 5f137dcbe2 MDL-36760 formslib: fix frozen elements with [] in name.
This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.

Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.
2012-11-23 10:53:14 +00:00
Dan Poltawski 91b0d0b75a Merge branch 'MDL-36571' of git://github.com/timhunt/moodle 2012-11-20 14:59:34 +08:00
Dan Poltawski 56eaaecfa2 Merge branch 'MDL-32865' of git://github.com/jmvedrine/moodle 2012-11-20 12:05:36 +08:00
Eloy Lafuente (stronk7) 9e3f733f8a Merge branch 'MDL-36683' of git://github.com/timhunt/moodle 2012-11-20 01:33:39 +01:00
Tim Hunt acb9f7f47d MDL-36683 qtype match restore: better subq indentification.
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 17:46:25 +00:00
Tim Hunt 8a7d763c77 MDL-36571 qtype multichoice: don't corrupt unicode characters.
It seems that \s includes non-breaking space, and the typical one-byte
representation of that is the same as some parts of multibyte unicode
characters. Therefore, you need to include the u modifer on the regular
expressions.

Also, remove any number of <br /> at the end of the answer.

Thanks to Joseph Rézeau and Jean-Michel Vedrine for working out what the
problem was, and how to fix it.
2012-11-19 17:21:00 +00:00
Jean-Michel Vedrine bedbfd6dfa MDL-32865 Backwards compatibility, deal with the old image tag 2012-11-17 16:38:03 +01:00
Jean-Michel Vedrine 7c86628de6 MDL-32865 CLOZE Questions imported from another course end up with broken image links 2012-11-17 16:38:02 +01:00
Frederic Massart 06b7ed0a45 MDL-36415 usability: Use new up/down and ordering icons 2012-11-16 12:47:09 +08:00
Dan Poltawski 0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Dan Poltawski f7febae6d0 Merge branch 'MDL-36422-master' of git://github.com/FMCorz/moodle 2012-11-08 11:07:43 +08:00
Frederic Massart eec4107bdd MDL-36422 question: Fixed malformed HTML in manual marking 2012-11-08 10:20:22 +08:00
Sam Hemelryk f3c306f4e0 MDL-21625 question: Fixed phpdocs 2012-11-05 16:29:28 +13:00
Sam Hemelryk 544c455357 Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle 2012-11-05 16:27:43 +13:00
Matt Petro a538cf839e MDL-36025 qtype calculated: Fix handling of "-0" 2012-11-02 11:07:02 -04:00
Sam Hemelryk 41b4e5ec7f Merge branch 'MDL-36076' of git://github.com/timhunt/moodle 2012-10-30 12:59:23 +13:00
Dan Poltawski 506263cfee Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle 2012-10-29 14:59:45 +08:00
Tim Hunt 15dd772736 MDL-34399 questions cleanup: straighten out strange links to question objects. 2012-10-26 11:58:14 +08:00
Tim Hunt a560d636f4 MDL-34399 questions: cache to help load question definitions.
At the moment, it takes several DB queries to load each question definition,
so this cache is potentially a big win.
2012-10-26 11:58:02 +08:00
Nadav Kavalerchik f12117250d MDL-36033 - Left align Numeric value fields in Calculated and Numeric question, when in RTL mode 2012-10-19 10:24:03 +02:00
Rossiani Wijaya d2c9169a4c MDL-21625 Question bank: Add accessibility to table layout for viewing question list 2012-10-19 13:25:52 +08:00
Tim Hunt 16c7457f57 MDL-36076 qtype multichoice: validation fails on '0' answer. 2012-10-17 13:54:45 +08:00
Ankit Agarwal 76b4a3d118 MDL-30845 formslib: Removing persistant true as its not needed anymore 2012-10-15 14:01:47 +08:00
Frederic Massart 588d1b595a MDL-35858 question: Fixed display of feedback in cloze questions 2012-10-09 10:28:21 +08:00
Dan Poltawski ed27ce0163 Merge branch 'MDL-34570-master' of git://github.com/FMCorz/moodle 2012-10-02 13:56:48 +08:00
Dan Poltawski 76811d0bb8 Merge branch 'MDL-35370' of git://github.com/timhunt/moodle 2012-10-02 12:07:41 +08:00
Dan Poltawski c07189ebe8 Merge branch 'MDL-35693' of git://github.com/timhunt/moodle 2012-10-02 11:47:50 +08:00
Tim Hunt 463f4b4c6a MDL-47494 ddimageortext: Merge branch 'MOODLE_22_STABLE' 2012-09-28 18:13:43 +01:00
Tim Hunt 7e6b0bc1f1 MDL-47494 ddimageortext: Merge branch 'MOODLE_21_STABLE' into MOODLE_22_STABLE 2012-09-28 18:13:28 +01:00
Tim Hunt ae64c68608 MDL-47494 ddimageortext: Form validation should ensure coordinates are ints. 2012-09-28 18:13:10 +01:00
Tim Hunt 1c80e79ac6 MDL-35693 question engine: set id when saving a new question_attempt 2012-09-28 15:28:27 +01:00
Frederic Massart b825e6c613 MDL-35171 Question: Export to HTML uses more of html_writer 2012-09-28 11:40:40 +08:00
Frederic Massart c3cdf1e4cb MDL-34570 Accessibility: Adding labels on text inputs and selects to questions 2012-09-28 11:40:40 +08:00
Rossiani Wijaya 83690170be MDL-34570 accessibility compliance for question: edit string label 2012-09-28 11:40:40 +08:00
Tim Hunt 65cf651fd8 MDL-35620 question engine: should distinguish NULL and 0.
This only matters in an obscure edge case, but it is an edge case we hit
with one of the OU question types.

This load data code is processing the results of a LEFT JOIN, so is_null
is the correct logic.
2012-09-27 12:44:07 +01:00
Tim Hunt b2a79cc1e8 MDL-35370 cloze qtype: distinguish wrong & unanswered subqs
This affects the subquestions that appear as an embedded text input box.

There are three cases:
1. Input for subq left blank
2. Input for subq was wrong, and matched by a * wildcard.
3. Input for subq was wrong, and did not match any answer.

2. and 3. should look identical, apart from any feedback in case 2.

1. is different. The state should be displayed as "Not answered" even
though the mark for this part is still shown as 0.

There are some new unit tests for these cases.

Also, we slighly improve handling of , for decimal point in multianswer,
although there are still issues.

While working on this, I made some minor clean-ups in shortanswer and
numerical qtypes.
2012-09-27 12:43:21 +01:00
Eloy Lafuente (stronk7) 9577f6ee94 Merge branch 'MDL-35419' of git://github.com/timhunt/moodle 2012-09-18 01:28:34 +02:00
Eloy Lafuente (stronk7) b18816beae Merge branch 'MDL-34841' of git://github.com/timhunt/moodle 2012-09-18 01:15:14 +02:00
Tim Hunt 2c76c89422 MDL-35419 question manual grading: valdiation must handle 0,5
Yet another , as decimal separator issue!

To fix this nicely, I refactored some code into question_utils.
2012-09-13 16:33:15 +01:00