mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-07-22 22:36:23 +02:00
commit f2515968d2
8 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grade/grading/form/guide/lib.php
View File

@ -820,10 +820,9 @@ class gradingform_guide_instance extends gradingform_instance {
/**
* Calculates the grade to be pushed to the gradebook
*
* @return int the valid grade from $this->get_controller()->get_grade_range()
* @return float|int the valid grade from $this->get_controller()->get_grade_range()
*/
public function get_grade() {
global $DB, $USER;
$grade = $this->get_guide_filling();
if (!($scores = $this->get_controller()->get_min_max_score()) || $scores['maxscore'] <= $scores['minscore']) {
@ -842,8 +841,12 @@ class gradingform_guide_instance extends gradingform_instance {
foreach ($grade['criteria'] as $record) {
$curscore += $record['score'];
}
return round(($curscore-$scores['minscore'])/($scores['maxscore']-$scores['minscore'])*
($maxgrade-$mingrade), 0) + $mingrade;
$gradeoffset = ($curscore-$scores['minscore'])/($scores['maxscore']-$scores['minscore'])*
($maxgrade-$mingrade);
if ($this->get_controller()->get_allow_grade_decimals()) {
return $gradeoffset + $mingrade;
}
return round($gradeoffset, 0) + $mingrade;
}
/**

4
grade/grading/form/guide/version.php
View File

@ -25,6 +25,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'gradingform_guide';
$plugin->version = 2013050100;
$plugin->requires = 2013050100;
$plugin->version = 2013071900.02;
$plugin->requires = 2013071900.02;
$plugin->maturity = MATURITY_STABLE;

36
grade/grading/form/lib.php
View File

@ -73,6 +73,9 @@ abstract class gradingform_controller {
/** @var array graderange array of valid grades for this area. Use set_grade_range and get_grade_range to access this */
private $graderange = null;
/** @var bool if decimal values are allowed as grades. */
private $allowgradedecimals = false;
/** @var boolean|null cached result of function has_active_instances() */
protected $hasactiveinstances = null;
@ -622,13 +625,23 @@ abstract class gradingform_controller {
/**
* Sets the range of grades used in this area. This is usually either range like 0-100
* or the scale where keys start from 1. Typical use:
* $controller->set_grade_range(make_grades_menu($gradingtype));
* or the scale where keys start from 1.
*
* @param array $graderange
* Typically modules will call it:
* $controller->set_grade_range(make_grades_menu($gradingtype), $gradingtype > 0);
* Negative $gradingtype means that scale is used and the grade must be rounded
* to the nearest int. Positive $gradingtype means that range 0..$gradingtype
* is used for the grades and in this case grade does not have to be rounded.
*
* Sometimes modules always expect grade to be rounded (like mod_assignment does).
*
* @param array $graderange array where first _key_ is the minimum grade and the
* last key is the maximum grade.
* @param bool $allowgradedecimals if decimal values are allowed as grades.
*/
public final function set_grade_range(array $graderange) {
public final function set_grade_range(array $graderange, $allowgradedecimals = false) {
$this->graderange = $graderange;
$this->allowgradedecimals = $allowgradedecimals;
}
/**
@ -643,6 +656,15 @@ abstract class gradingform_controller {
return $this->graderange;
}
/**
* Returns if decimal values are allowed as grades
*
* @return bool
*/
public final function get_allow_grade_decimals() {
return $this->allowgradedecimals;
}
/**
* Overridden by sub classes that wish to make definition details available to web services.
* When not overridden, only definition data common to all grading methods is made available.
@ -866,7 +888,11 @@ abstract class gradingform_instance {
/**
* Calculates the grade to be pushed to the gradebook
*
* @return int the valid grade from $this->get_controller()->get_grade_range()
* Returned grade must be in range $this->get_controller()->get_grade_range()
* Plugins must returned grade converted to int unless
* $this->get_controller()->get_allow_grade_decimals() is true.
*
* @return float|int
*/
abstract public function get_grade();

9
grade/grading/form/rubric/lib.php
View File

@ -814,10 +814,9 @@ class gradingform_rubric_instance extends gradingform_instance {
/**
* Calculates the grade to be pushed to the gradebook
*
* @return int the valid grade from $this->get_controller()->get_grade_range()
* @return float|int the valid grade from $this->get_controller()->get_grade_range()
*/
public function get_grade() {
global $DB, $USER;
$grade = $this->get_rubric_filling();
if (!($scores = $this->get_controller()->get_min_max_score()) || $scores['maxscore'] <= $scores['minscore']) {
@ -836,7 +835,11 @@ class gradingform_rubric_instance extends gradingform_instance {
foreach ($grade['criteria'] as $id => $record) {
$curscore += $this->get_controller()->get_definition()->rubric_criteria[$id]['levels'][$record['levelid']]['score'];
}
return round(($curscore-$scores['minscore'])/($scores['maxscore']-$scores['minscore'])*($maxgrade-$mingrade), 0) + $mingrade;
$gradeoffset = ($curscore-$scores['minscore'])/($scores['maxscore']-$scores['minscore'])*($maxgrade-$mingrade);
if ($this->get_controller()->get_allow_grade_decimals()) {
return $gradeoffset + $mingrade;
}
return round($gradeoffset, 0) + $mingrade;
}
/**

4
grade/grading/form/rubric/version.php
View File

@ -25,8 +25,8 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'gradingform_rubric';
$plugin->version = 2013050100;
$plugin->version = 2013071900.02;
$plugin->requires = 2013050100;
$plugin->requires = 2013071900.02;
$plugin->maturity = MATURITY_STABLE;

9
grade/grading/form/upgrade.txt Normal file
View File

@ -0,0 +1,9 @@
This files describes API changes in /grade/grading/form/* - Advanced grading methods
information provided here is intended especially for developers.
=== 2.5.2 ===
* Grading methods now can return grade with decimals. See API functions
gradingform_controller::set_grade_range() and
gradingform_controller::get_allow_grade_decimals(), and also examples
in gradingform_rubric_instance::get_grade().

7
mod/assign/locallib.php
View File

@ -3624,7 +3624,7 @@ class assign {
// Only show the grade if it is not hidden in gradebook.
if (!empty($gradebookgrade->grade) && ($cangrade || !$gradebookgrade->hidden)) {
if ($controller = $gradingmanager->get_active_controller()) {
$controller->set_grade_range(make_grades_menu($this->get_instance()->grade));
$controller->set_grade_range(make_grades_menu($this->get_instance()->grade), $this->get_instance()->grade > 0);
$gradefordisplay = $controller->render_grade($PAGE,
$grade->id,
$gradingitem,
@ -3721,7 +3721,7 @@ class assign {
// Now get the gradefordisplay.
if ($controller) {
$controller->set_grade_range(make_grades_menu($this->get_instance()->grade));
$controller->set_grade_range(make_grades_menu($this->get_instance()->grade), $this->get_instance()->grade > 0);
$grade->gradefordisplay = $controller->render_grade($PAGE,
$grade->id,
$gradingitem,
@ -5182,6 +5182,7 @@ class assign {
global $CFG, $USER;
$grademenu = make_grades_menu($this->get_instance()->grade);
$allowgradedecimals = $this->get_instance()->grade > 0;
$advancedgradingwarning = false;
$gradingmanager = get_grading_manager($this->context, 'mod_assign', 'submissions');
@ -5206,7 +5207,7 @@ class assign {
}
}
if ($gradinginstance) {
$gradinginstance->get_controller()->set_grade_range($grademenu);
$gradinginstance->get_controller()->set_grade_range($grademenu, $allowgradedecimals);
}
return $gradinginstance;
}

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013071900.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013071900.02; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes