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
71,161 Commits 36 Branches 519 Tags
Commit Graph

493 Commits

Author SHA1 Message Date
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
Adrian Greeve
0cf122171b MDL-46819 core_grades: Negative weights are changed to 0 
Negative weights in the natural aggregation are not currently permitted.
Any figure below zero is changed to a zero.
 2014-10-13 08:19:24 +08:00
Dan Poltawski
0835816f9e Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle 2014-10-09 07:05:09 +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
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
2e0b3490f0 MDL-40697 core_grades: trigger the grade_deleted event 2014-10-07 19:08:35 -07:00
Mark Nelson
acd25c133c MDL-40697 core_grades: trigger the user_graded event 2014-10-07 19:08:35 -07:00
Sam Hemelryk
93fad868d9 Revert "MDL-46978 gradebook: Edit grade item changes visibility of category" 
This reverts commit bad2c9b14f27e6d9a370ac6cff6b8b5c2dc79a17.
 2014-10-08 10:37:12 +13:00
Frederic Massart
26331e3d17 MDL-46647 core_grades: Adding tests for fetch_all_helper() 2014-10-07 15:23:05 +08:00
Eloy Lafuente (stronk7)
eadcdee936 MDL-46647 grades: Fix fetch_all_helper() towards cross-db 
That helper, used to fetch information from DB by all the grade_object
chidren classes was not behaving properly handling TEXT/CLOB columns.

Instead of creating a property within every class listing the
existing columns, it seems to be a better solution to instrospect
the database metadata (cached) to ensure the correct SQL is generated
in every case.
 2014-10-07 10:44:08 +08:00
Sam Hemelryk
f46606936a Merge branch 'MDL-46978' of https://github.com/danielneis/moodle 2014-10-07 10:26:05 +13:00
Frederic Massart
0b2e8ae07b MDL-47430 core_grades: Handle negative grademin with natural weighting 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
11c93e286b MDL-47110 Grades: Get the autoupdateweight behat tests to pass. 
Part of: MDL-46576
 2014-10-03 13:55:24 +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
f70da024c8 MDL-47110 core_grades: Update to auto_adjust_weights 
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
Frederic Massart
64055d50bc MDL-47377 core_grades: Handle items with a weight of 0 
They do not contribute to the category/course total any more.

Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
c529f4b30f MDL-47420 Grades: Get unit tests passing on natural grading branch 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
6077a4d43b MDL-47064 Grades: Final fix - set the grademax from the item, not the cat 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
ee07a54be0 MDL-47064 Grades: Peer review cleanups 
Changes include:
 * Search for existing items to reduce DB queries in grade_category::aggregate_grades
 * Comments improvements
 * Move brackets to be part of lang string
 * Convert aggregationhints to be a class variable instead of passing it around

Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
6070e53313 MDL-47064 Grades: Add comments to explain this tricky code. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
852fae0b71 MDL-47064 Grades: Fix contribution column for other types of aggregation 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
53771c404f MDL-47064 Grades: Fix the contributed weights column for students and teachers. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
John Okely
61e521bb09 MDL-47006 core_grades: Add weightoverride to qualifies_for_regrading 
Part of MDL-46576
 2014-10-03 13:54:07 +08:00
John Okely
b6a1e366a7 MDL-46576 core_grades: MDL-47006 Refactor weightings code for readibility 2014-10-03 13:54:07 +08:00
Frederic Massart
ded8ea8fd1 MDL-46824 core_grades: Only display 'Drop n lowest' when supported 
Part of: MDL-46576
 2014-10-03 13:54:07 +08:00
Frederic Massart
4272386a7d MDL-46824 core_grades: Control when drop lowest/keep highest is allowed 
Part of: MDL-46576
 2014-10-03 13:54:06 +08:00
Damyon Wiese
90cc8ce7c4 MDL-47059 Grades: Update the grade_grade if the finalgrade/or the grademax has changed. 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
1577229f93 MDL-47059 Grades: Make natural weights work with extra credit 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
057063b1e6 MDL-47059 Grades: Make natural weights work with exclude empty grades 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
5a59aeb14e MDL-47078 Grades: Allow users to have different max grades due to exclusions etc. 
This is about making this work with natural weightings.

Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
a2c13f686a MDL-47009 Grades: Improve natural weighting algorithm 
It's still not perfect, but this is getting closer.

This is based on Johns work on MDL-47009 (just the algorithm). There are some additional
changes to scale the weights if they do not add up to 1.

Part of: MDL-46576
 2014-10-03 13:53:01 +08:00