Commit graph

491 commits

Author SHA1 Message Date
Aparup Banerjee
98901d3ea9 Merge branch 'MDL-29739' of git://github.com/timhunt/moodle 2011-11-08 20:34:41 +08:00
Tim Hunt
4a84c94bec MDL-30135 question formats: trans_format/get_format should be public.
They need to be used by third-party qtype developers.
2011-11-07 11:31:27 +00:00
Ankit Kumar Agarwal
9e07e9a782 MDL-30158 Questions Cleaning up blackboard/format.php 2011-11-07 11:11:04 +05:30
Tim Hunt
de529cd253 MDL-30021 qtype numerical better showunits default when coming from 1.9
This applies to:
1. Upgrade from 1.9,
2. Import of questions exported from 1.9, and
3. Restore of courses backed-up from 1.9.

It also applies to the calculated question type.
2011-11-03 11:27:41 +00:00
Tim Hunt
78fc17ebdf MDL-29058 question export: include files from hints & combined feedback. 2011-11-03 11:27:39 +00:00
Tim Hunt
fe5f412104 MDL-29739 question import used a bad default for text formats.
The new logic is that the questiontext defaults to HTML if the format is
not specified, then all other fields default to the same format of the
question text.

However, good practice is that the XML file should specify the format
for each bit of text content.

This code is not 100% backwards-compatible, since some methods have new
arguments, however for question types that have not been updated, it
will just generate a PHP Warning, which is, I think, and OK way to let
qtype developers know that they need to update their question types.
2011-11-03 11:27:37 +00:00
Petr Skoda
2dc54611f2 MDL-29921 remove unmaintained qti_two export question type
It can be easily included in official distribution again if somebody fixes it because there are no stored data, capabilities or versions. This will finally allow us to drop the outdate Smarty library form distribution package.
2011-10-28 10:32:24 +02:00
Tim Hunt
77d0f5f07b MDL-29644 qtype multianswer, hints lost doing Moodle XML export.
This commit also includes a lot of useful tidying up of some of the unit
test helper code. I turned out that I could not use all the helper code
in my new tests, but despite that it will be useful in the future, so I
am committing it here.
2011-10-04 22:23:58 +01:00
Tim Hunt
e9735a1f31 MDL-29484 qformat xml tests failing. 2011-09-23 12:06:45 +01:00
Sam Hemelryk
4cc14ab11e Merge branch 'MDL-29366' of git://github.com/timhunt/moodle 2011-09-19 19:19:42 +12:00
Tim Hunt
474abf1221 MDL-29366 qtype_essay import/export as Moodle XML loses files from graderinfo 2011-09-14 19:01:18 +01:00
Tom Lanyon
af9b14446d MDL-28701 Change uses of make_upload_directory(temp) to make_temp_directory(). 2011-09-10 10:43:49 +02:00
Tom Lanyon
7aa06e6ded MDL-28701 Change all uses of $CFG->dataroot/temp to $CFG->tempdir 2011-09-10 10:35:39 +02:00
Tim Hunt
1b343d5241 MDL-28564 question type importing, improve Jamie's fix. 2011-08-27 08:16:47 +01:00
Eloy Lafuente (stronk7)
1d1982c5a2 Merge branch 'MDL-28349' of git://github.com/timhunt/moodle 2011-08-17 15:28:55 +02:00
Tim Hunt
0519420f59 MDL-28349 error when GIFT-importing essay questions. 2011-08-15 16:17:16 +01:00
Tim Hunt
45bdcf1134 MDL-28438 Aiken question import broken since MDL-24594. 2011-08-15 14:44:57 +01:00
Tim Hunt
1e20dea9b2 MDL-28508 bad string trunction in Aiken format. 2011-07-28 11:51:07 +01: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
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
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
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
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
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
9c197f4445 MDL-20636 Fix some more codechecker issues. 2011-05-14 22:53:25 +01:00
Tim Hunt
5d2465c3f4 MDL-20636 numerical qtype: assorted changes
1. database upgrade to merge instructions into the questiontext field,
and remove the UNITDISPLAY option.

2. Changes to the validation in deferred feedback mode, so students
are warned about incomplete answers.

3. Using this to wark students if they enter an answer that is not
recognised as a number.
2011-04-28 20:06:47 +01:00
Tim Hunt
c7df5006b9 MDL-20636 Add lots of missing public/protected/private. 2011-03-23 16:22:25 +00:00
Tim Hunt
c73c98365b MDL-20636 Question import, support for files in hints.
Also fix some minor bugs and unit tests.
2011-03-23 14:27:22 +00:00
Tim Hunt
9f622ce7d8 MDL-20636 Fix syntax error in question/format/xhtml/format.php 2011-03-11 18:28:40 +00:00
Tim Hunt
56b0df7eac MDL-20636 Kill Left over addslashes in the question engine code. #223 2011-03-11 13:45:38 +00:00
Tim Hunt
e2661fa8bc MDL-20636 Fix GIFT unit test 2011-03-02 17:47:12 +00:00
Tim Hunt
e2cba246b7 MDL-20636 Merge vle/master into ouqe2
Conflicts:
	mod/quiz/locallib.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	question/type/random/questiontype.php
2011-03-02 17:34:18 +00:00
Tim Hunt
22cebed503 MDL-20636 Review and fix the format parameter to all calls to format_text. 2011-02-24 20:18:16 +00:00
Tim Hunt
2daffca554 MDL-20636 Fix 30 TODOs 2011-02-24 17:47:51 +00:00
Tim Hunt
d649fb0221 MDL-20636 Remove all references to global $QTYPES.
Except in the question types that have not yet been converted to the new question engine.
2011-02-24 15:29:07 +00:00
Tim Hunt
5e8a85aa64 MDL-20636 Massively reduce the number of references to quiz in the question code.
This mostly involves moving lang strings around, but I don't have time to do an AMOS script now.
2011-02-23 18:53:50 +00:00
Tim Hunt
f7970e3ca7 MDL-20636 Eliminate integer and boolean in PHPdoc comments. should be int and bool. 2011-02-23 16:25:25 +00:00
Tim Hunt
a17b297d60 MDL-20636 Add missing defined('MOODLE_INTERNAL') || die(); 2011-02-23 16:00:20 +00:00
Tim Hunt
7764183a4a MDL-20636 Fix @package names and PHPdoc layout. 2011-02-23 13:38:16 +00:00
Tim Hunt
d3603157bf MDL-20636 Add @package and GPL boiler-plate to files in /question. 2011-02-22 19:59:12 +00:00
Tim Hunt
0ff4bd0877 MDL-20636 Fix new stdClass -> stdClass(), and trailing whitespace. 2011-02-21 18:10:19 +00:00
Tim Hunt
aa9bdbe31c MDL-20636 Boilerplate and other cleanup in the question core code.
This includes converting behaviours to pluginname strings.
2011-02-21 18:00:15 +00:00
Tim Hunt
5ec3e4a8eb MDL-26365 New GIFT unit test. 2011-02-11 10:15:26 +00:00
Tim Hunt
f9b0500f7f MDL-20636 Quiz editing now works, as does the random question type.
However, all this needs more testing.

Also, a bit of a purge of training whitespace and global .
2011-02-10 20:50:18 +00:00
Tim Hunt
74c479f212 MDL-20636 Merge branch 'master' into qe2_wip
Conflicts:
	lib/questionlib.php
	question/type/calculated/lang/en/qtype_calculated.php
	question/type/questiontype.php
2011-02-03 11:18:40 +00:00