From 207765f005f35dcf7047f2520c12804133b66cfa Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Sat, 11 Nov 2023 00:03:00 +0100
Subject: [PATCH] Internal: Fix to several queries + switching to new icons
 theme

---
 public/main/inc/lib/events.lib.php            |  5 +-
 public/main/inc/lib/myspace.lib.php           | 59 ++++++++-----------
 public/main/my_space/admin_view.php           |  8 ++-
 .../main/tracking/course_session_report.php   |  2 +-
 public/main/tracking/lp_results_by_user.php   |  2 +-
 .../main/tracking/question_course_report.php  |  5 +-
 6 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/public/main/inc/lib/events.lib.php b/public/main/inc/lib/events.lib.php
index e09e1641ed..8431b68b50 100644
--- a/public/main/inc/lib/events.lib.php
+++ b/public/main/inc/lib/events.lib.php
@@ -1787,18 +1787,15 @@ class Event
      * Get a list of all the exercises in a given learning path.
      *
      * @param int $lp_id
-     * @param int $course_id This parameter is probably deprecated as lp_id now is a global iid
      *
      * @return array
      */
-    public static function get_all_exercises_from_lp($lp_id, $course_id)
+    public static function get_all_exercises_from_lp($lp_id)
     {
         $lp_item_table = Database::get_course_table(TABLE_LP_ITEM);
-        $course_id = (int) $course_id;
         $lp_id = (int) $lp_id;
         $sql = "SELECT * FROM $lp_item_table
                 WHERE
-                    c_id = $course_id AND
                     lp_id = $lp_id AND
                     item_type = 'quiz'
                 ORDER BY parent_item_id, display_order";
diff --git a/public/main/inc/lib/myspace.lib.php b/public/main/inc/lib/myspace.lib.php
index 63844e5420..c96a03d9b6 100644
--- a/public/main/inc/lib/myspace.lib.php
+++ b/public/main/inc/lib/myspace.lib.php
@@ -15,11 +15,10 @@ use CpChart\Image as pImage;
 class MySpace
 {
     /**
-     * Get admin actions.
-     *
-     * @return string
+     * Generate the list of admin actions to be shown
+     * @return array
      */
-    public static function getAdminActions()
+    public static function generateAdminActionLinks(): array
     {
         $actions = [
             [
@@ -103,7 +102,16 @@ class MySpace
                     'content' => get_lang('LP item by author'),
                 ];
         }
-
+        return $actions;
+    }
+    /**
+     * Get admin actions.
+     *
+     * @return string
+     */
+    public static function getAdminActions(bool $display = false)
+    {
+        $actions = self::generateAdminActionLinks();
         return Display::actions($actions);
     }
 
@@ -114,40 +122,23 @@ class MySpace
     {
         $menuItems = [];
         $menuItems[] = Display::url(
-            Display::return_icon(
-                'statistics.png',
-                get_lang('View my progress'),
-                '',
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon('chart-box', 'ch-tool-icon', null, 32, get_lang('View my progress')),
             api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
         );
         $menuItems[] = Display::url(
-            Display::return_icon(
-                'teacher.png',
-                get_lang('Trainer View'),
-                [],
-                32
-            ),
+            Display::getMdiIcon('human-male-board', 'ch-tool-icon', null, 32, get_lang('Trainer View')),
             api_get_path(WEB_CODE_PATH).'my_space/index.php?view=teacher'
         );
         $menuItems[] = Display::url(
-            Display::return_icon(
-                'star_na.png',
-                get_lang('Admin view'),
-                [],
-                32
-            ),
+            Display::getMdiIcon('star', 'ch-tool-icon', null, 32, get_lang('Admin view')),
             '#'
         );
         $menuItems[] = Display::url(
-            Display::return_icon('quiz.png', get_lang('Exam tracking'), [], 32),
+            Display::getMdiIcon('order-bool-ascending-variant', 'ch-tool-icon', null, 32, get_lang('Exam tracking')),
             api_get_path(WEB_CODE_PATH).'tracking/exams.php'
         );
 
-        $menu = Display::toolbarAction('myspace', $menuItems);
-
-        return $menu;
+        return Display::toolbarAction('myspace', $menuItems);
     }
 
     /**
@@ -628,7 +619,7 @@ class MySpace
             $table_row[] = $nb_courses;
             $table_row[] = $nb_sessions;
             $table_row[] = '<a href="session.php?id_coach='.$coaches['user_id'].'">
-                '.Display::return_icon('2rightarrow.png', get_lang('Details')).'
+                '.Display::getMdiIcon('arrow-left-bold-box', 'ch-tool-icon', null, 22, get_lang('Details')).'
             </a>';
             $all_datas[] = $table_row;
 
@@ -1017,8 +1008,8 @@ class MySpace
                 "<tbody>";
             $index = 0;
             //icons for show and hode
-            $iconAdd = Display::return_icon('add.png', get_lang('ShowOrHide'), '', ICON_SIZE_SMALL);
-            $iconRemove = Display::return_icon('error.png', get_lang('ShowOrHide'), '', ICON_SIZE_SMALL);
+            $iconAdd = Display::getMdiIcon('plus', 'ch-tool-icon', null, 22, get_lang('ShowOrHide'));
+            $iconRemove = Display::getMdiIcon('delete', 'ch-tool-icon', null, 22, get_lang('ShowOrHide'));
             $teacherNameTemp = '';
             foreach ($data as $teacherName => $reportData) {
                 $lpCount = 0;
@@ -1042,7 +1033,7 @@ class MySpace
                         "<div id='$hiddenField' class='hidden'>";
                     foreach ($row['studentList'] as $student) {
                         $reportLink = Display::url(
-                            Display::return_icon('statistics.png', get_lang('Stats')),
+                            Display::getMdiIcon('chart-box', 'ch-tool-icon', null, 22, get_lang('Stats')),
                             api_get_path(WEB_CODE_PATH).'my_space/myStudents.php?details=true&student='.
                             $student['id']
                             .'&id_session='.$lpInfo['session_id']
@@ -1274,8 +1265,8 @@ class MySpace
                     "</thead>".
                     "<tbody>";
                 //Icon Constant
-                $iconAdd = Display::return_icon('add.png', get_lang('ShowOrHide'), '', ICON_SIZE_SMALL);
-                $iconRemove = Display::return_icon('error.png', get_lang('ShowOrHide'), '', ICON_SIZE_SMALL);
+                $iconAdd = Display::getMdiIcon('plus', 'ch-tool-icon', null, 22, get_lang('ShowOrHide'));
+                $iconRemove = Display::getMdiIcon('delete', 'ch-tool-icon', null, 22, get_lang('ShowOrHide'));
 
                 $lastAuthor = '';
                 $total = 0;
@@ -2568,7 +2559,7 @@ class MySpace
 
             //set the "from" value to know if I access the Reporting by the chamilo tab or the course link
             $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq='.$course_code.'&from=myspace&id_session='.$session_id.'">
-                             '.Display::return_icon('2rightarrow.png', get_lang('Details')).'
+                             '.Display::getMdiIcon('fast-forward-outline', 'ch-tool-icon', null, 22, get_lang('Details')).'
                              </a>
                             </center>';
 
diff --git a/public/main/my_space/admin_view.php b/public/main/my_space/admin_view.php
index 7b626a91ea..d368c40398 100644
--- a/public/main/my_space/admin_view.php
+++ b/public/main/my_space/admin_view.php
@@ -83,7 +83,13 @@ if ($exportCSV) {
 
 Display::display_header($nameTools);
 echo MySpace::getTopMenu();
-echo MySpace::getAdminActions();
+$actions = MySpace::generateAdminActionLinks();
+
+echo '<ul class="list-disc m-y-2">';
+foreach ($actions as $action) {
+    echo '<li><a href="'.$action['url'].'">'.$action['content'].'</a></li>'.PHP_EOL;
+}
+echo '</ul>';
 
 switch ($display) {
     case 'coaches':
diff --git a/public/main/tracking/course_session_report.php b/public/main/tracking/course_session_report.php
index e55baca6ca..ead57fc33a 100644
--- a/public/main/tracking/course_session_report.php
+++ b/public/main/tracking/course_session_report.php
@@ -99,7 +99,7 @@ foreach ($course_list as $current_course) {
 
     // Looping LPs
     foreach ($lp_list as $lp_id => $lp) {
-        $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id);
         // Looping Chamilo Exercises in LP
         foreach ($exercise_list as $exercise) {
             $exercise_stats = Event::get_all_exercise_event_from_lp(
diff --git a/public/main/tracking/lp_results_by_user.php b/public/main/tracking/lp_results_by_user.php
index 19a607155f..2bef9bf930 100644
--- a/public/main/tracking/lp_results_by_user.php
+++ b/public/main/tracking/lp_results_by_user.php
@@ -137,7 +137,7 @@ foreach ($course_list as $current_course) {
     // Looping LPs
     $lps = [];
     foreach ($lp_list as $lp_id => $lp) {
-        $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id);
         $attempt_result = [];
         // Looping Chamilo Exercises in LP
         foreach ($exercise_list as $exercise) {
diff --git a/public/main/tracking/question_course_report.php b/public/main/tracking/question_course_report.php
index c7f96d9401..7148e7c6c6 100644
--- a/public/main/tracking/question_course_report.php
+++ b/public/main/tracking/question_course_report.php
@@ -93,10 +93,7 @@ if (!empty($course_info)) {
     $main_question_list = [];
 
     foreach ($lp_list as $lp_id => $lp) {
-        $exercise_list = Event::get_all_exercises_from_lp(
-            $lp_id,
-            $course_info['real_id']
-        );
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id);
 
         foreach ($exercise_list as $exercise) {
             $my_exercise = new Exercise($course_info['real_id']);