Commit graph

4783 commits

Author SHA1 Message Date
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
Marina Glancy
e0c22222b6 MDL-45336 questionbank: use core strings instead of quiz
AMOS BEGIN
 CPY [categories,mod_quiz],[categories,question]
 CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
 CPY [export,mod_quiz],[export,core_question]
 CPY [import,mod_quiz],[import,core_question]
AMOS END
2014-09-24 01:22:59 +02:00
Marina Glancy
8766d1981c MDL-45336 qtype_numerical: use own strings instead of mod_quiz
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
2014-09-24 01:22:59 +02:00
Marina Glancy
5a0221f7c0 MDL-45336 question: moved used string from quiz plugin
AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
2014-09-24 01:22:58 +02:00
Eloy Lafuente (stronk7)
44af6d53a7 Merge branch 'MDL-47266' of git://github.com/timhunt/moodle 2014-09-23 01:12:16 +02:00
Tim Hunt
358f31672b MDL-37998 quiz settings: disableif rules should account for overrides.
Some form fields are disabled if only one attempt is allowed. However,
there may be an override allowing some students more attempts. We need
to account for that possiblity when setting up the disabled if rules.

Note the disabledIf is good for usability on this complex form, which is
why I don't just want to get rid of them.
2014-09-22 16:23:38 +01:00
Dan Poltawski
e79420eaf1 Merge branch 'MDL-47276' of git://github.com/timhunt/moodle 2014-09-22 16:08:19 +01:00
Tim Hunt
dc37223bff MDL-46088 quiz secure window: further Atto JS fixes. 2014-09-19 22:03:24 +01:00
Damyon Wiese
d250083e03 MDL-46088 Quiz: Prevent alert when clicking in editor in secure popup 2014-09-19 22:03:24 +01:00
Tim Hunt
339554aa21 MDL-46088 Impossible to click on Atto in a Quiz in 'Secure' mode. 2014-09-19 22:03:23 +01:00
Tim Hunt
129a45687c MDL-47276 quiz: change default for When time expires for new installs 2014-09-19 21:59:46 +01:00
Tim Hunt
0d4075d514 MDL-40006 searchableselector does not work in IE or Safari.
This fix is a horrible hack, but one I have used for years in tool_editrolesbycap
https://github.com/moodleou/moodle-tool_editrolesbycap/blob/master/yui/capabilityformfield/capabilityformfield.js
and it seems to be reliable.

As an added bonus, I removed the use of YUI2 here.

Also, I fixed the related button in quiz to be GET not POST.
2014-09-19 21:59:34 +01:00
Tim Hunt
a7b0bd1331 MDL-47266 quiz: fix restore log message. 2014-09-18 11:04:28 +01:00
sam marshall
c234c34085 MDL-44725 Availability: Replace groupmembersonly - quiz overrides (9)
This only affects the quiz overrides form, as groupmembersonly was
not used elsewhere. The change simply restricts the list of users
shown when selecting somebody for overrides.

Some additional code is needed to (efficiently) load the $cm object
as a cm_info so that the availability API can be used on it.
2014-09-02 13:03:23 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6)
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
2014-09-02 13:03:17 +01:00
Damyon Wiese
c97bb5df16 Merge branch 'MDL-41513_Scrollbar_not_working' of https://github.com/MorrisR2/moodle 2014-08-19 14:11:43 +08:00
Andrew Nicols
5afbca2485 MDL-45759 mod_quiz: Correct behat test to reflect changes from a translation fix 2014-08-13 15:44:52 +08:00
Ray Morris
d6691fbee8 MDL-41513 mod_quiz: Scrollbar not working in Javascript Security Popup Quiz window in Chrome 2014-08-12 11:14:24 -05:00
Andrew Nicols
83d68fde48 MDL-45780 mod_quiz: Autosave should listen for textarea:change events too 2014-08-11 12:31:36 +08:00
Sam Hemelryk
e6330e5ba8 Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle
Conflicts:
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/tests/behat/completion_condition_passing_grade.feature
2014-07-17 15:16:07 +12:00
Ray Morris
349c930343 MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)
2014-07-16 19:17:57 -05:00
Sam Hemelryk
3c94f90cde MDL-37993 mod_quiz: fixed deprecated behat step 2014-07-15 09:10:17 +12:00
Sam Hemelryk
9b3b730c62 Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle 2014-07-15 08:48:55 +12:00
Ray Morris
db3686d546 MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)
2014-07-14 10:14:27 -05:00
Tim Hunt
afbe4592ad MDL-44492 quiz: fix hilighting of graded attempt
In various places, when showing several attempts, we try to hilight the
most significant one (the one that gave the final grade if the quiz is
set to first/last/best attempt). That was not working because the table
zebra stripes were a more specific rule.

Also, the colour was inconsistent, not nice, and not very bootstrapy, so
I changed it.
2014-07-08 13:31:55 +01:00
Tim Hunt
6f885844fd MDL-44492 quiz reports: revert some style overrides.
But add one more. This makes Clean theme look a lot better.
2014-07-08 13:31:53 +01:00
Tim Hunt
750757cff1 MDL-44492 Rough unit test for the report SQL.
We really ought to test more cases, but this hits one of the most tricky cases.
2014-07-08 13:31:51 +01:00
Tim Hunt
8cacc71dd2 MDL-44492 quiz reports: make show only graded attempt work.
It needs to only affect finished attempts, and the wording needs to be
modified to make it clear that is what it does.
2014-07-08 13:31:49 +01:00
Tim Hunt
84deaaf8bb MDL-46163 quiz/questions: fix missing hidden fields.
I have done this by eliminating the duplication between the base class
and the subclass.

This was a regression introdcued by MDL-40313.
2014-07-02 14:32:53 +01:00
Dan Poltawski
2a957cda17 Merge branch 'MDL-46093' of git://github.com/timhunt/moodle 2014-07-01 10:53:59 +01:00
Dan Poltawski
2d8c48a995 Merge branch 'MDL-40457-question_bank_plugins_columns' of git://github.com/MorrisR2/moodle 2014-07-01 10:12:52 +01:00
Ray Morris
17f229fae3 MDL-40457 Question Bank: Allow plugins to add columns to question bank view
Allows plugins to add columns to the question bank view by extending core_question\bank\column_base
Columns to display are set in $CFG->questionbankcolumns. Columns are namespaced and autoloaded to support this.
2014-06-29 21:28:52 -05:00
Tim Hunt
097dbfe11a MDL-46093 quiz review should default to showing everything on one page
... as long as the quiz is not too big. At the moment, that limit is
set to 50 questions.
2014-06-27 17:14:51 +01:00
Eloy Lafuente (stronk7)
c45754d840 Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle 2014-06-24 21:54:58 +02:00
Damyon Wiese
2404605ad4 Merge branch 'MDL-35453' of git://github.com/timhunt/moodle 2014-06-23 12:29:36 +08:00
Tim Hunt
1c2e363c0e MDL-46086 quiz: fix unit test on Oracle 2014-06-20 22:25:21 +01:00