Skip to content

Commit

Permalink
Merge pull request #60 from stopfstedt/moodle44upgradeforreal
Browse files Browse the repository at this point in the history 
Moodle 4.4 upgrade
  • Loading branch information
@jrjohnson
jrjohnson authored Oct 11, 2024
2 parents d930070 + 8e17090 commit b0af9bd
Show file tree
Hide file tree
Showing 18 changed files with 3,962 additions and 283 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.1", "8.2"]
moodle-branch: ["MOODLE_403_STABLE"]
php: ["8.2", "8.3"]
moodle-branch: ["MOODLE_404_STABLE"]
database: [pgsql, mariadb]

steps:
Expand Down
65 changes: 20 additions & 45 deletions ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@
*
* @package enrol_ilios
* @author Carson Tam <[email protected]>
* @copyright 2017 The Regents of the University of California
* @copyright The Regents of the University of California
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

use core\di;
use enrol_ilios\ilios;

define('AJAX_SCRIPT', true);

require('../../config.php');
Expand Down Expand Up @@ -63,15 +66,17 @@
$outcome->response = new stdClass();
$outcome->error = '';

/** @var enrol_ilios_plugin $enrol */
$enrol = enrol_get_plugin('ilios');
$apiclient = $enrol->get_api_client();
$accesstoken = $enrol->get_api_access_token();
try {
$ilios = di::get(ilios::class);
} catch (Exception $e) {
// Re-throw exception.
throw new Exception('ERROR: Failed to instantiate Ilios client.', $e);
}

switch ($action) {
case 'getselectschooloptions':
require_capability('moodle/course:enrolconfig', $context);
$schools = $apiclient->get($accesstoken, 'schools', '', ['title' => "ASC"]);
$schools = $ilios->get_schools(['title' => "ASC"]);
$schoolarray = [];
foreach ($schools as $school) {
$schoolarray["$school->id:$school->title"] = $school->title;
Expand All @@ -83,7 +88,7 @@
require_capability('moodle/course:enrolconfig', $context);
$sid = required_param('filterid', PARAM_INT); // School ID.
$programs = [];
$programs = $apiclient->get($accesstoken, 'programs', ['school' => $sid], ['title' => "ASC"]);
$programs = $ilios->get_programs(['school' => $sid], ['title' => "ASC"]);
$programarray = [];
foreach ($programs as $program) {
$key = $program->id;
Expand All @@ -101,25 +106,15 @@
case 'getselectcohortoptions':
require_capability('moodle/course:enrolconfig', $context);
$pid = required_param('filterid', PARAM_INT);
$programyears = $apiclient->get(
$accesstoken,
'programYears',
["program" => $pid],
["startYear" => "ASC"]
);
$programyears = $ilios->get_program_years(["program" => $pid], ["startYear" => "ASC"]);
$programyeararray = [];
$cohortoptions = [];
foreach ($programyears as $progyear) {
$programyeararray[] = $progyear->id;
}

if (!empty($programyeararray)) {
$cohorts = $apiclient->get(
$accesstoken,
'cohorts',
["programYear" => $programyeararray],
["title" => "ASC"]
);
$cohorts = $ilios->get_cohorts(["programYear" => $programyeararray], ["title" => "ASC"]);
foreach ($cohorts as $cohort) {
$cohortoptions["$cohort->id:$cohort->title"] = $cohort->title
.' ('.count($cohort->learnerGroups).')'
Expand All @@ -133,12 +128,7 @@
require_capability('moodle/course:enrolconfig', $context);
$cid = required_param('filterid', PARAM_INT); // Cohort ID.
$usertype = optional_param('usertype', 0, PARAM_INT); // Learner or instructor.
$learnergroups = $apiclient->get(
$accesstoken,
'learnerGroups',
['cohort' => $cid, 'parent' => 'null'],
['title' => "ASC"]
);
$learnergroups = $ilios->get_learner_groups(['cohort' => $cid, 'parent' => 'null'], ['title' => "ASC"]);
$grouparray = [];
foreach ($learnergroups as $group) {
$grouparray["$group->id:$group->title"] = $group->title.
Expand All @@ -153,25 +143,15 @@
$gid = required_param('filterid', PARAM_INT); // Group ID.
$usertype = optional_param('usertype', 0, PARAM_INT); // Learner or instructor.
$subgroupoptions = [];
$subgroups = $apiclient->get(
$accesstoken,
'learnerGroups',
["parent" => $gid],
["title" => "ASC"]
);
$subgroups = $ilios->get_learner_groups(["parent" => $gid], ["title" => "ASC"]);
foreach ($subgroups as $subgroup) {
$subgroupoptions["$subgroup->id:$subgroup->title"] = $subgroup->title.
' ('. count($subgroup->children) .')';
$subgroupoptions["$subgroup->id:$subgroup->title"] .= ' ('. count($subgroup->users) .')';

if (!empty($subgroup->children)) {
$processchildren = function ($parent) use (&$processchildren, &$subgroupoptions, $apiclient, $accesstoken) {
$subgrps = $apiclient->get(
$accesstoken,
'learnerGroups',
[ 'parent' => $parent->id],
[ 'title' => "ASC"]
);
$processchildren = function ($parent) use (&$processchildren, &$subgroupoptions, $ilios) {
$subgrps = $ilios->get_learner_groups([ 'parent' => $parent->id], [ 'title' => "ASC"]);
foreach ($subgrps as $subgrp) {
$subgroupoptions["$subgrp->id:$parent->title / $subgrp->title"] = $parent->title.' / '.$subgrp->title.
' ('. count($subgrp->children) .')';
Expand All @@ -192,14 +172,9 @@
require_capability('moodle/course:enrolconfig', $context);
$gid = required_param('filterid', PARAM_INT); // Group ID.
$instructorgroupoptions = [];
$learnergroup = $apiclient->get_by_id($accesstoken, 'learnerGroups', $gid);
$learnergroup = $ilios->get_learner_group('learnerGroups', $gid);
if (!empty($learnergroup->instructorGroups)) {
$instructorgroups = $apiclient->get(
$accesstoken,
'instructorGroups',
'',
["title" => "ASC"]
);
$instructorgroups = $ilios->get_instructor_groups(sortby: ["title" => "ASC"]);
foreach ($instructorgroups as $instructorgroup) {
$instructorgroupoptions["$instructorgroup->id:$instructorgroup->title"] = $instructorgroup->title.
' ('. count($instructorgroup->users) .')';
Expand Down
Loading

0 comments on commit b0af9bd

Please sign in to comment.