Userportal session list - Show end date null values at the end BT#14252

If setting "my_courses_session_order" is set to:

$_configuration['my_courses_session_order'] = ['field' => 'end_date', 'order' => 'asc'];
Null values will be shown at the end.

Author: jmontoyaa

main/inc/lib/api.lib.php

@@ -2574,6 +2574,7 @@ function api_get_session_visibility(
 
         return SESSION_AVAILABLE;
     }
+
     // If start date was set.
     if (!empty($row['access_start_date'])) {
         $visibility = $now > api_strtotime($row['access_start_date'], 'UTC') ? SESSION_AVAILABLE : SESSION_INVISIBLE;
@@ -2589,8 +2590,7 @@ function api_get_session_visibility(
         }
     }
 
-    /* If I'm a coach the visibility can change in my favor depending in
-     the coach dates */
+    // If I'm a coach the visibility can change in my favor depending in the coach dates.
     $isCoach = api_is_coach($session_id, $courseId);
 
     if ($isCoach) {

main/inc/lib/usermanager.lib.php

@@ -2923,7 +2923,8 @@ public static function get_sessions_by_category(
                     sc.dateStart AS session_category_date_start,
                     sc.dateEnd AS session_category_date_end,
                     s.coachAccessStartDate AS coach_access_start_date,
-                    s.coachAccessEndDate AS coach_access_end_date
+                    s.coachAccessEndDate AS coach_access_end_date,
+                    CASE WHEN s.accessEndDate IS NULL THEN 1 ELSE 0 END HIDDEN _isFieldNull
                     $position
                 FROM ChamiloCoreBundle:Session AS s
                 LEFT JOIN ChamiloCoreBundle:SessionRelCourseRelUser AS scu WITH scu.session = s
@@ -2949,13 +2950,18 @@ public static function get_sessions_by_category(
         $orderBySettings = api_get_configuration_value('my_courses_session_order');
         if (!empty($orderBySettings) && isset($orderBySettings['field']) && isset($orderBySettings['order'])) {
             $field = $orderBySettings['field'];
-            $order = $orderBySettings['order'];
+            $orderSetting = $orderBySettings['order'];
             switch ($field) {
                 case 'start_date':
-                    $order = " ORDER BY s.accessStartDate $order";
+                    $order = " ORDER BY s.accessStartDate $orderSetting";
                     break;
                 case 'end_date':
-                    $order = " ORDER BY s.accessEndDate $order";
+                    $order = " ORDER BY s.accessEndDate $orderSetting ";
+                    if ($orderSetting == 'asc') {
+                        // Put null values at the end
+                        // https://stackoverflow.com/questions/12652034/how-can-i-order-by-null-in-dql
+                        $order = " ORDER BY _isFieldNull asc, s.accessEndDate asc";
+                    }
                     break;
             }
         }