MDL-47896 gradebook: Fix for non-overridden grades.

This commit is contained in:
Zachary Durber
2014-10-30 13:26:44 +08:00
parent b7ff40301d
commit 70d0de18d6
@@ -46,9 +46,13 @@ class finalgrade extends grade_attribute_format implements unique_value, be_disa
*/
public function get_value() {
$this->label = $this->grade->grade_item->itemname;
// Manual item raw grade support.
$val = $this->grade->grade_item->is_manual_item() && (!is_null($this->grade->rawgrade)) ?
$this->grade->rawgrade : $this->grade->finalgrade;
$isoverridden = $this->grade->is_overridden();
if (!empty($isoverridden)) {
$val = $this->grade->finalgrade;
} else {
$val = $this->grade->rawgrade;
}
if ($this->grade->grade_item->scaleid) {
return $val ? (int)$val : -1;