From f8fe2fabfe56fc34c8d7535205138c59836047d3 Mon Sep 17 00:00:00 2001 From: Brendan Heywood Date: Fri, 26 Feb 2021 14:24:23 +1100 Subject: [PATCH] MDL-71007 grade_report: Add course idnumber to grade report api The gradereport_user_get_grade_items now includes the idnumber --- grade/report/user/externallib.php | 32 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/grade/report/user/externallib.php b/grade/report/user/externallib.php index 4988d2a6680..ef8d259de80 100644 --- a/grade/report/user/externallib.php +++ b/grade/report/user/externallib.php @@ -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(PARAM_TEXT, 'user idnumber'),