diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 220904aac13..d940b7b321b 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -88,7 +88,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
GRADE_AGGREGATE_MAX, GRADE_AGGREGATE_MODE, GRADE_AGGREGATE_SUM);
$defaults = array('value'=>GRADE_AGGREGATE_WEIGHTED_MEAN2, 'forced'=>false, 'adv'=>false);
- $temp->add(new admin_setting_gradecat_combo('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregationhelp', 'grades'), $defaults, $options));
+ $temp->add(new admin_setting_gradecat_combo('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregation_help', 'grades'), $defaults, $options));
$temp->add(new admin_setting_configmultiselect('grade_aggregations_visible', get_string('aggregationsvisible', 'grades'),
get_string('aggregationsvisiblehelp', 'grades'), $defaultvisible, $options));
diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index d975678793b..21cd19e02cc 100644
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -46,7 +46,7 @@ class edit_category_form extends moodleform {
$mform->addRule('fullname', null, 'required', null, 'client');
$mform->addElement('select', 'aggregation', get_string('aggregation', 'grades'), $this->aggregation_options);
- $mform->setHelpButton('aggregation', array('aggregation', get_string('aggregation', 'grades'), 'grade'));
+ $mform->addHelpButton('aggregation', 'aggregation', 'grades');
if ((int)$CFG->grade_aggregation_flag & 2) {
$mform->setAdvanced('aggregation');
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index 699ef0f6977..8e1dd4260ba 100755
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -623,7 +623,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
public function get_header_cell() {
global $OUTPUT;
$headercell = clone($this->headercell);
- $headercell->text = get_string('aggregation', 'grades').$OUTPUT->old_help_icon('aggregation', 'aggregation', 'grade');
+ $headercell->text = get_string('aggregation', 'grades').$OUTPUT->help_icon('aggregation', 'grades');
return $headercell;
}
diff --git a/lang/en/grades.php b/lang/en/grades.php
index aba4c2c5204..eb9e86fd700 100755
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -77,7 +77,6 @@ $string['aggregationcoefextraweight_link'] = 'grade/aggregation';
$string['aggregationcoefweight'] = 'Item weight';
$string['aggregationcoefweight_help'] = 'The item weight is used in the category aggregation to influence the importance of the item compared with other grade items in the same category.';
$string['aggregationcoefweight_link'] = 'grade/aggregation';
-$string['aggregationhelp'] = 'Strategy used to aggregate grades across all students in a course.';
$string['aggregationposition'] = 'Aggregation position';
$string['aggregationposition_help'] = 'This setting determines whether the category and course total columns are displayed first or last in the gradebook reports.';
$string['aggregationsvisible'] = 'Available aggregation types';
diff --git a/lang/en/help/grade/aggregation.html b/lang/en/help/grade/aggregation.html
deleted file mode 100644
index 4aa0ce06278..00000000000
--- a/lang/en/help/grade/aggregation.html
+++ /dev/null
@@ -1,64 +0,0 @@
-Category aggregation
-This menu lets you choose the aggregation strategy that will be used to calculate
-each participant's overall grade for this category. The different options are explained below.
-
-The grades are first converted to percentage values (interval from 0 to 1, this is called normalisation), then aggregated using one of
-the functions below and finally converted to the associated category item's range (between Minimum grade and Maximum grade).
-
-Important: An empty grade is simply a missing gradebook entry, and could
-mean different things. For example, it could be a participant who hasn't yet submitted an assignment,
-an assignment submission not yet graded by the teacher, or a grade that has been manually deleted by
-the gradebook administrator. Caution in interpreting these "empty grades" is thus advised.
-
-
- - Mean of grades
- - The sum of all grades divided by the total number of grades.
- - A1 70/100, A2 20/80, A3 10/10, category max 100:
- (0.7 + 0.25 + 1.0)/3 = 0.65 --> 65/100
-
- - Weighted mean
- - Each grade item can be given a weight, which is then used in the arithmetic mean aggregation to influence
- the importance of each item in the overall mean.
- - A1 70/100 weight 10, A2 20/80 weight 5, A3
- 10/10 weight 3, category max 100:
(0.7*10 + 0.25*5 + 1.0*3)/18 = 0.625 --> 62.5/100
-
- - Simple weighted mean
- - The difference from Weighted mean is that weight is calculated as Maximum grade - Minimum grade
- for each item. 100 point assignment has weight 100, 10 point assignment has weight 10.
- - A1 70/100, A2 20/80, A3 10/10, category max 100:
- (0.7*100 + 0.25*80 + 1.0*10)/190 = 0.526 --> 52.6/100
-
- - Mean of grades (with extra credits)
- - Arithmetic mean with a twist. An old, now unsupported aggregation strategy provided here only
- for backward compatibility with old activities.
-
- - Median of grades
- - The middle grade (or the mean of the two middle grades) when grades are arranged in order of size. The advantage over the mean is that it is not affected by outliers (grades which are uncommonly far from the mean).
- - A1 70/100, A2 20/80, A3 10/10, category max 100:
- median(0.7 ; 0.25 ; 1.0) = 0.7 --> 70/100
-
- - Smallest grade
- - The result is the smallest grade after normalisation. It is usually used in combination with Aggregate only non-empty grades.
- - A1 70/100, A2 20/80, A3 10/10, category max 100:
- min(0.7 ; 0.25 ; 1.0) = 0.25 --> 25/100
-
- - Highest grade
- - The result is the highest grade after normalisation.
- - A1 70/100, A2 20/80, A3 10/10, category max 100:
- max(0.7 ; 0.25 ; 1.0) = 1.0 --> 100/100
-
- - Mode of grades
- - The mode is the grade that occurs the most frequently. It is more often used for non-numerical grades.
- The advantage over the mean is that it is not affected by outliers (grades which are uncommonly far from the mean).
- However it loses its meaning once there is more than one most frequently occurring grade (only one is kept), or when all
- the grades are different from each other.
- - A1 70/100, A2 35/50, A3 20/80, A4 10/10, A5 7/10 category max 100:
- mode(0.7 ; 0.7 ; 0.25 ; 1.0 ; 0.7) = 0.7 --> 70/100
-
- - Sum of grades
- - The sum of all grade values. Scale grades are ignored. This is the only type that does not convert the
- grades to percentages internally (normalisation). The Maximum grade of associated category item is calculated
- automatically as a sum of maximums from all aggregated items.
- - A1 70/100, A2 20/80, A3 10/10:
- 70 + 20 + 10 = 100/190
-