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

MDL-86253 mod_assign: Respect enrollment status in notifications

Browse Source
This commit is contained in:
raortegar
2025-10-02 08:15:28 +07:00
committed by Huong Nguyen
parent e37eadb84b
commit ecc53ae6a1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/classes/notification_helper.php
+1 -1
View File
@@ -227,7 +227,7 @@ class notification_helper {
$assignmentobj = self::get_assignment_data($assignmentid);
// Get our assignment users.
$users = $assignmentobj->list_participants(0, true);
$users = $assignmentobj->list_participants(0, true, false, true);
foreach ($users as $key => $user) {
// Check if the user has submitted already.
mod/assign/locallib.php
+8 -4
View File
@@ -2272,8 +2272,9 @@ class assign {
* @param bool $idsonly
* @param bool $tablesort
* @return array List of user records
* @param bool|null $onlyactive Whether to show only active users.
*/
public function list_participants($currentgroup, $idsonly, $tablesort = false) {
public function list_participants($currentgroup, $idsonly, $tablesort = false, ?bool $onlyactive = null) {
global $DB, $USER;
// Get the last known sort order for the grading table.
@@ -2282,10 +2283,13 @@ class assign {
$currentgroup = 0;
}
$key = $this->context->id . '-' . $currentgroup . '-' . $this->show_only_active_users();
if ($onlyactive === null) {
$onlyactive = $this->show_only_active_users();
}
$key = $this->context->id . '-' . $currentgroup . '-' . $onlyactive;
if (!isset($this->participants[$key])) {
list($esql, $params) = get_enrolled_sql($this->context, 'mod/assign:submit', $currentgroup,
$this->show_only_active_users());
list($esql, $params) = get_enrolled_sql($this->context, 'mod/assign:submit', $currentgroup, $onlyactive);
list($ssql, $sparams) = $this->get_submitted_sql($currentgroup);
$params += $sparams;