fix invisible dropdown options, show enrolment in course details

eLearning-TUDarmstadt · Nov 13, 2024 · 061953b · 061953b
1 parent 109eb21
commit 061953b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,7 +25,7 @@ module.exports = function(grunt) {
             options: {
                 jshintrc: true
             },
-            files: ["**/amd/src/*.js"]
+            files: ["**/amd/src/*.js", '!**/amd/src/jquery.dataTables.js']
         },
         uglify: {
             dynamic_mappings: {

diff --git a/amd/build/dataTables.bootstrap4.min.js b/amd/build/dataTables.bootstrap4.min.js
diff --git a/amd/build/jquery.dataTables.min.js b/amd/build/jquery.dataTables.min.js
diff --git a/amd/build/table_filter.min.js b/amd/build/table_filter.min.js
diff --git a/amd/src/table_filter.js b/amd/src/table_filter.js
@@ -75,7 +75,8 @@ define(['jquery'], function($) {
             columns.forEach(function(element) {
                 $(columnDropdownID).append($('<option>', {
                     value: counter,
-                    text: element.name
+                    text: element.name,
+                    hidden: !element.visible ? true : undefined
                 }));
                 counter++;
             });

diff --git a/classes/external.php b/classes/external.php
@@ -34,6 +34,7 @@
 require_once("$CFG->libdir/adminlib.php");
 require_once($CFG->dirroot . '/course/externallib.php');
 require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
+require_once("$CFG->dirroot/enrol/locallib.php");
 
 use external_api;
 use external_function_parameters;
@@ -974,7 +975,7 @@ public static function get_course_info($courseid) {
             0
         );
         $users = [];
-        $userenrolments = $DB->get_records_sql('SELECT ue.userid, ue.id FROM {user_enrolments} ue,
+        $userenrolments = $DB->get_records_sql('SELECT ue.userid, ue.id, ue.enrolid FROM {user_enrolments} ue,
                                                {enrol} e WHERE e.id = ue.enrolid AND e.courseid = ?', [$courseid]);
         foreach ($usersraw as $u) {
             $u = (array)$u;
@@ -999,6 +1000,13 @@ public static function get_course_info($courseid) {
             }
             $u['roles'] = $userroles;
             $u['enrol_id'] = $userenrolments[$u['id']]->id;
+
+            // Get enrol instance name for this user.
+            $enrolid = $userenrolments[$u['id']]->enrolid;
+            $instance = $DB->get_record('enrol', array('id'=>$enrolid), '*', MUST_EXIST);
+            $plugin = enrol_get_plugin($instance->enrol);
+            $u['enrol_name'] = $plugin->get_instance_name($instance);
+
             $users[] = $u;
         }
 
@@ -1129,6 +1137,7 @@ public static function get_course_info_returns() {
                     'lastaccess' => new external_value(PARAM_RAW, 'lastaccess of the user to the course'),
                     'roles' => new external_multiple_structure(new external_value(PARAM_TEXT, 'array with roles for each user')),
                     'enrol_id' => new external_value(PARAM_INT, 'id of user enrolment to course'),
+                    'enrol_name' => new external_value(PARAM_TEXT, 'name of user enrolment'),
                 ])
             ),
             'activities' => new external_multiple_structure(

diff --git a/templates/course_detail.mustache b/templates/course_detail.mustache
@@ -213,7 +213,7 @@ Example context (json):
 	                    <table class="stripe hover row-border" id="userincourse">
 	                        <thead>
 	                            <tr>
-	                                <th>ID</th>
+	                                <th>{{#str}}enrolmentmethods{{/str}}</th>
 	                                <th>{{#str}}username{{/str}}</th>
 	                                <th>{{#str}}firstname{{/str}}</th>
 	                                <th>{{#str}}lastname{{/str}}</th>
@@ -225,7 +225,7 @@ Example context (json):
 	                        <tbody>
 	                            {{#users}}
 	                            <tr>
-	                                <td>{{id}}</td>
+	                                <td>{{enrol_name}}</td>
 	                                <td>{{username}}</td>
 	                                <td>{{firstname}}</td>
 	                                <td>{{lastname}}</td>