diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 7378858c4e..3b63d345b5 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -8902,6 +8902,13 @@ class TrackingCourseLog ) "; } + if (isset($_GET['user_active'])) { + $active = (int) $_GET['user_active']; + $condition_user .= " AND ( + user.active = $active + ) "; + } + $url_table = ''; $url_condition = ''; if (api_is_multiple_url_enabled()) { diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index 05ba0ef280..85c08bc7e6 100755 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -278,7 +278,8 @@ $form_search->addElement('text', 'user_keyword'); $form_search->addButtonSearch(get_lang('SearchUsers')); echo Display::toolbarAction( 'toolbar-courselog', - [$actionsLeft, $form_search->returnForm(), $actionsRight] + [$actionsLeft, $form_search->returnForm(), $actionsRight], + [4, 6, 2] ); $course_name = get_lang('Course').' '.$courseInfo['name']; @@ -434,6 +435,19 @@ if ($nbStudents > 0) { } } + // Filter by active users + $formActiveUsers = new FormValidator( + 'active_users', + 'get', + api_get_self().'?'.api_get_cidreq().'&'.$additionalParams + ); + // Filter by active users + $group = []; + $group[] = $formActiveUsers->createElement('radio', 'user_active', 'id="user_active1"', get_lang('Yes'), 1); + $group[] = $formActiveUsers->createElement('radio', 'user_active', 'id="user_active0"', get_lang('No'), 0); + $formActiveUsers->addGroup($group, 'active', get_lang('AccountActive')); + $formActiveUsers->addButtonSearch(get_lang('Search')); + $extraField = new ExtraField('user'); $extraField->addElements($formExtraField, 0, [], true); $formExtraField->addButtonSearch(get_lang('Search')); @@ -486,6 +500,15 @@ if ($nbStudents > 0) { } } + if ($formActiveUsers->validate()) { + $formValue = $formActiveUsers->getSubmitValue('active'); + if (isset($formValue['user_active'])) { + $active = (int) $formValue['user_active']; + $whereCondition = " AND user.active = $active "; + $conditions = ['where' => $whereCondition, 'inject_joins' => '']; + } + } + /*if ($formGroup->validate()) { $groupId = (int) $formGroup->getSubmitValue('group_id'); if (!empty($groupId)) { @@ -588,6 +611,7 @@ if ($nbStudents > 0) { $mainForm->addHtml(''); $html .= $mainForm->returnForm();