Add setting "show_all_sessions_on_my_course_page" see BT#13590

Show all sessions (old, current and future) in the "my courses" page.

Author: jmontoyaa

main/inc/lib/usermanager.lib.php

@@ -2798,8 +2798,14 @@ public static function get_sessions_by_category(
                 LEFT JOIN ChamiloCoreBundle:SessionRelCourseRelUser AS scu WITH scu.session = s
                 INNER JOIN ChamiloCoreBundle:AccessUrlRelSession AS url WITH url.sessionId = s.id
                 LEFT JOIN ChamiloCoreBundle:SessionCategory AS sc WITH s.category = sc
-                WHERE (scu.user = :user OR s.generalCoach = :user) AND url.accessUrlId = :url
-                ORDER BY sc.name, s.name";
+                WHERE (scu.user = :user OR s.generalCoach = :user) AND url.accessUrlId = :url ";
+
+        $order = "ORDER BY sc.name, s.name";
+        $showAllSessions = api_get_configuration_value('show_all_sessions_on_my_course_page') === true;
+        if ($showAllSessions) {
+            $order = "ORDER BY s.accessStartDate";
+        }
+        $dql .= $order;
 
         $dql = Database::getManager()
             ->createQuery($dql)

main/inc/lib/userportal.lib.php

@@ -1170,6 +1170,7 @@ public function returnCoursesAndSessions(
 
         $coursesWithoutCategoryTemplate = '/user_portal/classic_courses_without_category.tpl';
         $coursesWithCategoryTemplate = '/user_portal/classic_courses_with_category.tpl';
+        $showAllSessions = api_get_configuration_value('show_all_sessions_on_my_course_page') === true;
 
         if ($loadHistory) {
             // Load sessions in category in *history*
@@ -1187,6 +1188,7 @@ public function returnCoursesAndSessions(
         $studentInfo = api_get_configuration_value('course_student_info');
         $viewGrid = api_get_configuration_value('view_grid_courses');
 
+
         $studentInfoProgress = !empty($studentInfo['progress']) && $studentInfo['progress'] === true;
         $studentInfoScore = !empty($studentInfo['score']) && $studentInfo['score'] === true;
         $studentInfoCertificate = !empty($studentInfo['certificate']) && $studentInfo['certificate'] === true;
@@ -1465,6 +1467,8 @@ public function returnCoursesAndSessions(
                             // Loop course content
                             $html_courses_session = [];
                             $atLeastOneCourseIsVisible = false;
+                            $markAsOld = false;
+                            $markAsFuture = false;
 
                             foreach ($session['courses'] as $course) {
                                 $is_coach_course = api_is_coach($session_id, $course['real_id']);
@@ -1478,6 +1482,7 @@ public function returnCoursesAndSessions(
                                         $allowed_time = api_strtotime($date_session_start);
                                     }
 
+                                    $endSessionToTms = null;
                                     if (!isset($_GET['history'])) {
                                         if (!empty($date_session_end)) {
                                             if ($is_coach_course) {
@@ -1503,6 +1508,17 @@ public function returnCoursesAndSessions(
                                     }
                                 }
 
+                                if ($showAllSessions) {
+                                    if ($allowed_time < $session_now && $allowedEndTime == false) {
+                                        $markAsOld = true;
+                                    }
+                                    if ($allowed_time > $session_now && $endSessionToTms > $session_now) {
+                                        $markAsFuture = true;
+                                    }
+                                    $allowedEndTime = true;
+                                    $allowed_time = 0;
+                                }
+
                                 if ($session_now >= $allowed_time && $allowedEndTime) {
                                     // Read only and accessible.
                                     $atLeastOneCourseIsVisible = true;
@@ -1612,6 +1628,8 @@ public function returnCoursesAndSessions(
                                     $html_courses_session
                                 );
                                 $params['courses'] = $html_courses_session;
+                                $params['is_old'] = $markAsOld;
+                                $params['is_future'] = $markAsFuture;
 
                                 if ($showSimpleSessionInfo) {
                                     $params['subtitle'] = self::getSimpleSessionDetails(
@@ -1728,10 +1746,16 @@ public function returnCoursesAndSessions(
                                     }
 
                                     $this->tpl->assign('session', $sessionParams);
-                                    $html_sessions .= $this->tpl->fetch(
-                                        $this->tpl->get_template('user_portal/classic_session.tpl')
-                                    );
 
+                                    if ($viewGridCourses) {
+                                        $html_sessions .= $this->tpl->fetch(
+                                            $this->tpl->get_template('/user_portal/grid_session.tpl')
+                                        );
+                                    } else {
+                                        $html_sessions .= $this->tpl->fetch(
+                                            $this->tpl->get_template('user_portal/classic_session.tpl')
+                                        );
+                                    }
                                     $sessionCount++;
                                 }
                             }

main/install/configuration.dist.php

@@ -671,3 +671,5 @@
 ];*/
 // Disable jquery, jquery-ui libs added in the learning path view
 //$_configuration['disable_js_in_lp_view'] = true;
+// Show all sessions (old, current, future) in my course page
+//$_configuration['show_all_sessions_on_my_course_page'] = true;