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

Merge branch 'MDL-71007-courseidnumer-grade-ws-MOODLE_311_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
abgreeve
2021-04-15 13:47:02 +08:00
parent 38a54270c7 f8fe2fabfe
commit dfda0b1c19
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/user/externallib.php
+18 -14
View File
@@ -148,10 +148,11 @@ class gradereport_user_external extends external_api {
$gpr = new grade_plugin_return(
array(
'type' => 'report',
'plugin' => 'user',
'courseid' => $course->id,
'userid' => $userid)
'type' => 'report',
'plugin' => 'user',
'courseid' => $course->id,
'courseidnumber' => $course->idnumber,
'userid' => $userid)
);
$reportdata = array();
@@ -162,11 +163,12 @@ class gradereport_user_external extends external_api {
$report->fill_table();
$gradeuserdata = array(
'courseid' => $course->id,
'userid' => $user->id,
'userfullname' => fullname($user),
'useridnumber' => $user->idnumber,
'maxdepth' => $report->maxdepth,
'courseid' => $course->id,
'courseidnumber' => $course->idnumber,
'userid' => $user->id,
'userfullname' => fullname($user),
'useridnumber' => $user->idnumber,
'maxdepth' => $report->maxdepth,
);
if ($tabledata) {
$gradeuserdata['tabledata'] = $report->tabledata;
@@ -189,11 +191,12 @@ class gradereport_user_external extends external_api {
$report->fill_table();
$gradeuserdata = array(
'courseid' => $course->id,
'userid' => $currentuser->id,
'userfullname' => fullname($currentuser),
'useridnumber' => $currentuser->idnumber,
'maxdepth' => $report->maxdepth,
'courseid' => $course->id,
'courseidnumber' => $course->idnumber,
'userid' => $currentuser->id,
'userfullname' => fullname($currentuser),
'useridnumber' => $currentuser->idnumber,
'maxdepth' => $report->maxdepth,
);
if ($tabledata) {
$gradeuserdata['tabledata'] = $report->tabledata;
@@ -478,6 +481,7 @@ class gradereport_user_external extends external_api {
new external_single_structure(
array(
'courseid' => new external_value(PARAM_INT, 'course id'),
'courseidnumber' => new external_value(PARAM_TEXT, 'course idnumber'),
'userid' => new external_value(PARAM_INT, 'user id'),
'userfullname' => new external_value(PARAM_TEXT, 'user fullname'),
'useridnumber' => new external_value(