Commit graph

64149 commits

Author SHA1 Message Date
Sam Hemelryk
cbf34f34cc Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
Conflicts:
	lib/db/upgrade.php
2013-10-08 14:43:36 +13:00
Damyon Wiese
cbe5a022f1 MDL-41993 Atto: Strip yui ids from generated HTML. 2013-10-08 09:32:18 +08:00
Marina Glancy
04a4de20e8 Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle 2013-10-08 12:03:15 +11:00
Marina Glancy
10a8d3dd7c Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle 2013-10-08 11:52:39 +11:00
Sam Hemelryk
87f28ddceb Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle 2013-10-08 11:20:51 +13:00
Petr Škoda
e734d8850c MDL-41197 normalize ascii text conversion 2013-10-07 23:54:05 +02:00
Sam Hemelryk
8050eec577 Merge branch 'MDL-42188' of git://github.com/stronk7/moodle 2013-10-08 08:52:42 +13:00
Sam Hemelryk
6455dec02d Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-08 08:48:43 +13:00
Eloy Lafuente (stronk7)
10d13aaf25 MDL-42188 shifter: delete some orphaned files 2013-10-07 21:44:13 +02:00
Sam Hemelryk
81a939be02 Merge branch 'MDL-35926_alt_c' of git://github.com/rwijaya/moodle 2013-10-08 08:27:46 +13:00
Eloy Lafuente (stronk7)
e68ff1ec32 Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle 2013-10-07 16:06:32 +02:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
2013-10-07 13:10:36 +02:00
Damyon Wiese
033f721362 MDL-31830 course: Remove unused shifter built js files 2013-10-07 15:58:59 +08:00
Damyon Wiese
d4770c9f00 Merge branch '31830-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-07 15:28:45 +08:00
Sam Hemelryk
7fd307b153 MDL-31830 course: fixed up minor points as noted by Damyon's integration review
* Fixed typo breaking drag and drop of courses.
* Fixed the ' ' title for the create new button plus two other icons I found as well.
* Adding padding to items displayed in the action menu drop down. base + bootstrapbase.
* Padding adjusted to the same as on the course page. base + bootstrapbase.
* Removed hover icon from categories. base only.
* Fixed categroy typo
* Removed min-width that was being applied to coursename making its clickable area larger than normal.
* The category tree is now presented using aria attributes as per http://www.w3.org/WAI/GL/wiki/Using_ARIA_trees
* Bulk action selectors now use aria-labelledby
* Category course count now given access hidden label.
* Pagination links now have better titles.
* The course action icons now present with role=button
2013-10-07 19:41:52 +13:00
rwijaya
586d393fd3 MDL-35926 notification dialog: trap tab focus within dialog modal. 2013-10-07 12:40:16 +08:00
Sam Hemelryk
4d00df46b1 Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle 2013-10-07 17:38:25 +13:00
Sam Hemelryk
8aa3aa3dfd MDL-31830 course: management behat tests corrected after fixes 2013-10-07 17:34:09 +13:00
Dan Poltawski
d1050e406f Merge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle 2013-10-07 11:26:37 +08:00
Sam Hemelryk
8618757c66 Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle 2013-10-07 15:51:45 +13:00
Sam Hemelryk
6ac0b01175 Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges
Conflicts:
	badges/assertion.php
2013-10-07 15:40:48 +13:00
Sam Hemelryk
4c9da232d0 Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle 2013-10-07 13:43:08 +13:00
Sam Hemelryk
d6cb394f2c Merge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-07 12:50:29 +13:00
Sam Hemelryk
484c4c6cf3 MDL-31830 course: several management interface improvements
* Tidied up course detail permissions so that user is not shown information they couldn't access elsewhere.
* category link dimming now accounts for course creation as an action as well.
* category single select when in courses view mode is now limited to courses user can action in.
* There is now a check at the start of the management page to redirect to course/index.php if the user isn't able to manage in any category.
* Tweaked navigation again, to give the limited users a navbar structure similar to the system cap'd user.
* Cancelling a category delete now takes you back to the category you were viewing.
* Fixed undefined notice
* Improved placement of course request and approval links.
* Several styling tweaks/improvements to the base theme.
* Several styling tweaks/improvements to the bootstrapbase theme.
2013-10-07 10:22:57 +13:00
Sam Hemelryk
c46996ea5a MDL-31830 course: improvements to JS coding style 2013-10-07 10:22:51 +13:00
Sam Hemelryk
b488058f7d MDL-31830 course: fixed interface issues with limited user
* Navigation/settings now show best available option.
* Resorting categories works now for limited access user.
* Display of up and down arrows corrected.
* Checkboxes no longer displayed if an action can't be performed.
2013-10-07 10:22:51 +13:00
Sam Hemelryk
f454e3247d MDL-31830 course: management interface fixes as noted
* Fixed the highlighing of the default category when no categories have been selected.
* Fixed the bug preventing the action menu for AJAX loaded categories from functioning.
* Repositioned course idnumber infront of course actions.
* Fixed display of moveup on first item and movedown on last item (courses and categories)
* Fixed up resort selected categories string.
2013-10-07 10:22:45 +13:00
Sam Hemelryk
5aff38e4d8 MDL-31830 course: renamed functions for consistency
* course_move_by_one => course_change_sortorder_by_one
* course_move_after_course => course_move_after_course
* helper::action_course_move_after_course  => helper::action_course_change_sortorder_after_course
* helper::action_course_moveup 		   => helper::action_course_change_sortorder_up_one
* helper::action_course_movedown 	   => helper::action_course_change_sortorder_down_one
* helper::action_course_moveup_by_record   => helper::action_course_change_sortorder_up_one_by_record
* helper::action_course_movedown_by_record => helper::action_course_change_sortorder_down_one_by_record
* helper::action_category_movedown         => helper::action_category_change_sortorder_down_one
* helper::action_category_movedown_by_id   => helper::action_category_change_sortorder_down_one_by_id
* helper::action_category_moveup 	   => helper::action_category_change_sortorder_up_one
* helper::action_category_moveup_by_id     => helper::action_category_change_sortorder_up_one_by_id
* coursecat::move_by_one 	           => coursecat::change_sortorder_by_one
2013-10-07 10:22:36 +13:00
Sam Hemelryk
67e1f26874 MDL-31830 course: several small code improvements
* I can rebase this for you/the integrator before it goes in for sure no probs :)
* Fixed double phpdoc block of course_change_visibility
* Moved permission checks out of course_move_after_course and into helper function.
* Reviewed setType calls for editcategory_form.php.
* Reviewed all uses of can_resort and added more specific methods.
* Fixed method mentioned in exception for resort methods.
* Converted calls to fetch courses to call get_course.
* Exceptions now thrown when trying to move courses and problems arise.
* Fixed unnecessary namespace hinting in core_course_management_renderer.
* Abstracted common logic of can_resort_any and can_change_parent_any.
* Removed check for system level capability from has_manage_capability_on_any.
* Reviewed debugging calls I've introduced.
2013-10-07 10:22:36 +13:00
Sam Hemelryk
a3b7439ff2 MDL-31830 course: added behat test of category creation 2013-10-07 10:22:36 +13:00
Sam Hemelryk
5dc361e16e MDL-31830 core_course: new course category management interface
* Implemented a new course and category management page.
* Deprecated the old management interface.
* Unit tests to cover the new API and core functions.
* Behat tests to cover the new interface.
2013-10-07 10:21:41 +13:00
Tim Hunt
8b9ef25ea2 MDL-32188 question CBM: use short certainty name in response summaries. 2013-10-04 21:46:47 +01:00
Tim Hunt
2bf83cb218 MDL-32188 question CBM: minimal handling of certainty -1
Certainty -1 has never been used in standard Moodle, but is
used in Tony-Gardiner Medwin's patches to mean 'No idea' which
we intend to implement: MDL-42077. In the mean time, these changes
avoid errors for people who have used TGM's patches.
2013-10-04 21:46:46 +01:00
Tim Hunt
e74aa0aa97 MDL-32188 question CBM: compute summary stats for CBM behaviours
We now compute the average CBM score, accuracy, CBM bonus and enhanced
accuracy, both for the entire quiz, and for just the questions answered.

Note that these calculations must work correctly in the presence of
descriptions, ungraded questions, and manually graded questions. For
example, imagine a essay added at the end of the quiz "Summarise what
you learned attempting this exercise." This might have max mark zero or
non-zero. The CBM statistics just ignores questions like that.
2013-10-04 17:56:36 +01:00
Tim Hunt
9b2fe16bca MDL-32188 question CBM: improve display of the certainty choices
Switch to the neutral C=1, 2, 3 mode. Also add a helpicon, and improve
line-wrapping.
2013-10-04 17:52:31 +01:00
Tim Hunt
fb74929e97 MDL-32188 question CBM: alter score handling.
We now change so that minfraction is -6 and maxfraction is 3, so getting
the question right a low certainty gives maxmark marks, and you get a
bonus for being more confident (rather than being penalised for being
unconfident). Mathematically it is the same, but the difference is
importnat psychologically.

We also change how partially correct scores are handled.
It is too harsh to penalise a partially correct score with full
certainty by doing a linear interpolation between -6 and +3. Instead,
any partially correct score (e.g. 0.5) becomes that fraction of the
correct score (e.g. 0.5 * 3 = 1.5). Also, any incorrect score is treated
as 0, so if you have a multiple choice question that normally gives a
negative score for a wrong choice, this will now never give a score of
less than -6.

Finally we change how this is displayed to students beside the question.
Rather than saying "Marked out of 1.00", we say "Base mark 1.00", and
then later we say "CBM mark 3.00" (or whatever it is).
2013-10-04 17:52:29 +01:00
Tim Hunt
7ab9ce3a3c MDL-32188 question CBM: fix hard-coded numbers -> constants. 2013-10-04 17:52:26 +01:00
Tim Hunt
c4efeb2b4b MDL-32188 question CBM: fix typos in comments.
Also one method name.
2013-10-04 17:52:24 +01:00
Tim Hunt
02d3e4d557 MDL-32188 question rendering: let behaviours control mark display.
Then use this in the CBM behaviours to change how the question marks are
displayed there.
2013-10-04 17:52:21 +01:00
Tim Hunt
4e3d829350 MDL-42105 questions: let attempts have a max fraction > 1.
This parallels question_attempt->minfraction, which allows the
fractional mark to go below zere.

This is needed to allow the certainty-base marking behaviours to work
better.
2013-10-04 17:52:19 +01:00
Tim Hunt
474aa125ca MDL-32188 quiz/question: behaviours can add to the review summary.
At the top of the quiz reivew page, there is a table that summarises
infomration about the quiz attempt as a whole. For some question
behaviours, we would like to be able to add additional information to
that summary.

This commit introduces a generic method for the behaviour to provide
summary information about an entire question usage.
2013-10-04 17:52:16 +01:00
Petr Škoda
12c92bca22 MDL-37717 warn teachers before disabling or deleting their enrolment method 2013-10-04 16:02:48 +02:00
Petr Škoda
9ebd40eddf MDL-41220 fix test_get_plugin_list_with_file 2013-10-04 16:01:04 +02:00
Tim Hunt
f3460297a9 MDL-32188 question engine: behaviour static methods -> new classes
It was always a bit of a hack to use static methods on the
qbehaviour_whatever classes to return metadata about the behaviour. It
is better design to have real qbehaviour_whatever_type classes to report
that metadata, particularly now that we are planning to add more such.

For example, inheritance works better with real classes. See, for
example, the improvements in
question_engine::get_behaviour_unused_display_options().

This change has been implemented in a backwards-compatbile way. Old
behaviours will continue to work. There will just be some developer debug
output to prompt people to upgrade their code properly.
2013-10-04 12:15:01 +01:00
Frederic Massart
eb665c34ef MDL-41611 mod_quiz: Offer to return to course when supported 2013-10-04 18:21:56 +08:00
Frederic Massart
98e9e91505 MDL-41611 mod_forum: Display inline available when supported 2013-10-04 18:21:14 +08:00
Frederic Massart
d9203fb775 MDL-41611 format_singleactivity: Only hide unnecessary elements 2013-10-04 18:21:13 +08:00
Frederic Massart
640ef17790 MDL-41611 format_singleactivity: Ignore unsupported modules 2013-10-04 18:21:13 +08:00
Juan Leyva
6a403810b9 MDL-41914 New webservice core_user_add_user_device 2013-10-04 11:43:45 +02:00
Petr Škoda
38fc013025 MDL-42040 refactor core Moodle shutdown handlers logic 2013-10-04 11:36:46 +02:00