Tweak talk sort

joindin · Aug 10, 2021 · 318cf7e · 318cf7e
1 parent 3791648
commit 318cf7e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/src/Event/EventScheduler.php b/app/src/Event/EventScheduler.php
@@ -90,11 +90,11 @@ public function getEventDays($talks)
     protected function organiseTalksByDayAndTime($talks)
     {
         $talksByDay = [];
-
         usort($talks, function (TalkEntity $a, TalkEntity $b) {
-            return $a->getTracks() && $b->getTracks()
-                ? strcasecmp($b->getTracks()[0]->track_uri, $a->getTracks()[0]->track_uri)
-                : $b['id'] <=> $a['id'];
+            return $b->getStartDateTime() <=> $a->getStartDateTime() ?:
+                ($a->getTracks() && $b->getTracks()
+                    ? strcasecmp($a->getTracks()[0]->track_uri, $b->getTracks()[0]->track_uri)
+                    : $a['id'] <=> $b['id']);
         });
 
         foreach ($talks as $talk) {

diff --git a/app/src/Talk/TalkApi.php b/app/src/Talk/TalkApi.php
@@ -227,6 +227,12 @@ public function getAgenda($talksUri)
 
         $agenda = [];
 
+        usort($talks, function (TalkEntity $a, TalkEntity $b) {
+            return $b->getStartDateTime() <=> $a->getStartDateTime() ?:
+                ($a->getTracks() && $b->getTracks()
+                    ? strcasecmp($a->getTracks()[0]->track_uri, $b->getTracks()[0]->track_uri)
+                    : $a['id'] <=> $b['id']);
+        });
         foreach ($talks as $talk) {
             $date                   = $talk->getStartDateTime()->format("Y-m-d");
             $startTime              = $talk->getStartDateTime()->format("H:i");