2837 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f0fa70d0df Merge branch 'MDL-29771' of git://github.com/timhunt/moodle 2015-06-01 16:13:18 +02:00
Tim Hunt
3af05ae35b MDL-29771 interactive behaviour: better state text in try again state
Before it just said 'Not complete'. It is more helpful to show the number
of tries remaining in this state as well.
2015-05-31 21:09:55 +01:00
Tim Hunt
312dce0ebc MDL-50341 quiz statistics: non-attempted questions broke first-try stats
For behaviours that allow multiple tries, and when the teacher had chosen to
generate statistics for the first tries only, and when a student had not
attempted one question, then an error occurred. It should have been classified
as no response.
2015-05-31 13:36:53 +01:00
Tim Hunt
e7df2335b6 MDL-50373 questions: random Qs must not pick deleted or sub- questions
This was a regression caused by MDL-6340. I missed the necessary
    AND parent = 0 AND hidden = 0
in one query of the question table.
2015-05-27 20:32:47 +01:00
Skylar Kelty
5b8e7b9564 MDL-50280 WebCT import scripts don't always clean up 2015-05-18 15:25:18 +01:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Tim Hunt
299d77dd5a MDL-50028 qtype_match: fix correct answer display
Atto's stupid tendency to create HTML like
<p>You don't need a br at the end of a paragraph!</br></p>
was breaking it.
2015-04-28 13:07:26 +01:00
Tim Hunt
c70c18c0e3 MDL-50028 questions: split into one testcase class per file 2015-04-28 13:07:25 +01:00
Andrew Nicols
bd305d3dcb Merge branch 'wip-mdl-49799-m' of https://github.com/rajeshtaneja/moodle 2015-04-20 12:22:18 +08:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Adrian Greeve
08000e535d MDL-49880 mod_lesson: Fixed notice while importing questions.
Cloze questions (not supported by lesson) threw up a notice saying that
the course wasn't set.
2015-04-20 09:12:20 +08:00
Damyon Wiese
e362045e58 Merge branch 'MDL-49736_master' of git://github.com/markn86/moodle 2015-04-07 21:42:39 +08:00
Mark Nelson
b25e15b224 MDL-49736 core_question: fixed ability to unhide questions 2015-03-31 22:57:51 -07:00
David Monllao
4d9dda2389 Merge branch 'MDL-40992' of git://github.com/timhunt/moodle 2015-04-01 08:00:43 +08:00
Dan Poltawski
f5c493f75e Merge branch 'MDL-49666' of git://github.com/timhunt/moodle 2015-03-31 19:18:14 +01:00
Tim Hunt
063cbe93e3 MDL-49666 questions: coding style fixes 2015-03-31 15:23:20 +01:00
Tim Hunt
ed98894326 MDL-49666 qbehaviour_informationitem: respect $options->readonly 2015-03-31 15:22:16 +01:00
Tim Hunt
5e63b335fe MDL-40992 quiz: option to let students redo questions within an attempt
This feature is designed for use on pracice or formative quizzes.
It is available for quizzes that use Interactive or Immediate feedback
behaviour.

If the teacher turns this on in the quiz settings, then once a student
has finished a question, they get a 'Redo question' button beside the
question. If they click it, then the question they finished is replaced
by a new one so they can try again to practise that particul skill or
bit of knowledge a bit more.

When randomisation is involved, the studnets will be given a question or
variant that they have not seen before if possible.
2015-03-31 14:12:48 +01:00
David Monllao
b51ff393cd Merge branch 'MDL-6340' of git://github.com/timhunt/moodle 2015-03-31 08:44:01 +08:00
Mark Nelson
810920b15d MDL-25721 core_question: added ability to order questions by dates 2015-03-26 16:21:27 -07:00
Tim Hunt
f6579bea94 MDL-40992 question engine: new ways modify question usages
* A method to change the max mark for one question_attempt in the usage

* A method to replace one question in a usage with another, moving the
old question_attempt to the end.

* Methods to set and get metadata (string name value pairs) for each
question_attempt in the usage. This gets stored in the first step in a
way that should not interfere with anything else.
2015-03-26 17:46:48 +00:00
Tim Hunt
47be39ef41 MDL-40992 qbehaviour: new type method, can Qs can finish naturally 2015-03-26 17:46:48 +00:00
M Kassaei
1700bd4dea MDL-40992 quiz: let students to redo questions within an attempt 2015-03-26 17:46:47 +00:00
Tim Hunt
bb93fc24aa MDL-6340 quiz: avoid reusing random questions between attempts
There are several improvements over what we had before:

1. We track all the questions seen in the the student's previous
quiz attempts, so that when they start a new quiz attempt, they get
questions they have not seen before if possible.

2. When there are no more unseen questions, we start repeating, but
always taking from the questions with the fewest attempts so far.

3. A similar logic is applied with variants within one question.

There is lots of credit to go around here. Oleg Sychev's students Alex
Shkarupa, Sergei Bastrykin and Darya Beda all worked on this over
several years, helping to clarify the problem and shape the best
solution. In the end, their various attempts were rewritten into this
final patch by me.
2015-03-26 17:45:49 +00:00
David Monllao
63fe1c12f7 Merge branch 'MDL-40990' of git://github.com/timhunt/moodle 2015-03-18 08:22:06 +08:00
Tim Hunt
441d284ada MDL-40990 quiz: option to require prev Q finished before next shown
Further improvements to this code, including resolving edge cases:

* The new feature can only be used when it is possible for the
previous question in the quiz to be complete.

* Also, this new feature cannot be used in combination with shuffle
questions, because that make no sense; nor in combination with
sequential navigation, because to make that work properly would be a lot
of effort. If someone needs that to work later, it should be possible
for them to implement it.

* There were changes in the edit renderer API, to try to make things
more  consistent, and to make it less likely we will need to change
things again in the future. See mod/quiz/upgrade.txt.

* As part of this change, the styling of the Edit quiz page was tweaked
to make slighly more efficient use of the horizontal space, and to be
more symmetrical.
2015-03-17 17:16:22 +00:00
M Kassaei
f7785e42b3 MDL-40990 quiz: option to require prev Q finished before next shown 2015-03-17 17:10:13 +00:00
David Monllao
365377bcb2 MDL-47712 question_multianswer: Concat as string 2015-03-16 12:28:51 +08:00
Daniel Thies
530a2cb0d1 MDL-47712 qtype_multianswer: Move mathjaxloader spans to outer question 2015-03-13 20:43:03 -05:00
Tim Hunt
fd7a8af50b MDL-40990 qbehaviours: method to say if attempts can finish naturally 2015-03-13 14:23:02 +00:00
Tim Hunt
097efe9de3 MDL-49315 questions: unit tests for each behaviour type class 2015-03-05 12:19:23 +00:00
Andrew Nicols
5ce0741490 Merge branch 'MDL-49247' of git://github.com/timhunt/moodle 2015-03-03 14:56:39 +08:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Tim Hunt
8def548b8d MDL-49247 question restore: avoid unique key errors from old bad data
Several tables have had unique keys added to enforce a constraint that
should always have been there. It is possible for old sites to have
data that violate the constraints, and sometimes people want to backup
data from those old sites, and restore them into a new Moodle.
Therefore, we need to guard agains the unique key violation errors.
2015-02-19 21:46:56 +00:00
Tim Hunt
86969816c6 MDL-49041 qtype_multianswer: don't reveal marks on partial responses
This commit also fixes MDL-32049 about the lack or valdiation message
when an incomplete respnses is submitted.

AMOS BEGIN
 CPY [pleaseananswerallparts,qtype_match],[pleaseananswerallparts,qtype_multianswer]
AMOS END
2015-02-05 20:01:13 +00:00
Dan Poltawski
e46856e48b MDL-48624 behat: fix trailing whitespace 2015-02-03 11:01:34 +00:00
Rajesh Taneja
c3b72e586a MDL-48624 behat: Added extended timeout to ensure step pass
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
2015-01-30 08:54:12 +08:00
Andrew Nicols
1cb5f61213 Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle"
This reverts commit e08f58288af17bea8d55b66dae697d9d917053f4, reversing
changes made to 782ea98c59945864cfcc3ab44a6f17d49a9ed39f.
2015-01-22 12:13:35 +08:00
Eloy Lafuente (stronk7)
ee263a454b Merge branch 'MDL-48477' of git://github.com/timhunt/moodle 2015-01-20 18:44:08 +01:00
Rajesh Taneja
e41aa29bca MDL-48624 behat: Added extended timeout to ensure step pass
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
2015-01-19 10:15:47 +08:00
Tim Hunt
6403c8d39b MDL-48477 questions: no delete icon for only top-level category
The back end code already threw an exception if you clicked the icon,
so you could not delete the category, but we should not have shown the
icon in the first place.

Thanks to Pramith Dayananda for working out the fix for this issue. I am
just committing it.
2015-01-15 10:20:47 +00:00
Tim Hunt
da6f1f586d MDL-48474 qtype_shortanswer: answers were not being trimmed.
This fix is based on Oleg Sychev's suggestion. Thanks.
2015-01-08 17:41:51 +00:00
Tim Hunt
46e4c35aa9 MDL-42519 qformat_xml: Correctly export questions containing ]]> 2014-12-22 19:46:23 +00:00
Pau Ferrer Ocaña
2908af0903 MDL-47176 qtype_match: Avoid sql_compare to solve problems with Oracle 2014-12-12 14:30:58 +01:00
Tim Hunt
df44db5baa MDL-48373 behat, questions: convert tests to use the new steps
The new steps make it more efficient to create questions.

While making the changes, I took the opportunity to alter the tests to
follow Behat best practices, and only test one thing per scenario.
2014-12-05 12:22:27 +00:00
Dan Poltawski
ddb483a468 Merge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle 2014-12-04 12:04:11 +00:00
Rajesh Taneja
a296ebffed MDL-48290 behat: Add log out after checking exported file
If the download step is the last in the scenario then we
can sometimes run into the situation where the download page
causes a http redirect but behat has already conducted its
reset (generating an error). By putting a logout step we avoid
behat doing the reset until we are off that page.
2014-12-02 09:38:26 +08:00
Jean-Michel Vedrine
762ee1393b MDL-48342 Question: qformat_default::readquestion is broken 2014-11-28 15:47:39 +01:00
Eloy Lafuente (stronk7)
0b861e92d0 Merge branch 'MDL-48276-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:45:26 +01:00