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

MDL-68093 h5pactivity: Add restriction for participation groups.

Browse Source
This commit is contained in:
Mark Johnson
2023-03-14 08:52:26 +00:00
parent a1b1af77af
commit 247004108f
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/h5pactivity/lib.php
+1 -1
View File
@@ -808,7 +808,7 @@ function h5pactivity_fetch_recent_activity(array $submissions, int $courseid) :
if (!isset($usersgroups[$cm->groupingid][$submission->userid])) {
$usersgroups[$cm->groupingid][$submission->userid] =
groups_get_all_groups($course->id, $submission->userid, $cm->groupingid);
groups_get_all_groups($course->id, $submission->userid, $cm->groupingid, 'g.*', false, true);
}
if (is_array($usersgroups[$cm->groupingid][$submission->userid])) {
mod/h5pactivity/tests/lib_test.php
+15 -1
View File
@@ -145,10 +145,11 @@ class lib_test extends advanced_testcase {
$groups = array();
$teacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
for ($i = 1; $i < 4; $i++) {
for ($i = 1; $i < 6; $i++) {
$students[$i] = $this->getDataGenerator()->create_and_enrol($course, 'student');
$groups[$i] = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
}
$groups[$i] = $this->getDataGenerator()->create_group(array('courseid' => $course->id, 'participation' => 0));
// Update the course set the groupmode SEPARATEGROUPS and forced.
update_course((object)array('id' => $course->id, 'groupmode' => SEPARATEGROUPS, 'groupmodeforce' => true));
@@ -164,6 +165,11 @@ class lib_test extends advanced_testcase {
// Student 3 is only in group 3.
groups_add_member($groups[3], $students[3]);
// Student 4 is only in group 5 (non-participation).
groups_add_member($groups[6], $students[4]);
// Student 5 is not in any groups.
// Grader is only in group 3.
groups_add_member($groups[3], $teacher);
@@ -238,5 +244,13 @@ class lib_test extends advanced_testcase {
// Grader, Student 1 and 2 are in Group 1.
$this->assertEquals($students[1]->id, $recentactivity[$students[1]->id]->userid);
$this->assertEquals($students[2]->id, $recentactivity[$students[2]->id]->userid);
// Grader is in no group.
groups_remove_member($groups[1], $teacher);
get_fast_modinfo($course->id, 0, true);
$recentactivity = h5pactivity_fetch_recent_activity($submissions, $course->id);
// Student 4 and Student 5 have submissions, but they are not in a participation group, so they do not show up in recent
// activity for separate groups mode.
$this->assertCount(0, $recentactivity);
}
}
mod/h5pactivity/tests/local/manager_test.php
+11 -2
View File
@@ -710,15 +710,24 @@ class manager_test extends \advanced_testcase {
$grouptwo = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
$this->getDataGenerator()->create_group_member(['groupid' => $grouptwo->id, 'userid' => $usertwo->id]);
// User three in no group.
$userthree = $this->getDataGenerator()->create_and_enrol($course, 'student');
// User four in a non-participation group.
$userfour = $this->getDataGenerator()->create_and_enrol($course, 'student');
$groupthree = $this->getDataGenerator()->create_group(['courseid' => $course->id, 'participation' => 0]);
$this->getDataGenerator()->create_group_member(['groupid' => $groupthree->id, 'userid' => $userfour->id]);
$activity = $this->getDataGenerator()->create_module('h5pactivity', ['course' => $course]);
$manager = manager::create_from_instance($activity);
// Admin user can view all participants.
// Admin user can view all participants (any group and none).
$usersjoin = $manager->get_active_users_join(true, 0);
$users = $DB->get_fieldset_sql("SELECT u.username FROM {user} u {$usersjoin->joins} WHERE {$usersjoin->wheres}",
$usersjoin->params);
$this->assertEqualsCanonicalizing([$teacher->username, $userone->username, $usertwo->username], $users);
$this->assertEqualsCanonicalizing(
[$teacher->username, $userone->username, $usertwo->username, $userthree->username, $userfour->username], $users);
// Switch to teacher, who cannot view all participants.
$this->setUser($teacher);