Commit graph

70291 commits

Author SHA1 Message Date
Frederic Massart
fcf6e01517 MDL-47056 core_grades: Prevent items being displayed as 'Error'
Before this patch we would be marking some items as 'needsupdate'
during an update. Leaving them aside and not effectively updating
them.

Part of: MDL-46576
2014-10-03 13:51:30 +08:00
Frederic Massart
32ee0f83ae MDL-47260 core_grades: Prevent notices when setting up other aggregation method
This partially reverts:

- 4927c3ff (MDL-47011)
- 6484d460 (MDL-47055)

Part of: MDL-46576
2014-10-03 13:51:30 +08:00
Marina Glancy
ab17b4f3c8 MDL-46139 core_grades: adjust behat tests
Part of MDL-46576
2014-10-03 13:51:30 +08:00
Marina Glancy
ae5ba1d74d MDL-46797 core_grades: adjust behat tests
Part of MDL-46576
2014-10-03 13:51:30 +08:00
Marina Glancy
79fbab4d04 MDL-46966 core_grades: adjust behat tests
Part of MDL-46797
2014-10-03 13:51:30 +08:00
Frederic Massart
276690035f MDL-47098 core_grades: Fields to adjust a category's weight 2014-10-03 13:51:29 +08:00
Andrew Davis
25bffb950d MDL-47055 core_grade: fixed extra credit handling on the full setup page 2014-10-03 13:51:29 +08:00
Frederic Massart
ae93f35317 MDL-46827 core_grades: Allow reset of weights on categories 2014-10-03 13:51:29 +08:00
Barbara Ramiro
c93cf01da7 MDL-46827 usability: New icon for reset actions 2014-10-03 13:51:29 +08:00
Jetha Chan
200e5173c0 MDL-47007 core_grade: weights now shown on edit screen as percentages 2014-10-03 13:51:29 +08:00
Andrew Davis
b14c5870fb MDL-47055 core_grade: implemented support for extra credit within natural weighting 2014-10-03 13:51:29 +08:00
Mark Nelson
430b9ef507 MDL-47058 core_grades: allow alteration of weight
Part of MDL-46576
2014-10-03 13:51:29 +08:00
Mark Nelson
268085a187 MDL-47058 core_grades: removed unnecessary print_object call
Part of MDL-46576.
2014-10-03 13:51:29 +08:00
John Okely
d57ea5996d MDL-46576 core_grade: Simplify code, remove obsolete calculations 2014-10-03 13:51:29 +08:00
John Okely
11eca362e2 MDL-46576: Fix natural weight maximums aggregation (MDL-47009) 2014-10-03 13:51:29 +08:00
John Okely
aa7055290e MDL-46576: Update reports so that they display natural weights properly (MDL-47009) 2014-10-03 13:51:29 +08:00
Andrew Davis
64b03e5bd7 MDL-47011 core_grade: added ability to un-override grade_item weight 2014-10-03 13:49:41 +08:00
Andrew Davis
f8259c2fbf MDL-46966 core_grade: altered the default value of grade_aggregations_visible so only natural is on by default 2014-10-03 13:49:41 +08:00
Andrew Davis
45da536113 MDL-47011 core_grade: added the ability to override grade_item weight 2014-10-03 13:49:41 +08:00
Andrew Davis
a2f1f65db4 MDL-47011 core_grade: added naive natural weight calculation to gradebook 2014-10-03 13:49:22 +08:00
John Okely
677bc07377 MDL-46576 core_grades: Add weights to natural (MDL-47006) 2014-10-03 13:49:22 +08:00
John Okely
b5e00814b3 MDL-46576 code_grade: Rename "Sum of grades" aggregation to "Natural" 2014-10-03 13:48:55 +08:00
Damyon Wiese
7eb0b9c44b MDL-46139 Grades: Add behat tests for the new columns in the user report 2014-10-03 13:48:55 +08:00
Damyon Wiese
8836ef8aa2 MDL-46139 Grades: Add new grade_grades aggregation columns to backup/restore. 2014-10-03 13:48:55 +08:00
Damyon Wiese
a1740d7b48 MDL-46139 Grades: Change usedinaggregation column to 2 columns for status and weight. 2014-10-03 13:48:55 +08:00
Damyon Wiese
dadc9d991d MDL-46139 Grades: Add contibution to course total column to user report 2014-10-03 13:47:42 +08:00
Damyon Wiese
65c2ac9334 MDL-46139 Grades: Show the aggregation details in the user report. 2014-10-03 13:47:42 +08:00
Damyon Wiese
9dd8088255 MDL-46139 Grades: Show the aggregation method in the alt text for the icon. 2014-10-03 13:47:42 +08:00
Damyon Wiese
bfe969e8b3 MDL-46139 Grades: Add a column to grade_grades to record how a grade is aggregated 2014-10-03 13:47:42 +08:00
Damyon Wiese
2e19f5e8e7 MDL-46139 Grades: Language change "weight -> calculated weight" 2014-10-03 13:47:41 +08:00
Andrew Nicols
c87b87e62f MDL-36460 mod_forum: Restrict forum subsription list based on availability info 2014-10-03 08:20:24 +08:00
Rex Lorenzo
7cd004e285 MDL-47518 report_log: Logfiles of single users no longer accessible
* Removing join on courseid if it is the SITEID.
2014-10-02 16:33:52 -07:00
Tim Hunt
50b5dde8d1 MDL-28075 question editing: tidy code
Remove an unnecessary else (the if, and else if, always end in a redirect)
and unindent that code.
2014-10-02 22:03:12 +01:00
Tim Hunt
04bf7ac857 MDL-28075 question editing: sort out nav bar when editing in a quiz
If you edited a question from the Edit quiz page in a quiz, the navigation
bar was far too long. This was due to some odd code that was trying too
hard to be clever.

Instead, editing a question is now always treated as being logically within
the question bank for the purposes of navigation. That is, even if the
returnurl will end up taking you back to where you where when you have finished.
2014-10-02 22:03:12 +01:00
Sam Hemelryk
bae30ef320 MDL-46481 backup: behat tests for the quick backup button 2014-10-03 09:43:08 +13:00
Sam Hemelryk
f3973676e8 MDL-46481 backup: implemented quick backup process (one click) 2014-10-03 09:43:08 +13: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
Tim Hunt
a75fa4c068 MDL-47476 qformat_learnwise: rest in peace.
Learnwise was an old LMS that no longer exists. (Last reference found on
Google from 2009.) So we are removing the ability to import questions in
that format.
2014-10-02 17:16:16 +01:00
Tim Hunt
482ca72089 MDL-47426 assign local roles: rewrite query for better performance.
This is an extremely dangerous query, because it includes the user
table twice, along-side two other potentially large tables,
role_assignments and user_enrolments.

The solution is to rewrite the query so that:

1. The subquery is JOINed, not WHERE ... INed. Typically query
   optimisers handle the JOIN case better.

2. Before the join was role-assignments <-> users <-> subquery.
   That is, everything was linked to u.id.

   Now the linking is role-assignments <-> subquery <-> users,
   so the SELECT DISTINT eu1_u.id FROM {enrolled users} is central.
   That seems to send a strong hint to the query optimiser about
   a good order to execute the query.
2014-10-02 17:10:40 +01:00
Dan Poltawski
6597413d41 weekly release 2.8dev 2014-10-02 15:18:52 +01:00
Dan Poltawski
9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Dan Poltawski
356e857bbb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-02 15:18:48 +01:00
sam marshall
80ee9add2d MDL-47481 Availability: Profile condition error if no users 2014-10-02 10:39:20 +01:00
Dan Poltawski
7e704313d2 Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle 2014-10-02 09:48:25 +01:00
Dan Poltawski
2e8101f6e6 Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle 2014-10-02 09:35:30 +01:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses"
This reverts commit d92f768baa.
2014-10-02 09:09:16 +01:00
Sam Hemelryk
454034351b Revert "MDL-47395 added cli_error() visual cue"
This reverts commit eb60c78c77.
2014-10-02 17:39:49 +13:00
Sam Hemelryk
251089fe44 Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle 2014-10-02 17:30:47 +13:00
Dmitry Nefedov
66b864c797 MDL-47408 user: Add checking before adding blog's link.
Checking enableblogs  and bloglevel, userid, constant  BLOG_USER_LEVEL.
2014-10-02 12:17:14 +08:00
Andrew Nicols
390485058e MDL-46282 core: Correct deletion of message datakeys
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-02 11:50:34 +08:00