524 Commits

Author SHA1 Message Date
Andrew Nicols
37f9c6a2d6 Merge branch 'MDL-53301_master' of git://github.com/dmonllao/moodle 2016-03-15 15:50:15 +08:00
Andrew Nicols
97a3b6d23d Merge branch 'MDL-48838_master' of git://github.com/dmonllao/moodle 2016-03-15 12:06:48 +08:00
David Monllao
28774c9263 MDL-48838 grades: New grade_categories cache 2016-03-14 11:20:35 +08:00
David Monllao
edeafdd0e7 MDL-53252 grades: Skip user regrading if only feedback changes 2016-03-14 08:18:28 +08:00
David Monllao
488366bed8 MDL-53301 grades: Update gradeitems aggregationcoef2 only when required 2016-03-14 08:08:39 +08:00
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
Damyon Wiese
3c4cf9f02b MDL-48634 grades: Remove hardcoded hack in grade book
This was testing specifically for mod_assign - now we can test to see if
an activity provides it's own rescaling function.
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
Dan Poltawski
61c8abfb1e Merge branch 'MDL-51715_master_invalidweights' of https://github.com/colin-umn/moodle 2016-01-19 10:39:48 +00:00
Peter Miller
f3460b0fc6 MDL-52078 gradebook: Stop totals including hidden items.
This patch fixes a problem where the course and user reports, when viewed by
a student, were incorrectly including hidden grade items in the course totals,
making the percentages lower than they should be.
2016-01-04 17:53:06 +08:00
Colin Campbell
7006ab3eb7 MDL-51715 lib/grade: Unit test for aggregationweight 2015-11-02 10:15:05 -06:00
Colin Campbell
70ba1f6bcb MDL-51715 lib/grade: Zero out aggregationweight for novalue and dropped
set_usedinaggregation was setting aggregationweight to zero in these
cases for non-category grades, but not for category grades.
2015-11-02 10:14:50 -06:00
Sam Chaffee
84ab39cf77 MDL-51514 gradebook: Optimize set_usedinaggregation query for MySQL 2015-10-02 11:28:15 -06:00
Mark Nielsen
5f6e2fc9d3 MDL-51498 core_grades: Prevent unnecessary grade record fetching
All of these changes make use of already
fetched grade data.  Without these changes,
the gradebook regrade process does not scale
well with very large courses because it fetches
many grade records, one at a time.
2015-09-22 12:04:28 -07:00
Eloy Lafuente (stronk7)
4deecee44f Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle 2015-09-15 23:12:22 +02:00
Mark Nelson
53914e4465 MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup' 2015-09-14 08:23:32 +08:00
Marina Glancy
278b8d18a2 MDL-50892 mod: allow activity to have name '0' 2015-09-11 10:51:52 +08:00
Eloy Lafuente (stronk7)
28a614a83f Merge branch 'MDL-50371' of https://github.com/danielneis/moodle 2015-08-13 00:38:41 +02:00
Eloy Lafuente (stronk7)
20c50b0d5c Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle 2015-08-12 01:52:04 +02:00
Frederic Massart
01a088e0a2 MDL-50062 grades: Tests for item::set_aggregation_fields_for_aggregation 2015-08-06 10:24:25 +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
Daniel Neis Araujo
b6d1812dd7 MDL-50371 gradebook: gradepointdefault for manual itens and categories 2015-07-29 17:08:27 -03:00
Adrian Greeve
6a7c8feb10 MDL-48239 gradebook: Change to calculated grade item min and max.
Regardless of the setting 'Min and max grades used in calculation'
Calculated grade items will always update the min and max raw grade.
2015-07-02 11:13:26 +08:00
Adrian Greeve
4d4dcc2718 MDL-48239 gradebook: Calculated grades maxgrade now able to be set. 2015-07-02 11:13:25 +08:00
Marina Glancy
156d048659 MDL-49257 grades: fix bugs with extra credit weights
When we adjust the weights in natural grading (setup screen), the extra credit items
should not depend on other overrides. If extra credit item's weight was overriden, it stays as it is.
Otherwise it is calculated as itemgrademax / totalgrademax (total excludes extra credit items)
2015-06-23 14:25:50 +08:00
Frederic Massart
2eb4a83c29 MDL-48618 grades: Unit tests for grade_grade::get_min/max_grade() 2015-06-10 12:33:41 +08:00
Frederic Massart
ebea19cb26 MDL-48618 grades: Handling of inconsistencies due to min/max grades 2015-06-10 12:33:41 +08:00
Eric Merrill
c07775dfff MDL-48618 gradebook: Only use individual min/max for aggrigate grades 2015-06-05 17:05:24 +08:00
Eric Merrill
4ea7da7828 MDL-47911 gradebook: Improve the performance of set_usedinaggregation
This function is called many many times during grade calculation, so it
should be as efficient as possible.
2015-02-27 09:46:34 +08:00
Eric Merrill
fdeda649e2 MDL-48655 gradebook: Don't treat a scale with a gradepass of 0 as passed 2014-12-18 16:17:52 -05: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
8b5c454562 MDL-47703 core_grades: Prevent use of weights with non-aggregated scales 2014-10-27 11:23:54 +08:00
Dan Poltawski
7dc62ed3cb Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle 2014-10-24 14:30:44 +01:00
Dan Poltawski
f335c9a1f1 Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:15 +02:00
Marina Glancy
3824556c9a Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle 2014-10-24 11:48:06 +02:00
Damyon Wiese
edffadfd1c MDL-47763 Grades: Handle the case when a grade category is hidden.
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
2014-10-24 11:48:05 +02:00
Adrian Greeve
cd5c7965e0 MDL-47676 core_grades: Negative positive weight combo working.
The combination of negative and positive weights was not normalising
properly.
2014-10-24 08:43:16 +08: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
2d2661e3d7 Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle 2014-10-20 17:08:20 +08:00
Frederic Massart
8427dc3a23 MDL-47489 core_grades: Adjust weights of extra credit items for Simple 2014-10-20 13:52:18 +08:00
Frederic Massart
e8ac04c191 MDL-47489 core_grades: Adjust weights of extra credit items for Mean 2014-10-20 13:52:17 +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
86974893c8 MDL-47489 core_grades: Adjust weights of extra credit items for Natural 2014-10-20 11:50:43 +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
Damyon Wiese
ba0d27735a MDL-47704 Grades: Fix for set_usedinaggregation
Used in aggregation was not resetting previously set values
when recalculating an aggregation. This meant that items no longer
in the aggregation, were displayed with stale weights in the user report.
2014-10-16 17:14:02 +08:00
Dan Poltawski
4f639ec86b Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle 2014-10-14 19:11:57 +01:00
Dan Poltawski
1b07195b28 Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle 2014-10-14 19:00:28 +01:00
Frederic Massart
09171b955e MDL-38732 gradereport_grader: Handle simultaneous graders 2014-10-14 13:52:42 +08:00
Frederic Massart
21dd684207 MDL-47463 core_grades: Behat checks the contribution of scales 2014-10-13 16:01:32 +08:00