3618 Commits

Author SHA1 Message Date
Dan Poltawski
de134194b9 Merge branch 'MDL-48146' of git://github.com/timhunt/moodle 2014-11-18 12:04:48 +00:00
Sam Hemelryk
817e9010c1 Merge branch 'MDL-47618' of git://github.com/timhunt/moodle 2014-11-18 11:12:28 +13:00
Tim Hunt
06cf0b75ec MDL-48146 quiz settings: fix non-percent feedback boundaries 2014-11-12 15:45:26 +00:00
Dan Poltawski
4bd5445447 Merge branch 'MDL-48168' of git://github.com/timhunt/moodle 2014-11-11 18:48:39 +00:00
Tim Hunt
bae1d7d9e8 MDL-47618 quiz statistics: fatal error with groups.
The problem was that the names of query placeholders were changing. The
fix was to do things ourself, rather than using get_in_or_equal.
2014-11-11 18:01:35 +00:00
Tim Hunt
080839c421 MDL-48168 quiz editing: max grade should be editable after attempts
Note that there was a lot of legacy code left from Moodle 2.7 which is
no longer required, and I took this opportunity to delete it.
2014-11-10 19:00:05 +00:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
ec070d2cf7 Merge branch '48026-28' of git://github.com/samhemelryk/moodle 2014-11-06 00:33:46 +01:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
2014-11-04 17:52:35 +01:00
Sam Hemelryk
8a375d27f2 MDL-48026 mod_quiz: convert menu nowrap from CSS to method 2014-11-03 13:35:29 +13:00
Sam Hemelryk
ac4ed127de MDL-47978 mod_quiz: more explicit selector for action menu change 2014-11-03 11:39:30 +13:00
Sam Hemelryk
968cc37437 Merge branch 'MDL-47978' of git://github.com/timhunt/moodle 2014-11-03 11:27:55 +13:00
Tim Hunt
262105faf9 MDL-47978 quiz editing: fix display of last add menu 2014-10-31 18:23:45 +00:00
Tim Hunt
58413f613e MDL-47963 quiz editing: fix failing unit tests
The unit tests were initialising the structure class in a different way
from real use. That was clearly silly, so I got rid of create_for,
leaving just the real create_for_quiz.
2014-10-31 17:22:38 +00:00
Dan Poltawski
b4eaafd744 Merge branch 'MDL-47963' of git://github.com/timhunt/moodle 2014-10-31 13:14:59 +00:00
Sam Hemelryk
1a14f8a6de MDL-47959 mod_quiz: fixed 0 questions bug 2014-10-31 13:35:25 +13:00
Colin Chambers
77dca4d0a8 MDL-47972 mod_quiz: Fix new quiz on themes based on base. 2014-10-30 17:11:23 +00:00
Tim Hunt
6870a6b8d0 MDL-47963 quiz editing: block ajax edits once there are attempts 2014-10-30 16:24:55 +00:00
Dan Poltawski
f976c8e468 Merge branch 'MDL-47959' of git://github.com/colchambers/moodle 2014-10-30 14:24:35 +00:00
Colin Chambers
6375e98cbb MDL-47959 Number of questions not updated dynamically in new quiz edit page 2014-10-29 16:26:49 +00:00
Dan Poltawski
290bcd3476 MDL-47368 fix trailing whitespace 2014-10-29 11:20:29 +00:00
Dan Poltawski
0af29b0383 Merge branch 'MDL-47368' of git://github.com/timhunt/moodle 2014-10-29 11:18:15 +00:00
Tim Hunt
e3d3e1e652 MDL-47368 quiz editing: fix icon url generation. 2014-10-28 18:45:17 +00:00
Colin Chambers
a69f81f0d3 MDL-47368 Edit quiz: page should not reload so often
The approach is that we have a new JavaScript function
M.mod_quiz.resource_toolbox.reorganise_edit_page which, after a ajax
action, fixes up everything like page breaks, page and question numbers,
that might now be wrong.

We call that function instead of reloading the page.

Also, there are a lot more Behat tests to verify this works correctly.

AMOS BEGIN
 MOV [joinpages,mod_quiz],[removepagebreak,mod_quiz]
 MOV [splitpages,mod_quiz],[addpagebreak,mod_quiz]
AMOS END
2014-10-28 11:32:42 +00:00
Andrew Nicols
d5653c6968 MDL-47898 mod_quiz: Correct path when checking content_editable
Addresses a number of issues when using the text editor in a quiz using
secure mode.
2014-10-27 19:23:56 +08:00
Dan Poltawski
42b6b39136 Merge branch 'MDL-46088-master' of git://github.com/timhunt/moodle 2014-10-24 17:10:56 +01:00
Sam Hemelryk
28f1bd0106 Merge branch 'MDL-47695' of git://github.com/timhunt/moodle 2014-10-21 14:42:36 +13:00
Dan Poltawski
6c75bcb5d6 Merge branch 'MDL-47651' of git://github.com/timhunt/moodle 2014-10-20 17:44:33 +01:00
Dan Poltawski
670b0d0283 Merge branch 'MDL-47691' of git://github.com/timhunt/moodle 2014-10-20 17:24:22 +01:00
Tim Hunt
97ef7ea2ce MDL-47695 quiz editing: descritions don't have a max mark!
So don't show the UI for editing it.

Also, don't show non-functional page split/join icons after the quiz has
been attempted.
2014-10-20 15:30:35 +01:00
Tim Hunt
1c2e05c060 MDL-47691 quiz: only warn re overdue attempts if a Q has been answered
If a quiz is set to have a grace period when time has expired, we only
email studnets to warn them about their overdue attempt if they have put
in an answer to at least one question that is worth some marks.
2014-10-20 12:11:10 +01:00
Tim Hunt
0233e2a973 MDL-47673 quiz generator: default grade 100 & fix review options
The review option defaults need to be like what you get from the editing
form, no what is stored in the database, or they don't work!
2014-10-20 12:11:01 +01:00
Tim Hunt
a40eaaa28f MDL-47651 quiz responses: allow for qtypes without responses 2014-10-20 12:10:43 +01:00
Tim Hunt
84b45a24a1 MDL-47603 quiz edit: qbank popup preview icon needs new window
Also, ensure that clicking the + icon adds the question on the right
page.

Bit of this fix are a bit hacky, but we have to deal with the fact there
is not a good general solution to MDL-47604.
2014-10-10 13:40:16 +01:00
Tim Hunt
8ac5c115e0 MDL-43089 quiz editing: don't pop up qbank on initial page load. 2014-10-10 11:00:12 +01:00
Tim Hunt
aec2a725a8 MDL-43089 quiz editing: fix some qbank popup JS issues. 2014-10-09 17:22:22 +01:00
Tim Hunt
ad6a1455a4 MDL-43089 quiz editing: fix RTL
As part of this, I tweaked the LTR style a bit, in a way that is both an
improvement (I hope) and also to reduce the amount of RTL-specific code
required. (Thanks to Fred for spotting some of the problems.)

Also, I changed one course style in boostrapbase, where the RTL rule was
different from the LTR rule.

Finally, I saw some repeated RTL rules in the quiz styles.css, and so
eliminated the the duplicate rules.
2014-10-09 16:34:38 +01:00
Dan Poltawski
15ba6a0ded Merge branch 'MDL-47556' of git://github.com/timhunt/moodle 2014-10-09 10:54:19 +01:00
Dan Poltawski
66689366a0 Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/grade.less
	theme/bootstrapbase/style/moodle.css
2014-10-08 15:49:58 +01:00
Marina Glancy
9f1088d482 MDL-47543 core_grades: behat changes, also MDL-47541 2014-10-08 15:03:37 +08:00
Mark Nelson
ba8024665d MDL-40697 mod_*: fixed unit tests so they pass 2014-10-07 19:08:35 -07:00
Sam Hemelryk
ba2f9a9695 Merge branch 'MDL-47132' of git://github.com/timhunt/moodle 2014-10-08 12:01:42 +13:00
Tim Hunt
24cfc09881 MDL-47556 quiz: autosave should default to on for new installs 2014-10-06 23:17:25 +01:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
2014-10-06 18:06:13 +01:00
Tim Hunt
4d1fcfdf8a MDL-47547 quiz editing: minor fixes following MDL-47547
* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.
2014-10-06 15:44:21 +01:00
Dan Poltawski
816d082241 MDL-43089 question: fix shifter build issues 2014-10-06 13:53:26 +01:00
Tim Hunt
16fa272e29 MDL-47132 quiz: move the remains of editlib.php to locallib.php 2014-10-03 07:54:47 +01:00
Tim Hunt
8aa5e0cf58 MDL-47132 quiz: move question bank extensions to classes/question/bank
While doing this code clean-up, I noticed that the question bank pop-up was
only showing the question name, whereas it should have been showing the
question name and the start of the question text, so I fixed that.
2014-10-03 07:54:46 +01:00
Marina Glancy
8faa560ca9 MDL-47146 core_grades: merge simple and full view in setup
Part of: MDL-46576
2014-10-03 13:54:38 +08:00
Colin Chambers
e1a2d0d92d MDL-43089 quiz: improved interface for building quizzes
This commit is actually the joint work of Mahmoud Kassaei, Colin
Chambers and Tim Hunt from The Open University. We could only use one
persons name for the commit, and this time Colin gets the credit/blame.

The goal of this work was to increase usability, and also clean up
the page enough that it will be possible to add new features in future.

Display of mod/quiz/edit.php is now entirely generated by
mod_quiz\output\edit_renderer. This uses a helper class
mod_quiz\structure to provide details of the structure of the quiz, and
mod_quiz\repaginate to alter that structure. (Acutally, there are still
some modification methods on mod_quiz\structure. Expect that to be
cleaned up in future.)

The new code uses much more ajax, and there are new scripts
mod/quiz/edit_rest.php and mod/quiz/repaginate.php to handle this.
(Again, don't be surprised if those two scripts get merged in future.)
Also questionbank.ajax.php (which may, in future, be made more generic,
and moved into the core question bank code.)

Most of the new JavaScript code has intentionally copied the way things
are done when editing activities on the course page.

As a result of this, mod/quiz/editlib.php is now much shorter than it
was. (In future, expect the remaining code in here to move into
mod/quiz/classes.)
2014-10-02 17:22:23 +01:00