Resolve "Hub Filter Report" #1524

Merged
korina.cordero merged 5 commits from 594-hub-filter-report into master-fix 2021-07-01 07:14:50 +00:00
Showing only changes of commit b39872e4e0 - Show all commits

View file

@ -1152,8 +1152,14 @@ class ReportController extends Controller
fputcsv($csv_handle, [ fputcsv($csv_handle, [
'Filtered Hub ID', 'Filtered Hub ID',
'Hub Name', 'Hub Name',
'Job Order ID',
'Customer ID',
'Customer Last Name',
'Customer First Name',
'Customer Mobile Number',
'Date Created', 'Date Created',
'Reason', 'Reason',
'Date of Rejection',
]); ]);
foreach ($data as $row) foreach ($data as $row)
@ -2325,7 +2331,7 @@ class ReportController extends Controller
$db = $em->getConnection(); $db = $em->getConnection();
// get hub filter logs // get hub filter logs
$sql = 'SELECT hf.hub_filtered_id, h.name, hf.date_create, hf.filter_type_id FROM hub_filter_log hf, hub h WHERE hf.hub_filtered_id=h.id AND hf.date_create >= :date_start AND hf.date_create <= :date_end'; $sql = 'SELECT hf.hub_filtered_id, h.name, hf.jo_id, hf.customer_id, c.last_name, c.first_name, c.phone_mobile, hf.date_create, hf.filter_type_id FROM hub_filter_log hf, hub h, customer c WHERE hf.hub_filtered_id=h.id AND c.id=hf.customer_id AND hf.date_create >= :date_start AND hf.date_create <= :date_end ORDER BY hf.date_create';
$stmt = $db->prepare($sql); $stmt = $db->prepare($sql);
$stmt->execute([ $stmt->execute([
'date_start' => $new_date_start, 'date_start' => $new_date_start,
@ -2339,8 +2345,14 @@ class ReportController extends Controller
$result[] = [ $result[] = [
$row[0], // filtered hub id $row[0], // filtered hub id
$row[1], // hub name $row[1], // hub name
$row[2], // date create $row[2], // job order id
$row[3], // reason $row[3], // customer id
$row[4], // customer last name
$row[5], // customer first name
$row[6], // customer mobile
$row[7], // date create
$row[8], // filter type id
$row[7], // date of rejection
]; ];
} }