[Trainings] adds event dates in presences

claroline · Feb 28, 2024 · d3414b0 · d3414b0
1 parent 313b495
commit d3414b0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 5 deletions.
diff --git a/src/plugin/cursus/Finder/EventPresenceFinder.php b/src/plugin/cursus/Finder/EventPresenceFinder.php
@@ -111,22 +111,39 @@ public function configureQueryBuilder(QueryBuilder $qb, array $searches = [], ar
                     break;
 
                 case 'session':
+                    if (!$eventJoin) {
+                        $qb->join('obj.event', 'e');
+                    }
                     if (!$sessionJoin) {
                         $qb->join('e.session', 's');
                     }
                     $qb->orderBy('s.name', $sortByDirection);
                     break;
 
                 case 'event':
+                    if (!$sessionJoin) {
+                        $qb->join('e.session', 's');
+                    }
+
+                    $qb->orderBy('e.name', $sortByDirection);
+                    break;
+
+                case 'startDate':
                     if (!$eventJoin) {
                         $qb->join('obj.event', 'e');
                     }
 
-                    if (!$sessionJoin) {
-                        $qb->join('e.session', 's');
+                    $qb->join('e.plannedObject', 'po');
+                    $qb->orderBy('po.startDate', $sortByDirection);
+                    break;
+
+                case 'endDate':
+                    if (!$eventJoin) {
+                        $qb->join('obj.event', 'e');
                     }
 
-                    $qb->orderBy('e.name', $sortByDirection);
+                    $qb->join('e.plannedObject', 'po');
+                    $qb->orderBy('po.endDate', $sortByDirection);
                     break;
             }
         }

diff --git a/src/plugin/cursus/Resources/modules/tools/events/components/presences.jsx b/src/plugin/cursus/Resources/modules/tools/events/components/presences.jsx
@@ -30,11 +30,28 @@ const EventsPresences = (props) =>
             type: 'training_event',
             label: trans('session_event', {}, 'cursus'),
             displayed: true
+          }, {
+            name: 'event.start',
+            alias: 'startDate',
+            type: 'date',
+            label: trans('start_date'),
+            displayed: true,
+            options: {
+              time: true
+            }
+          }, {
+            name: 'event.end',
+            alias: 'endDate',
+            type: 'date',
+            label: trans('end_date'),
+            options: {
+              time: true
+            },
+            displayed: true
           }, {
             name: 'session',
             type: 'training_session',
-            label: trans('session', {}, 'cursus'),
-            displayed: true
+            label: trans('session', {}, 'cursus')
           }
         ]}
       />