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

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

Browse Source
This commit is contained in:
Dan Poltawski
2017-03-07 11:12:32 -03:00
parent 7ebe17f38a 004738e03d
commit 6dba6a5a6a
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/user/externallib.php
+1
View File
@@ -483,6 +483,7 @@ class gradereport_user_external extends external_api {
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'),
grade/report/user/lib.php
+1
View File
@@ -512,6 +512,7 @@ class grade_report_user extends grade_report {
// 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;
grade/report/user/tests/externallib_test.php
+2
View File
@@ -251,6 +251,7 @@ class gradereport_user_externallib_testcase extends externallib_advanced_testcas
$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 @@ class gradereport_user_externallib_testcase extends externallib_advanced_testcas
$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']);