Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle

moodle · Mar 7, 2017 · 6dba6a5 · 6dba6a5
2 parents 7ebe17f + 004738e
commit 6dba6a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/grade/report/user/externallib.php b/grade/report/user/externallib.php
@@ -483,6 +483,7 @@ public static function get_grade_items_returns() {
                                 new external_single_structure(
                                     array(
                                         'id' => new external_value(PARAM_INT, 'Grade item id'),
+                                        'itemname' => new external_value(PARAM_TEXT, 'Grade item name'),
                                         'itemtype' => new external_value(PARAM_ALPHA, 'Grade item type'),
                                         'itemmodule' => new external_value(PARAM_PLUGIN, 'Grade item module'),
                                         'iteminstance' => new external_value(PARAM_INT, 'Grade item instance'),

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
@@ -512,6 +512,7 @@ private function fill_table_recursive(&$element) {
 
                 // Basic grade item information.
                 $gradeitemdata['id'] = $grade_object->id;
+                $gradeitemdata['itemname'] = $grade_object->itemname;
                 $gradeitemdata['itemtype'] = $grade_object->itemtype;
                 $gradeitemdata['itemmodule'] = $grade_object->itemmodule;
                 $gradeitemdata['iteminstance'] = $grade_object->iteminstance;

diff --git a/grade/report/user/tests/externallib_test.php b/grade/report/user/tests/externallib_test.php
@@ -251,6 +251,7 @@ public function test_get_grade_items_teacher() {
         $this->assertEquals($course->id, $studentgrades['usergrades'][0]['courseid']);
         $this->assertEquals($student1->id, $studentgrades['usergrades'][0]['userid']);
         // Module grades.
+        $this->assertEquals($assignment->name, $studentgrades['usergrades'][0]['gradeitems'][0]['itemname']);
         $this->assertEquals('mod', $studentgrades['usergrades'][0]['gradeitems'][0]['itemtype']);
         $this->assertEquals('assign', $studentgrades['usergrades'][0]['gradeitems'][0]['itemmodule']);
         $this->assertEquals($assignment->id, $studentgrades['usergrades'][0]['gradeitems'][0]['iteminstance']);
@@ -325,6 +326,7 @@ public function test_get_grade_items_student() {
 
         $this->assertEquals($course->id, $studentgrades['usergrades'][0]['courseid']);
         $this->assertEquals($student1->id, $studentgrades['usergrades'][0]['userid']);
+        $this->assertEquals($assignment->name, $studentgrades['usergrades'][0]['gradeitems'][0]['itemname']);
         $this->assertEquals('mod', $studentgrades['usergrades'][0]['gradeitems'][0]['itemtype']);
         $this->assertEquals('assign', $studentgrades['usergrades'][0]['gradeitems'][0]['itemmodule']);
         $this->assertEquals($assignment->id, $studentgrades['usergrades'][0]['gradeitems'][0]['iteminstance']);