Resolve "Add new events to JO Details and JO Events Reports" #1542

Merged
korina.cordero merged 3 commits from 618-add-new-events-to-jo-details-and-jo-events-reports into master-fix 2021-08-24 09:56:35 +00:00
Showing only changes of commit db4345aa71 - Show all commits

View file

@ -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) {