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

MDL-9628 Fixed typos and added language strings. Corrected a bug that prevented a decimalpoints of 0 from being used (empty($decimalpoints)) -> is_null

Browse Source
This commit is contained in:
nicolasconnault
2007-07-20 07:31:13 +00:00
parent 5b508a08ae
commit d5f0aa0196
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/edit/category_form.php
+7 -7
View File
@@ -11,14 +11,14 @@ class edit_category_form extends moodleform {
$mform->addElement('header', 'general', get_string('gradecategory', 'grades'));
$mform->addElement('text', 'fullname', get_string('categoryname', 'grades'));
$options = array(GRADE_AGGREGATE_MEAN_ALL =>get_string('aggregatemeanall', 'grades'),
GRADE_AGGREGATE_MEAN_GRADED=>get_string('aggregatemeangraded', 'grades'),
GRADE_AGGREGATE_MEDIAN =>get_string('aggregatemedian', 'grades'),
GRADE_AGGREGATE_MIN =>get_string('aggregatemin', 'grades'),
GRADE_AGGREGATE_MAX =>get_string('aggregatemax', 'grades'),
GRADE_AGGREGATE_MODE =>get_string('aggregatemode', 'grades'),
$options = array(GRADE_AGGREGATE_MEAN_ALL =>get_string('aggregatemeanall', 'grades'),
GRADE_AGGREGATE_MEAN_GRADED =>get_string('aggregatemeangraded', 'grades'),
GRADE_AGGREGATE_MEDIAN =>get_string('aggregatemedian', 'grades'),
GRADE_AGGREGATE_MIN =>get_string('aggregatemin', 'grades'),
GRADE_AGGREGATE_MAX =>get_string('aggregatemax', 'grades'),
GRADE_AGGREGATE_MODE =>get_string('aggregatemode', 'grades'),
GRADE_AGGREGATE_WEIGHTED_MEAN_ALL =>get_string('aggregateweightedmeanall', 'grades'),
GRADE_AGGREGATE_WEIGHTED_MEAN_GRADED =>get_string('aggregateweightedgraded', 'grades'),
GRADE_AGGREGATE_WEIGHTED_MEAN_GRADED =>get_string('aggregateweightedmeangraded', 'grades'),
GRADE_AGGREGATE_EXTRACREDIT_MEAN_ALL =>get_string('aggregateextracreditmeanall', 'grades'),
GRADE_AGGREGATE_EXTRACREDIT_MEAN_GRADED=>get_string('aggregateextracreditmeangraded', 'grades'));
grade/report/lib.php
+1 -1
View File
@@ -234,7 +234,7 @@ class grade_report {
$gradeval = '';
} else {
// decimal points as specified by user
if (empty($decimalpoints)) {
if (is_null($decimalpoints)) {
$decimalpoints = $this->get_pref('decimalpoints');
}
$gradeval = number_format($gradeval, $decimalpoints, $this->get_lang_string('decpoint', 'langconfig'),
lang/en_utf8/grades.php
+4
View File
@@ -7,12 +7,16 @@ $string['addcategoryerror'] = 'Could not add category.';
$string['addexceptionerror'] = 'Error occurred while adding exception for userid:gradeitem';
$string['addfeedback'] = 'Add Feedback';
$string['additem'] = 'Add Grade Item';
$string['aggregateextracreditmeanall'] = 'Mean of all grades (extra credits)';
$string['aggregateextracreditmeangraded'] = 'Mean of non-empty grades (extra credits)';
$string['aggregatemeanall'] = 'Mean of all grades';
$string['aggregatemedian'] = 'Median of all grades';
$string['aggregatemeangraded'] = 'Mean of non-empty grades';
$string['aggregatemin'] = 'Smallest grade';
$string['aggregatemax'] = 'Highest grade';
$string['aggregatemode'] = 'Mode of all grades';
$string['aggregateweightedmeanall'] = 'Weighted mean of all grades';
$string['aggregateweightedmeangraded'] = 'Weighted mean of non-empty grades';
$string['aggregation'] = 'Aggregation';
$string['aggregationposition'] = 'Aggregation position';
$string['aggregationview'] = 'Aggregation view';
lib/grade/grade_category.php
+13 -7
View File
@@ -423,7 +423,7 @@ class grade_category extends grade_object {
}
/// normalize the grades first - all will have value 0...1
// ungraded items are not used in aggreagation
// ungraded items are not used in aggregation
foreach ($grade_values as $k=>$v) {
if (is_null($v)) {
// null means no grade
@@ -437,7 +437,7 @@ class grade_category extends grade_object {
$this->apply_limit_rules($grade_values);
asort($grade_values, SORT_NUMERIC);
// let's see we have still enough grades to do any statisctics
// let's see we have still enough grades to do any statistics
if (count($grade_values) == 0) {
// not enough attempts yet
$grade->finalgrade = null;
@@ -452,12 +452,18 @@ class grade_category extends grade_object {
switch ($this->aggregation) {
case GRADE_AGGREGATE_MEDIAN: // Middle point value in the set: ignores frequencies
$num = count($grade_values);
// re-index grade_values array
$sorted_values = $grade_values;
sort($sorted_values);
$halfpoint = intval($num / 2);
if($num % 2 == 0) {
$rawgrade = ($grade_values[ceil($halfpoint)] + $grade_values[floor($halfpoint)]) / 2;
if ($num == 0) {
$rawgrade = null;
} elseif ($num == 1) {
$rawgrade = reset($sorted_values);
} else if($num % 2 == 0) {
$rawgrade = ($sorted_values[ceil($halfpoint)] + $sorted_values[floor($halfpoint)]) / 2;
} else {
$rawgrade = $grade_values[$halfpoint];
$rawgrade = $sorted_values[$halfpoint];
}
break;
@@ -550,7 +556,7 @@ class grade_category extends grade_object {
}
break;
case GRADE_AGGREGATE_MEAN_ALL: // Arithmetic average of all grade items including even NULLs; NULL grade caunted as minimum
case GRADE_AGGREGATE_MEAN_ALL: // Arithmetic average of all grade items including even NULLs; NULL grade counted as minimum
$num = count($items); // you can calculate sum from this one if you multiply it with count($this->depends_on() ;-)
$sum = array_sum($grade_values);
$rawgrade = $sum / $num;