Commit Graph

1046 Commits

Author SHA1 Message Date
Sam Hemelryk e97584bcf1 Merge branch 'mdl-28517' of git://github.com/colchambers/moodle 2011-08-08 14:22:51 +08:00
Sam Hemelryk 9d85b62c42 Merge branch 'MDL-28612' of git://github.com/timhunt/moodle 2011-08-08 11:00:38 +08:00
Tim Hunt a23bda41e4 MDL-28618 question combined feedback: inconsistency in file areas.
The (partially|in)?correct feedback fields acutally store their files in a file area with component 'question'. Some code, however, was written as if they were stored in the qtype_whatever area.
2011-08-05 16:45:17 +01:00
Tim Hunt e5b0920e48 MDL-28612 Quiz statistics report does not always show the 'Actual response' column when it should 2011-08-04 18:14:31 +01:00
Colin Chambers 43e607ca79 MDL-28517 question editing fixed duplicate id in hint header field 2011-08-04 14:49:31 +01:00
Jamie Pratt da8cd9f4b3 MDL-28268 Missing ORDER BY when using extra answer table.
From OU bug #921 "Order of answer fields in Variable numeric keeps changing" Cannot
reproduce this bug on my system but hopefully this will fix the problem. I added
an ORDER BY clause to the sql for fetching answers with extra answer fields.
2011-07-09 07:26:08 +01:00
Aparup Banerjee c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7) f4f835b739 fix permissions 2011-07-01 23:39:00 +02:00
Eloy Lafuente (stronk7) 3bd43d3d5c Merge branch 'MDL-27418' of git://github.com/timhunt/moodle 2011-07-01 11:05:17 +02:00
Tim Hunt e42646b167 MDL-27418 fix minor regression found by Rajesh. 2011-07-01 09:44:31 +01:00
Tim Hunt 01533e9cce MDL-28138 fix calculated-specific format float function
Sadly this has to be done in question.php and in two places in the ugprade code :-(.
2011-07-01 09:14:56 +01:00
Eloy Lafuente (stronk7) a80d6ab536 Merge branch 'MDL-28128' of git://github.com/timhunt/moodle 2011-07-01 01:49:59 +02:00
Eloy Lafuente (stronk7) 70debd7391 Merge branch 'MDL-28129' of git://github.com/timhunt/moodle 2011-07-01 01:41:38 +02:00
Tim Hunt baf706b503 MDL-28132 truncate very long category names before using them in random question names. 2011-06-30 19:35:35 +01:00
Jamie Pratt e5060e2209 MDL-28129 two issues with loading and saving questions
1. Missing order by could randomise the order of the hints.

2. the extraanswerfields big had some SQL errros.
2011-06-30 17:21:37 +01:00
Tim Hunt ceb4d2ed0b MDL-28128 finish the fix for MDL-28035.
There was one place where I had only fixed the backup code to work-around bad data from Moodle 2.0. I needed to make the equivalent change in the upgrade code.

The bad data is that the seq_number fields can be wrong (not unique). Se already have data ordered by (seq_number, id) and the array keys of the array we are building are not used for anything, so this fix deals with the problem.
2011-06-30 16:00:15 +01:00
Eloy Lafuente (stronk7) 6e344148c1 MDL-27418 qtype numerical - minor whitespace fix 2011-06-29 23:57:08 +02:00
Eloy Lafuente (stronk7) 88933f08cb Merge branch 'MDL-27418' of git://github.com/timhunt/moodle 2011-06-29 23:51:33 +02:00
Eloy Lafuente (stronk7) 0f744d2ca4 Merge branch 'MDL-27430' of git://github.com/timhunt/moodle 2011-06-29 23:33:01 +02:00
Tim Hunt 3a6eb8efdf MDL-27418 qtype numerical correct grading of 'right value, wrong unit' reponses.
Probably easiest to explain by example: If the right answer is 1.23 m with alternate
unit 100 cm = 1m then the completely right answers are 1.23 m and 123 cm.
Right answer, wrong unit responses include 1.23, 1.23 frogs and 1.23 cm.
123 m is not considered to have the correct numerical value.

We may well re-consider the way this works in a future version of Moodle.

Unit grading was not implemented before Moodle 2.0. In Moodle 2.0, the unit grading
was more permissive than here, for example 123 m would have been graded correctly in
2.0. However, I'm not sure I follow the rationale for that.
2011-06-29 15:41:56 +01:00
Tim Hunt c5aaf41739 MDL-27418 add unit tests for the problem case identified by Pierre. 2011-06-29 06:55:45 +01:00
Tim Hunt f040d4b046 MDL-27418 add validation to stop students intering a thosands sep.
If it might be confused by a decimal point from another locale.
2011-06-28 18:26:34 +01:00
Tim Hunt 1a1353a5ce MDL-27418 qtype numeric go back to the very permissive number parsing from Moodle 2.0.
I hope my unit tests are good enough to make this change safe.
2011-06-28 18:13:44 +01:00
Tim Hunt eef75d4b31 MDL-27418 qtype_numeric correct output of numbers in locales that use , for decimal point. 2011-06-28 17:37:09 +01:00
Tim Hunt 9048940701 MDL-27418 correct validation of numerical answers in qtype numeric.
This mostly affects locales that use , as decimal point.
2011-06-28 17:36:24 +01:00
Tim Hunt 3aa159706c MDL-27418 fix typo
I really should refactor to eliminate this duplicated code.
2011-06-28 17:34:24 +01:00
Tim Hunt 8566369f63 MDL-27430 qtype numerical put multiple-choice units back to radio buttons
It seems that people want to be able to use <sup> and <sub> here, which
makes sense, so we need to keep radio buttons for questions upgraded
from 2.0. The dropdown menu, however, is also nice, so keep that option
too for new questions.
2011-06-28 16:33:01 +01:00
Tim Hunt 0366ef262a MDL-28035 problems with upgrade/restore of ataptive quizzes from 2.0
There were two main problems:

1. The unit tests for upgrading adaptive quiz attempts had slighly the
wrong $expectedqa, and so matching that the upgrade was doing the wrong
thing in certain situations. The main issue was that it was setting
-_try = 1 on the first step, which broke the penalty calculation when
the quiz was regraded. There were also some other subtleties with
incrementing -_try that were not right before.

2. It was possible in 2.0 and earlier for two question_states to get the
same seq_number, and restoring 2.0 backups was rashly assuming that that
was unique.
2011-06-27 17:10:02 +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
Tim Hunt eb624cf7e0 MDL-27937 Calculated tolerance field should have the label Tolerance +- 2011-06-22 19:49:39 +01: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
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 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
Tim Hunt 5cf69d7ff5 MDL-27868 Hints (and some other things) lost when re-editing calculated* questions. 2011-06-17 15:42:03 +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 e6d7658337 MDL-27865 fix editing of calculated* questions. 2011-06-15 12:20:26 +01: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 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
Tim Hunt d7ad6ac4ef MDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0. 2011-06-14 12:10:23 +01:00