mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-01 14:09:01 +02:00
Code Issues Projects Releases Wiki Activity
70,307 Commits 37 Branches 536 Tags
Commit Graph

478 Commits

Author SHA1 Message Date
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
Frederic Massart
825fba1c5b MDL-47274 core_grades: Correct totals when excluding hidden items 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
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
Andrew Davis
b14c5870fb MDL-47055 core_grade: implemented support for extra credit within natural weighting 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
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
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
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