390 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Mark Nelson
430b9ef507 MDL-47058 core_grades: allow alteration of weight
Part of MDL-46576
2014-10-03 13:51:29 +08:00
Mark Nelson
268085a187 MDL-47058 core_grades: removed unnecessary print_object call
Part of MDL-46576.
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
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
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
Andrew Davis
0e99979638 MDL-20250 core_grade: added some settings to disable or hide gradebook functionality 2014-09-26 10:19:00 +08:00
Frederic Massart
ef93efbf9d MDL-46818 core_grade: Prevent form checker to catch move fields 2014-09-10 10:43:16 +08:00
Mark Nelson
742d9165b7 MDL-46818 core_grades: added YUI form change validation 2014-09-01 23:02:13 -07:00
Andrew Davis
93dbb21841 MDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None" 2014-08-11 20:15:00 +08:00
Charles Fulton
30cc5d70ce MDL-43347 grades: convert keep highest to text field 2014-06-26 07:33:07 -07:00
Charles Fulton
74dd7a3e84 MDL-43347 grades: consistent interface for drop lowest setting 2014-06-25 11:10:04 -07:00
Petr Škoda
ffe60f5bbd MDL-40910 add new core event user_graded
This event is triggered when teacher manually edits the grade in gradebook.
2014-03-29 15:34:11 +08:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor.
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
2013-10-02 12:49:30 +08:00
Eric Merrill
e3a65c9eab MDL-37973 gradebook Return a maxgrade of '-' if grade type is TEXT
Including tests for correct return from
grade_edit_tree_column_range->get_item_cell()
2013-09-19 10:21:35 -04:00
Tim Hunt
3987312883 MDL-31487 fix FEATURE_CONTROLS_GRADE_VISIBILITY for quiz.
This is a followup to MDL-18301. That fix missed the following points:

1. On the edit categories and items screens, all items had an eye-con to
control the visibility, even if the visibility was controlled by the
module.

2. Changing the visibility of a grade category change the visibility of
all items within it, even if the visibility was controlled by the
module.

3. The quiz ingored $cm->visible when controlling whether its grade item
was visible.
2013-08-08 10:03:47 +01:00
Andrew Davis
afd2efc0e8 MDL-36090 core_grade: added logging of overriding of student grades 2013-06-05 08:51:53 +08:00