fix: training activities merge quirk

Fixes issue where some activities never showed after the merge. Fixed by changing to concat function instead that doesn't overwrite if keys are thes ame
Vatsim-Scandinavia · Oct 26, 2024 · c4747ce · c4747ce
1 parent a5d353e
commit c4747ce
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
@@ -107,8 +107,12 @@ public function activities($filterArea = false)
         }
 
         if (isset($trainingReports) && isset($examinationReports)) {
-            $entries = $trainingReports->merge($examinationReports);
-            $entries = $entries->merge($activities);
+            $entries = $trainingReports->concat($examinationReports);
+            $entries = $entries->concat($activities);
+        } else if(isset($trainingReports)) {
+            $entries = $trainingReports->concat($activities);
+        } else if(isset($examinationReports)) {
+            $entries = $examinationReports->concat($activities);
         } else {
             $entries = $activities;
         }