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

1816 Commits

Author SHA1 Message Date
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
8936e902ff MDL-47377 core_grades: Behat test to cover 0 weights 2014-10-03 13:55:24 +08:00
Damyon Wiese
b96cc97606 MDL-47418 Grades: Fix debugging in behat test. 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
313e975349 MDL-47253 core_grades: set def aggregation method to Natural 
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
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
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
85bb809494 MDL-47064 Grades: Add contribution to course total to behat test. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
446467f0d3 MDL-47064 Grades: Make the contribution to total column work 
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
Simey Lameze
3c46f7e1b9 MDL-47064 core_grades: fix the calculation of contribution towards total 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
6bf696bba2 MDL-47146 core_grades: improve navigation on grade pages 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Frederic Massart
2917d45410 MDL-47146 core_grades: Behat test for Natural weights on setup screen 
Part of: MDL-46576
 2014-10-03 13:54:39 +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
Marina Glancy
ddb9c95f1f MDL-47146 core_grades: fix class names 
Class names for grade categories were the same as for the columns in the table causing errors
when selecting All/None items

Part of: MDL-46576
 2014-10-03 13:54:38 +08:00
John Okely
351c8e08a9 MDL-47006 core_grades: Fix handing of weight to aggregationcoef 
Part of MDL-46576.
 2014-10-03 13:54:07 +08:00
John Okely
d6447690bd MDL-47006 core_grades: Change category and item forms back to using 
aggregationcoef and aggregationcoef2

Part of MDL-46576.
 2014-10-03 13:54:07 +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
0281770091 MDL-47006 core_grades: Fix float formatting 
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
6dab372c89 MDL-46824 core_grades: More tests to cover drop lowest with Natural 
Part of: MDL-46576
 2014-10-03 13:54:07 +08:00
Frederic Massart
40544c9b58 MDL-46824 core_grades: Prevent user from using drop lowest/keep highest 
Part of: MDL-46576
 2014-10-03 13:54:06 +08:00
Marina Glancy
022383d3af MDL-46139 grades: show aggregation details in the user report 
Part of: MDL-46576
 2014-10-03 13:53:02 +08:00
Marina Glancy
b0e9b95911 MDL-46139 grades: adjust behat to check calculated weight 
Part of: MDL-46576
 2014-10-03 13:53:02 +08:00
Marina Glancy
d06aec10c6 MDL-46576 grades: new behat step for changing grade settings 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
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
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
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