UI improvements in the session view see BT#9746

main/admin/resume_session.php

@@ -290,9 +290,7 @@ if ($session['nbr_courses'] == 0) {
 } else {
 	// select the courses
 
-    //$orderBy = "ORDER BY position";
-    $orderBy = '';
-
+    $orderBy = "ORDER BY position";
 	$sql = "SELECT c.id, code, title, visual_code, nbr_users
 			FROM $tbl_course c INNER JOIN $tbl_session_rel_course sc
 			ON (c.id = sc.c_id)

main/inc/lib/sessionmanager.lib.php

@@ -5130,7 +5130,6 @@ class SessionManager
 
         $position = array();
         $count = 0;
-
         foreach ($courseList as $course) {
             if ($course['position'] == '') {
                 $course['position'] = $count;

main/inc/lib/tracking.lib.php

@@ -3969,11 +3969,17 @@ class Tracking
      * @param int $session_id
      * @param string $extra_params
      * @param bool $show_courses
+     * @param bool $showAllSessions
      *
      * @return string
      */
-    public static function show_user_progress($user_id, $session_id = 0, $extra_params = '', $show_courses = true, $showAllSessions = true)
-    {
+    public static function show_user_progress(
+        $user_id,
+        $session_id = 0,
+        $extra_params = '',
+        $show_courses = true,
+        $showAllSessions = true
+    ) {
         $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
         $tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -3982,6 +3988,8 @@ class Tracking
         $tbl_access_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
         $user_id = intval($user_id);
+        $session_id = intval($session_id);
+
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT c.code, title
                     FROM $tbl_course_user cu
@@ -4013,13 +4021,18 @@ class Tracking
         $orderBy = " ORDER BY name ";
         $extraInnerJoin = null;
 
-        if (!empty($session_id)) {
+        if (SessionManager::orderCourseIsEnabled() && !empty($session_id)) {
             $orderBy = " ORDER BY s.id, position ";
             $tableSessionRelCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
             $extraInnerJoin = " INNER JOIN $tableSessionRelCourse src
                                 ON (cu.c_id = src.c_id AND src.session_id = $session_id) ";
         }
 
+        $sessionCondition = '';
+        if (!empty($session_id)) {
+            $sessionCondition = " AND s.id = $session_id";
+        }
+
         // Get the list of sessions where the user is subscribed as student
         if (api_is_multiple_url_enabled()) {
             $sql = "SELECT DISTINCT c.code, s.id as session_id, name
@@ -4034,6 +4047,7 @@ class Tracking
                     WHERE
                         cu.user_id = $user_id AND
                         access_url_id = ".api_get_current_access_url_id()."
+                        $sessionCondition
                     $orderBy ";
         } else {
             $sql = "SELECT DISTINCT c.code, s.id as session_id, name
@@ -4043,7 +4057,9 @@ class Tracking
                     INNER JOIN $tbl_course c
                     ON (c.id = cu.c_id)
                     $extraInnerJoin
-                    WHERE cu.user_id = $user_id
+                    WHERE
+                        cu.user_id = $user_id
+                        $sessionCondition
                     $orderBy ";
         }
 

main/session/index.php

@@ -6,7 +6,7 @@
 *   @author Julio Montoya <gugli100@gmail.com>  Beeznest
 */
 
-use \ChamiloSession as Session;
+use ChamiloSession as Session;
 
 $cidReset = true;
 
@@ -573,22 +573,30 @@ $(function() {
 <?php
 
 $courseCode = isset($_GET['course']) ? $_GET['course'] : null;
-
-$my_reporting = '';
-
+$reportingTab = '';
 if (!api_is_anonymous()) {
-    $my_reporting = Tracking::show_user_progress(api_get_user_id(), $session_id, '#tabs-4', false, false);
-
-    if (!empty($my_reporting))  {
-        $my_reporting  .= '<br />'.Tracking::show_course_detail(api_get_user_id(), $courseCode, $session_id);
+    $reportingTab = Tracking::show_user_progress(
+        api_get_user_id(),
+        $session_id,
+        '#tabs-4',
+        false,
+        false
+    );
+    if (!empty($reportingTab))  {
+        $reportingTab .= '<br />'.Tracking::show_course_detail(
+                api_get_user_id(),
+                $courseCode,
+                $session_id
+            );
     }
-    if (empty($my_reporting)) {
-        $my_reporting  = Display::return_message(get_lang('NoDataAvailable'), 'warning');
+    if (empty($reportingTab)) {
+        $reportingTab  = Display::return_message(get_lang('NoDataAvailable'), 'warning');
     }
 }
 
 // Main headers
 $headers = array(
+    Display::return_icon('moderator_star.png'),
     get_lang('Courses'),
     get_lang('LearningPaths')
 );
@@ -599,31 +607,35 @@ if (!api_is_anonymous()) {
 }
 
 // Sub headers
-$sub_header = array(
+/*$sub_header = array(
     get_lang('AllLearningPaths'),
     get_lang('PerWeek'),
     get_lang('ByCourse')
 );
 
 // Sub headers data
-$lp_tabs = Display::tabs(
+$lpTab = Display::tabs(
     $sub_header,
     array(
-        Display::grid_html('list_default'),
+        //Display::grid_html('list_default'),
         Display::grid_html('list_week'),
-        Display::grid_html('list_course')
+        //Display::grid_html('list_course')
     ),
     'sub_tab'
-);
-$courses_tab =  Display::grid_html('courses');
+);*/
+
+$coursesTab = Display::grid_html('courses');
+
+$starTab = Display::grid_html('list_default');
 // Main headers data
 echo Display::tabs(
     $headers,
     array(
-        $courses_tab,
-        $lp_tabs,
+        $starTab,
+        $coursesTab,
+        Display::grid_html('list_course'),
         Display::grid_html('exercises'),
-        $my_reporting
+        $reportingTab
     )
 );