L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-21695 gradebook: Extra credit help strings

Browse Source 
String aggregationcoefextraweight is used when editing an item which is
aggregated by Mean of grades (with extra credit) and was reworded to
Extra credit weight (because in fact it is the weight of the extra
credit - if it equals zero, the grade is not extra)

String aggregationcoefextrasum is used for Sum of grades and Simple
weighted mean of grades, meaning a checkbox extra credit yes/no

String aggregationcoefextra is used in the header of table Categories
and items (either Simple view or Full view). It must contain the information
about both meanings of aggregation.

AMOS BEGIN
 HLP grade/aggregationcoefcombo.html,[aggregationcoefextra_help,core_grades]
 HLP grade/aggregationcoefextra.html,[aggregationcoefextraweight_help,core_grades]
 HLP grade/aggregationcoefextrasum.html,[aggregationcoefextrasum_help,core_grades]
AMOS END
This commit is contained in:
David Mudrak
2010-05-21 13:46:28 +00:00
parent 75dc321807
commit 3869ab1ac6
9 changed files with 17 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/edit/tree/category_form.php
+1 -1
View File
@@ -439,7 +439,7 @@ class edit_category_form extends moodleform {
$element =& $mform->createElement('text', 'grade_item_aggregationcoef', get_string($coefstring, 'grades'));
}
$mform->insertElementBefore($element, 'parentcategory');
$mform->setHelpButton('grade_item_aggregationcoef', array($coefstring, get_string($coefstring, 'grades'), 'grade'), true);
$mform->addHelpButton('grade_item_aggregationcoef', $coefstring, 'grades');
}
}
}
grade/edit/tree/item_form.php
+1 -1
View File
@@ -257,7 +257,7 @@ class edit_item_form extends moodleform {
} else {
$mform->insertElementBefore($element, 'id');
}
$mform->setHelpButton('aggregationcoef', array($coefstring, get_string($coefstring, 'grades'), 'grade'), true);
$mform->addHelpButton('aggregationcoef', $coefstring, 'grades');
}
$mform->disabledIf('aggregationcoef', 'parentcategory', 'eq', $parent_category->id);
grade/edit/tree/lib.php
+4 -4
View File
@@ -365,7 +365,7 @@ class grade_edit_tree {
$aggcoef = $item->get_coefstring();
if ((($aggcoef == 'aggregationcoefweight' || $aggcoef == 'aggregationcoef') && $type == 'weight') ||
($aggcoef == 'aggregationcoefextra' && $type == 'extra')) {
($aggcoef == 'aggregationcoefextraweight' && $type == 'extra')) {
return '<input type="text" size="6" id="aggregationcoef_'.$item->id.'" name="aggregationcoef_'.$item->id.'"
value="'.format_float($item->aggregationcoef, 4).'" />';
} elseif ($aggcoef == 'aggregationcoefextrasum' && $type == 'extra') {
@@ -460,7 +460,7 @@ class grade_edit_tree {
if ($element['type'] == 'category') {
if ($coefstring == 'aggregationcoefweight') {
$this->uses_weight = true;
} elseif ($coefstring == 'aggregationcoefextra' || $coefstring == 'aggregationcoefextrasum') {
} elseif ($coefstring == 'aggregationcoefextraweight' || $coefstring == 'aggregationcoefextrasum') {
$this->uses_extra_credit = true;
}
@@ -679,7 +679,7 @@ class grade_edit_tree_column_extracredit extends grade_edit_tree_column {
public function get_header_cell() {
global $OUTPUT;
$headercell = clone($this->headercell);
$headercell->text = get_string('extracredit', 'grades').$OUTPUT->old_help_icon('aggregationcoefcombo', 'aggregationcoefcombo', 'grade');
$headercell->text = get_string('aggregationcoefextra', 'grades').$OUTPUT->help_icon('aggregationcoefextra', 'grades');
return $headercell;
}
@@ -721,7 +721,7 @@ class grade_edit_tree_column_weight extends grade_edit_tree_column {
public function get_header_cell() {
global $OUTPUT;
$headercell = clone($this->headercell);
$headercell->text = get_string('weightuc', 'grades').$OUTPUT->old_help_icon('aggregationcoefweight', 'aggregationcoefweight', 'grade');
$headercell->text = get_string('weightuc', 'grades').$OUTPUT->help_icon('aggregationcoefweight', 'grades');
return $headercell;
}
grade/edit/tree/outcomeitem_form.php
+2 -2
View File
@@ -102,7 +102,7 @@ class edit_outcomeitem_form extends moodleform {
$coefstring = ($coefstring=='' or $coefstring=='aggregationcoefextrasum') ? 'aggregationcoefextrasum' : 'aggregationcoef';
} else if ($cat->aggregation == GRADE_AGGREGATE_EXTRACREDIT_MEAN) {
$coefstring = ($coefstring=='' or $coefstring=='aggregationcoefextra') ? 'aggregationcoefextra' : 'aggregationcoef';
$coefstring = ($coefstring=='' or $coefstring=='aggregationcoefextraweight') ? 'aggregationcoefextraweight' : 'aggregationcoef';
} else if ($cat->aggregation == GRADE_AGGREGATE_SUM) {
$coefstring = ($coefstring=='' or $coefstring=='aggregationcoefextrasum') ? 'aggregationcoefextrasum' : 'aggregationcoef';
@@ -204,7 +204,7 @@ class edit_outcomeitem_form extends moodleform {
$aggcoef = 'aggregationcoefextrasum';
} else if ($parent_category->aggregation == GRADE_AGGREGATE_EXTRACREDIT_MEAN) {
$aggcoef = 'aggregationcoefextra';
$aggcoef = 'aggregationcoefextraweight';
} else if ($parent_category->aggregation == GRADE_AGGREGATE_SUM) {
$aggcoef = 'aggregationcoefextrasum';
lang/en/grades.php
+8 -6
View File
@@ -63,14 +63,17 @@ $string['aggregation_help'] = 'The aggregation determines how grades in a catego
* Sum of grades - The sum of all grade values, with scale grades being ignored';
$string['aggregation_link'] = 'grade/aggregation';
$string['aggregationcoef'] = 'Aggregation coefficient';
$string['aggregationcoefextra'] = 'Extra credit';
$string['aggregationcoefextra_help'] = 'If the aggregation is Sum of grades and the extra credit checkbox is ticked, the grade item\'s maximum grade is not added to the category\'s maximum grade, resulting in the possibility of achieving the maximum grade (or grades over the maximum if enabled by the site administrator) in the category without having the maximum grade in all the grade items.
$string['aggregationcoefextra'] = 'Extra credit'; // for the header of the table at Edit categories and items page
$string['aggregationcoefextra_help'] = 'If the aggregation is Sum of grades or Simple weighted mean and the extra credit checkbox is ticked, the grade item\'s maximum grade is not added to the category\'s maximum grade, resulting in the possibility of achieving the maximum grade (or grades over the maximum if enabled by the site administrator) in the category without having the maximum grade in all the grade items.
If the aggregation is Mean of grades (with extra credits) and the extra credit is set to a value greater than zero, the extra credit is the factor by which the grade is multiplied before adding it to the total after the computation of the mean.';
$string['aggregationcoefextra_link'] = 'grade/aggregation';
$string['aggregationcoefextrahelp'] = 'Extra credit for this grade item during aggregation.';
$string['aggregationcoefextrasum'] = 'Extra credit';
$string['aggregationcoefextrasumhelp'] = 'Extra credit for this grade item during aggregation.';
$string['aggregationcoefextrasum'] = 'Extra credit'; // for the form with checkboxes: Sum of grades or Simple weighted mean
$string['aggregationcoefextrasum_help'] = 'If the extra credit checkbox is ticked, the grade item\'s maximum grade is not added to the category\'s maximum grade, resulting in the possibility of achieving the maximum grade (or grades over the maximum if enabled by the site administrator) in the category without having the maximum grade in all the grade items.';
$string['aggregationcoefextrasum_link'] = 'grade/aggregation';
$string['aggregationcoefextraweight'] = 'Extra credit weight'; // for the form with input: Mean of grades (with extra credits) only
$string['aggregationcoefextraweight_help'] = 'If the extra credit weight is set to a value greater than zero, the grade acts as extra credit during aggregation. The number is the factor by which the grade is multiplied before adding it to the total for the computation of the mean.';
$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';
@@ -235,7 +238,6 @@ $string['exportfeedback'] = 'Include feedback in export';
$string['exportplugins'] = 'Export plugins';
$string['exportsettings'] = 'Export settings';
$string['exportto'] = 'Export to';
$string['extracredit'] = 'Extra Credit';
$string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total';
$string['feedback'] = 'Feedback';
$string['feedback_help'] = 'This box enables any comments about the grade to be added.';
lang/en/help/grade/aggregationcoefcombo.html
-25
View File
@@ -1,25 +0,0 @@
<h1>Extra credit</h1>
<h2>For Sum of Grades aggregation</h2>
<p>When the "Sum of grades" aggregation strategy is used, a grade item can act as Extra credit for the category. This means that the grade item's maximum grade will not be added to the category total's maximum grade, but the item's grade will. Following is an example:</p>
<ul>
<li>Item 1 is graded 0-100</li>
<li>Item 2 is graded 0-75</li>
<li>Item 1 has the "Act as extra credit" checkbox ticked, Item 2 doesn't.</li>
<li>Both items belong to Category 1, which has "Sum of grades" as its aggregation strategy</li>
<li>Category 1's total will be graded 0-75</li>
<li>A student gets graded 20 on Item 1 and 70 on Item 2</li>
<li>The student's total for Category 1 will be 75/75 (20+70 = 90 but Item 1 only acts as extra credit, so it brings the total to its maximum)</li>
</ul>
<h2>For Weighted Mean of Grades (extra credit)</h2>
<p>A value greater than 0 treats this grade item's grades as Extra credit during aggregation. The number is a factor by which the grade value will be multiplied before it is added to the sum of all grades, but the item itself will not be counted in the division. For example:</p>
<ul>
<li>Item 1 is graded 0-100 and its "Extra credit" value is set to 2</li>
<li>Item 2 is graded 0-100 and its "Extra credit" value is left at 0.0000</li>
<li>Item 3 is graded 0-100 and its "Extra credit" value is left at 0.0000</li>
<li>All 3 items belong to Category 1, which has "Mean of grades (with extra credits)" as its aggregation strategy</li>
<li>A student gets graded 20 on Item 1, 40 on Item 2 and 70 on Item 3</li>
<li>The student's total for Category 1 will be 95/100 since 20*2 + (40 + 70)/2 = 95</li>
</ul>
lang/en/help/grade/aggregationcoefextra.html
-11
View File
@@ -1,11 +0,0 @@
<h1>Extra credit coefficient</h1>
<p>A value greater than 0 treats this grade item's grades as Extra credit during aggregation. The number is a factor by which the grade value will be multiplied before it is added to the sum of all grades, but the item itself will not be counted in the division. For example:</p>
<ul>
<li>Item 1 is graded 0-100 and its "Extra credit" value is set to 2</li>
<li>Item 2 is graded 0-100 and its "Extra credit" value is left at 0.0000</li>
<li>Item 3 is graded 0-100 and its "Extra credit" value is left at 0.0000</li>
<li>All 3 items belong to Category 1, which has "Mean of grades (with extra credits)" as its aggregation strategy</li>
<li>A student gets graded 20 on Item 1, 40 on Item 2 and 70 on Item 3</li>
<li>The student's total for Category 1 will be 95/100 since 20*2 + (40 + 70)/2 = 95</li>
</ul>
lang/en/help/grade/aggregationcoefextrasum.html
-12
View File
@@ -1,12 +0,0 @@
<h1>Act as extra credit</h1>
<p>When the "Sum of grades" aggregation strategy is used, a grade item can act as Extra credit for the category. This means that the grade item's maximum grade will not be added to the category total's maximum grade, but the item's grade will. Following is an example:</p>
<ul>
<li>Item 1 is graded 0-100</li>
<li>Item 2 is graded 0-75</li>
<li>Item 1 has the "Act as extra credit" checkbox ticked, Item 2 doesn't.</li>
<li>Both items belong to Category 1, which has "Sum of grades" as its aggregation strategy</li>
<li>Category 1's total will be graded 0-75</li>
<li>A student gets graded 20 on Item 1 and 70 on Item 2</li>
<li>The student's total for Category 1 will be 75/75 (20+70 = 90 but Item 1 only acts as extra credit, so it brings the total to its maximum)</li>
</ul>
lib/grade/grade_category.php
+1 -1
View File
@@ -989,7 +989,7 @@ class grade_category extends grade_object {
$this->coefstring = 'aggregationcoefextrasum';
} else if ($this->aggregation == GRADE_AGGREGATE_EXTRACREDIT_MEAN) {
$this->coefstring = 'aggregationcoefextra';
$this->coefstring = 'aggregationcoefextraweight';
} else if ($this->aggregation == GRADE_AGGREGATE_SUM) {
$this->coefstring = 'aggregationcoefextrasum';