Reporting : Add filter by active users in course reporting - BT#19731

chamilo · Feb 23, 2022 · c74621a · c74621a
1 parent 9128008
commit c74621a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
@@ -2091,7 +2091,7 @@ public static function tip($text, $tip, string $tag = 'span')
         if (empty($tip)) {
             return $text;
         }
-        
+
         return self::tag(
             $tag,
             $text,

diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
@@ -8902,6 +8902,13 @@ public static function get_user_data(
              ) ";
         }
 
+        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
@@ -275,10 +275,20 @@ function(index) {
 $form_search->addHidden('id_session', $sessionId);
 $form_search->addHidden('cidReq', $courseCode);
 $form_search->addElement('text', 'user_keyword');
+
+// Filter by active users
+$activeChecked = isset($_GET['user_active']) ? (int) $_GET['user_active'] : '';
+$form_search->addElement('html', '<div class="form-group" style="margin: 0px 10px;">');
+$form_search->addElement('html', '<span>'.get_lang('ActiveAccount').'</span>: <span>
+<input type="radio" name="user_active" value="1" '.(1 === $activeChecked ? 'checked' : '').' /> '.get_lang('Yes').'&nbsp;
+<input type="radio" name="user_active" value="0" '.(0 === $activeChecked ? 'checked' : '').' /> '.get_lang('No').'</span>');
+$form_search->addElement('html', '</div>');
+
 $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'];