diff --git a/src/Controller/ReportController.php b/src/Controller/ReportController.php
index cc22866b..ba0cbc4d 100644
--- a/src/Controller/ReportController.php
+++ b/src/Controller/ReportController.php
@@ -870,11 +870,22 @@ class ReportController extends Controller
         $hub_events = $this->getJobOrderEvents($req, JOEventType::HUB_ASSIGN);
         $arrive_events = $this->getJobOrderEvents($req, JOEventType::RIDER_ARRIVE);
         $accept_events = $this->getJobOrderEvents($req, JOEventType::RIDER_ACCEPT);
+        $assign_events = $this->getJobOrderEvents($req, JOEventType::RIDER_ASSIGN);
+        $depart_hub_events = $this->getJobOrderEvents($req, JOEventType::RIDER_DEPART_HUB);
+        $arrive_hub_prejo_events = $this->getJobOrderEvents($req, JOEventType::RIDER_ARRIVE_HUB_PRE_JO);
+        $depart_hub_prejo_events = $this->getJobOrderEvents($req, JOEventType::RIDER_DEPART_HUB_PRE_JO);
+        $start_events = $this->getJobOrderEvents($req, JOEventType::RIDER_START);
+        $end_events = $this->getJobOrderEvents($req, JOEventType::RIDER_END);
+        $arrive_hub_postjo_events = $this->getJobOrderEvents($req, JOEventType::RIDER_ARRIVE_HUB_POST_JO);
+        $depart_hub_postjo_events = $this->getJobOrderEvents($req, JOEventType::RIDER_DEPART_HUB_POST_JO);
+        $arrive_hub_events = $this->getJobOrderEvents($req, JOEventType::RIDER_ARRIVE_HUB);
 
         $blanks = [];
         array_push($blanks, array("\t","\t","\t","\t"));
 
-        $data = array_merge($hub_events, $blanks, $arrive_events, $blanks, $accept_events);
+        $data = array_merge($hub_events, $blanks, $assign_events, $blanks, $accept_events, $blanks, $depart_hub_events, $blanks,
+            $arrive_hub_prejo_events, $blanks, $depart_hub_prejo_events, $blanks, $arrive_events, $blanks, $start_events, $blanks,
+            $end_events, $blanks, $arrive_hub_postjo_events, $blanks, $depart_hub_postjo_events, $blanks, $arrive_hub_events);
 
         $resp = new StreamedResponse();
         $resp->setCallback(function() use ($data) {