mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
77,213 Commits 36 Branches 519 Tags
Commit Graph

372 Commits

Author SHA1 Message Date
Cameron Ball
fa8e27b32b MDL-52522 grades: Add rescale grades option for grade categories. 
When a grade category is overridden, it starts to behave like a regular grade item.
Therefore we need similar behaviour to what was implemented in MDL-48634.
 2016-03-08 16:26:44 +08:00
Andrew Nicols
87d71ecf69 MDL-49324 grade: Ensure weights adjusted message is displayed 
The grade settings page displays a message to inform users that weights
have been adjusted if they did not previously add up to the required 100%.

With the change to sometimes displaying a progress bar, whether the message
is displayed must be calculated immediately after the regrade took place,
and before the page redirects.

I have added a callback with arguments to the regrade_if_required function
which is called immediately after regrade has taken place (regardless of
whether the progress bar is required).

This callback modifies the PAGE URL such that the redirect message will be
displayed after the redirect. This does not use the session as the message
should only be displayed immediately after a change. If the user does not
click on the continue button after the progress bar has been displayed, and
comes back to the page later, this may be confusing.
 2016-02-24 14:39:09 +08:00
Andrew Nicols
417c7f3b86 MDL-49324 grades: Remove category aggregation change backend 
The UI for this was removed several releases ago and this code is no longer
called.
 2016-02-24 14:39:09 +08:00
Andrew Nicols
0a802c9c4e MDL-49324 grades: Create helper function for regrading on report view 2016-02-24 14:39:08 +08:00
Damyon Wiese
30be6c846a MDL-49324 Grades: Use a progress bar when recalculating gradebook grades 2016-02-23 08:35:10 +08:00
David Monllao
a6f4866e52 Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle 2016-02-17 09:49:04 +08:00
Mark Nelson
664d8be7ea MDL-48634 core: prevent change of grade values when necessary 
Three additional checks have been added.

Once grades have been recorded for the activity/grade item -

1) Do not allow the grade type to be changed.
2) Do not allow the scale to be changed.
3) If we are using ratings do not allow the 'Maximum points'
value to be changed.

Also reordered form elements, removed form elements that
were not necessary, added and changed existing language
strings to improve the overall UI.
 2016-02-09 17:46:42 +08:00
Jun Pataleta
825a3fa9d1 MDL-48015 grade: Fix the display of grade categories 2016-02-09 13:32:28 +08:00
Damyon Wiese
e7c71c189b MDL-48634 grades: Make the rescaling option required if maxgrade changes 2016-02-05 18:20:17 +08:00
Damyon Wiese
d629c601c5 MDL-48634 grades: Add an option to rescale when changing the maxgrade 2016-02-05 18:20:17 +08:00
Mark Nelson
53914e4465 MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup' 2015-09-14 08:23:32 +08:00
Frederic Massart
5419cbc9eb MDL-50062 grades: Carry agg. settings between categories when possible 2015-08-06 10:24:25 +08:00
Dave Cooper
135efd5116 MDL-50062 gradebook: Fixed behaviour when changing aggregation mathods. 2015-08-06 10:24:25 +08:00
Eloy Lafuente (stronk7)
b164e2ec30 Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle 2015-07-09 20:24:13 +02:00
Adrian Greeve
4d4dcc2718 MDL-48239 gradebook: Calculated grades maxgrade now able to be set. 2015-07-02 11:13:25 +08:00
Ankit Agarwal
2149326b8c MDL-50049 deprecation: Remove usage of deprecated api and cleanup 2015-06-29 17:15:50 +05:30
Martin Mastny
5c3b5143dc MDL-49281 grades: Calculation settings upgraded 2015-04-30 13:42:19 +08:00
Eric Merrill
3f874a9d24 MDL-48711 gradebook: Properly compute extra-redit status for cat grades 
When seeing if a grade item for a category is computed for extra-credit
status, we need to use the *grandparent* of the item.
 2015-01-20 16:06:38 -05:00
Zachary Durber
3712ee3ed0 MDL-47610 gradebook: Show extra credit icon in grades column 2014-12-16 09:16:41 +08:00
Andrew Nicols
41e62a9093 MDL-47349 gradereport: Use category title on report 2014-10-30 09:53:36 +08:00
Dan Poltawski
31d6d2ae41 Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle 2014-10-28 11:40:27 +00:00
Frederic Massart
f2823ec4bc MDL-47839 core_grades: Minor styling improvements to setup/user report 2014-10-27 15:59:21 +08:00
Frederic Massart
8b5c454562 MDL-47703 core_grades: Prevent use of weights with non-aggregated scales 2014-10-27 11:23:54 +08:00
Dan Poltawski
519fd3dd4c Merge branch 'wip-MDL-47760-master' of git://github.com/marinaglancy/moodle 2014-10-24 15:18:32 +01:00
Marina Glancy
079b2e5202 MDL-47542 core_grades: action menu for grade setup 2014-10-24 11:49:19 +02:00
Frederic Massart
6aeebc259a MDL-47637 core_grades: Outcomes must not be weighted when non aggregated 2014-10-22 14:58:17 +08:00
Marina Glancy
82c662d347 MDL-47760 grades: dim category name if hidden 2014-10-20 14:02:25 +08:00
Damyon Wiese
47d6e6a7d3 MDL-47503 Grades: Completely remove aggregationsubcats 
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
 2014-10-20 12:03:18 +08:00
Frederic Massart
f8c8f980c7 MDL-47681 core_grades: Ignore weights of grade items 'none' or 'text' 
It can happen that some grade items with the type 'None' have a max
grade different than 0, in which case we would have set a weight for
them which is wrong as they must not have any. This patch always
ignores the grade items 'None' and 'Text' when calculating the
weights and locks the weight UI fields for those items too.
 2014-10-16 18:42:27 +08:00
John Okely
044a298e6f MDL-47392 core_grades: Consolidate grade item weight setting location 2014-10-16 15:21:53 +08:00
John Okely
5e18456631 MDL-47243 core_grades: Allow extra credit on outcome grade items 2014-10-15 14:33:31 +08:00
John Okely
c53708d9c0 MDL-47243 core_grades: Add weight settings to outcome edit page 2014-10-15 14:33:31 +08: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
eb84b77923 MDL-47543 core_grades: improve navigation menu in grade administration 2014-10-08 15:03:36 +08:00
Marina Glancy
2be0d5c3ed MDL-47541 core_grades: hints about aggregation settings on setup page 
Also do not indicate 'Natural' aggregation method
 2014-10-08 15:03:32 +08:00
Mark Nelson
c09e6fa3e3 MDL-40697 core_grades: removed existing user_graded event triggers 2014-10-07 19:04:10 -07:00
Marina Glancy
d75a2367c3 MDL-47520 core_grades: added CSS classes to the setup page 
Part of: MDL-46576
 2014-10-03 17:06:41 +08:00
Damyon Wiese
e61f25a4f8 MDL-47110 Grades: Change how updated weights notifications are detected. 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Adrian Greeve
519429b24f MDL-47110 core_grades: Normalisation of grade weights. 
This includes behat tests for this change.

Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Marina Glancy
290ddb7317 MDL-47253 core_grades: display scale in Natural setup 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Marina Glancy
663949e652 MDL-47417 core_grades: reset grademax when switching from Natural 
in Natural aggregation method the grademax is automatically adjusted
when switching to another aggregation method it should be reset
to 100
 2014-10-03 13:55:23 +08:00
Frederic Massart
b0c91d7271 MDL-47146 core_grades: Improve labels of the fields on setup screen 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Frederic Massart
6c37563e00 MDL-47146 core_grades: Use a checkbox to override weights 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
6723bc66e1 MDL-47146 core_grades: correcly align the select column 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
b79bf7a234 MDL-47146 core_grades: Removed unused setup columns 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
bfc8c1d4d6 MDL-47146 core_grades: change columns on setup page 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
2e3ec2af02 MDL-47146 core_grades: change action buttons on setup screen 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
513d2118dd MDL-47146 core_grades: fix navigation bar in grades setup pages 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
912d19908a MDL-47146 core_grades: remove advanced mode in setup 
Part of: MDL-46576
 2014-10-03 13:54:38 +08: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