WebSVN – Moodle – Diff – /course/tests/reportbuilder/datasource/participants_test.php

 namespace core_course\reportbuilder\datasource;
-use completion_completion;
-use completion_criteria_self;
-use core_reportbuilder\local\filters\boolean_select;
-use core_reportbuilder\local\filters\date;
-use core_reportbuilder\local\filters\duration;
-use core_reportbuilder\local\filters\select;
+use completion_completion;
+use completion_criteria_self;
-use core_reportbuilder\local\filters\text;
+use core_reportbuilder_generator;
-use core_reportbuilder_generator;
+use core_reportbuilder\local\filters\{boolean_select, date, duration, select, text};
-use core_reportbuilder_testcase;
+use core_reportbuilder\tests\core_reportbuilder_testcase;
-use core_user;
-use grade_item;
-defined('MOODLE_INTERNAL') || die();
-global $CFG;
+use core\user;
-require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+use grade_item;
 /**
  * Course participants datasource tests
+ *
  * @package     core_course
  * @covers      \core_course\reportbuilder\datasource\participants
  * @copyright   2022 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class participants_test extends core_reportbuilder_testcase {
+final class participants_test extends core_reportbuilder_testcase {
     /**
      * Load required test libraries
      */
+    public static function setUpBeforeClass(): void {
-    public static function setUpBeforeClass(): void {
+        global $CFG;
         global $CFG;
         require_once("{$CFG->libdir}/gradelib.php");
-        require_once("{$CFG->libdir}/gradelib.php");
+        require_once("{$CFG->dirroot}/completion/criteria/completion_criteria_self.php");
         // Default columns are course, user, method. Sorted by each.
         $courseoneurl = course_get_url($courseone);
         $coursetwourl = course_get_url($coursetwo);
-        $useroneurl = core_user::get_profile_url($userone);
+        $useroneurl = user::get_profile_url($userone);
-        $usertwourl = core_user::get_profile_url($usertwo);
+        $usertwourl = user::get_profile_url($usertwo);
         $this->assertEquals([
         // Update final grade for the user.
         $courseitem = grade_item::fetch_course_item($course->id);
+        $courseitem->update_final_grade($user1->id, 42.5);
+        // Add some cohort data.
+        $cohort = $this->getDataGenerator()->create_cohort(['name' => 'My cohort']);
-        $courseitem->update_final_grade($user1->id, 42.5);
+        cohort_add_member($cohort->id, $user1->id);
         // Set some last access value for the user in the course.
         $DB->insert_record('user_lastaccess',
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'role:shortname']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'role:description']);
         $generator->create_column(['reportid' => $report->get('id'),
+            'uniqueidentifier' => 'group:name']);
-            'uniqueidentifier' => 'group:name']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'cohort:name']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'completion:criteria']);
         $generator->create_column(['reportid' => $report->get('id'),
             'uniqueidentifier' => 'completion:completed']);
         $generator->create_column(['reportid' => $report->get('id'),
         $generator->create_column(['reportid' => $report->get('id'),
             'uniqueidentifier' => 'completion:daysuntilcompletion']);
         $generator->create_column(['reportid' => $report->get('id'),
             'uniqueidentifier' => 'completion:grade']);
-        // Add filter to the report.
-        $generator->create_filter(['reportid' => $report->get('id'), 'uniqueidentifier' => 'enrol:plugin']);
-        $content = $this->get_custom_report_content($report->get('id'));
+        // It should get 3 records (manual enrolment, self and guest).
-        // It should get 3 records (manual enrolment, self and guest).
+        $content = $this->get_custom_report_content($report->get('id'));
         $this->assertCount(3, $content);
         // Filter by Manual enrolment method.
-        // Filter by Manual enrolment method.
+        $generator->create_filter(['reportid' => $report->get('id'), 'uniqueidentifier' => 'enrol:plugin']);
         $content = $this->get_custom_report_content($report->get('id'), 30, [
             'enrol:plugin_operator' => select::EQUAL_TO,
             '', // Enrolment end date.
             'Student', // Role name.
             'student', // Role shortname.
             'Students generally have fewer privileges within a course.', // Role description.
             $group->name, // Group name.
+            $cohort->name, // Cohort name.
             "All criteria below are required<ul>\n<li>Self completion: Self completion</li>\n</ul>", // Completion criteria.
             'Yes', // Course completed.
             userdate($timelastaccess), // Time last access.
             '100.0%', // Progress percentage.
             userdate($timestart), // Time enrolled.
             '', // Time started.
             userdate($timecompleted), // Time completed.
             '', // Reagreggate.
-, // Days taking course.
+            '2 days', // Days taking course.
-, // Days until completion.
+            '2 days', // Days until completion.
             '42.50', // Grade.
         ], array_values($content[0]));
+    }
             'aggregation' => 'avg',
         ]);
         $content = $this->get_custom_report_content($report->get('id'));
         $this->assertEquals([
-            [$courseone->fullname, '2.5'],
+            [$courseone->fullname, '2 days 12 hours'],
             [$coursetwo->fullname, ''],
         ], array_map('array_values', $content));
+    }
     /**
      * Data provider for {@see test_datasource_filters}
+     *
      * @return array
      */
-    public function datasource_filters_provider(): array {
+    public static function datasource_filters_provider(): array {
         global $DB;
                     'role:name_value' => $DB->get_field('role', 'id', ['shortname' => 'editingteacher']),
                 ],
                 ['Luna'],
             ],
+            [
+                'group:name',
+                [
+                    'group:name_operator' => text::IS_EQUAL_TO,
+                    'group:name_value' => 'My group',
+                ],
+                ['Lionel'],
+            ],
+            [
+                'cohort:name',
+                [
+                    'cohort:name_operator' => text::IS_EQUAL_TO,
+                    'cohort:name_value' => 'My cohort',
+                ],
+                ['Kira'],
+            ],
+            [
                 'completion:completed',
+                [
                     'completion:completed_operator' => boolean_select::CHECKED,
                 ],
                 ['Lionel'],
         $this->getDataGenerator()->enrol_user($user2->id, $course->id, 'student',
             'manual', $timestart, $timeend, ENROL_USER_ACTIVE);
         $this->getDataGenerator()->enrol_user($user3->id, $course->id, 'editingteacher',
             'manual', time(), time(), ENROL_USER_SUSPENDED);
+        // Add user1 to a group.
+        $group = $this->getDataGenerator()->create_group(['courseid' => $course->id, 'name' => 'My group']);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user1->id]);
+        // Add some cohort data.
+        $cohort = $this->getDataGenerator()->create_cohort(['name' => 'My cohort']);
+        cohort_add_member($cohort->id, $user2->id);
         // Mark course as completed for the user.
         $ccompletion = new completion_completion(array('course' => $course->id, 'userid' => $user1->id));
         $ccompletion->mark_enrolled($timestart);
         $ccompletion->mark_inprogress($timestart);

Proyectos de Subversion Moodle

(root)/course/tests/reportbuilder/datasource/participants_test.php – Rev 11 → 1441