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

564 Commits

Author SHA1 Message Date
Frederic Massart
ebea19cb26 MDL-48618 grades: Handling of inconsistencies due to min/max grades 2015-06-10 12:33:41 +08:00
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
Sam Hemelryk
cb2cf2fed3 MDL-48189 grade: letters now covered by behat 2014-11-19 11:57:19 +13:00
Gilles-Philippe Leblanc
af14ef657a MDL-47501 gradebook: Add an indication that the grade letters was overridden 2014-11-18 17:13:40 +00:00
Frederic Massart
b53a658b26 MDL-39692 grade: Little code clean up of letter boundary deletion 2014-11-10 13:00:01 +08:00
Huy Hoang
1d693611e5 MDL-39692 grade: Ability to delete letter boundary 2014-11-10 12:14:31 +08:00
Damyon Wiese
f6b7d7322a Merge branch 'MDL-26447_master' of https://github.com/crazyserver/moodle 2014-11-03 13:50:38 +08:00
pau.ferrer-ocana
afa0968d5d MDL-26447 gradebook: Default gradedisplaytype fixed for all locales 2014-10-30 09:43:43 +01: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
Dan Poltawski
f335c9a1f1 Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:15 +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
Damyon Wiese
a9a02e9170 MDL-20367 Grades: Allow real numbers as grade boundaries 
Patch by Huy Hoang (I just git-ified it).
 2014-10-21 11:15:39 +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
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
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