Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle

grade/report/singleview/classes/local/ui/finalgrade.php

@@ -48,7 +48,8 @@ class finalgrade extends grade_attribute_format implements unique_value, be_disa
         $this->label = $this->grade->grade_item->itemname;
 
         $isoverridden = $this->grade->is_overridden();
-        if (!empty($isoverridden)) {
+        // If the grade is overridden or the grade type is not an activity then use finalgrade.
+        if (!empty($isoverridden) || $this->grade->grade_item->itemtype != 'mod') {
             $val = $this->grade->finalgrade;
         } else {
             $val = $this->grade->rawgrade;

grade/report/singleview/tests/behat/singleview.feature

@@ -66,6 +66,13 @@ Feature: We can use Single view
     And the following should exist in the "generaltable" table:
         | Test assignment one |
         | 10.00 |
+    And I set the following fields to these values:
+        | Test grade item | 45 |
+    And I press "Update"
+    Then I should see "Grades were set for 1 items"
+    And I press "Continue"
+    And the field "Grade for Test grade item" matches value "45.00"
+    And the field "Grade for Course total" matches value "55.00"
     And I click on "Show grades for Test assignment three" "link"
     And I click on "Override for james (Student) 1" "checkbox"
     And I set the following fields to these values: