From af5b5f4458a67897e31638190e7d6f4cf2e52f92 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 17 Apr 2016 13:08:58 +0300 Subject: [PATCH] Improve report name --- app/Http/Controllers/ReportController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index cfb9caaddef6..2d21e0b593c6 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -105,7 +105,7 @@ class ReportController extends BaseController $params = array_merge($params, self::generateReport($reportType, $startDate, $endDate, $dateField, $isExport)); if ($isExport) { - self::export($params['displayData'], $params['columns'], $params['reportTotals']); + self::export($reportType, $params['displayData'], $params['columns'], $params['reportTotals']); } } if ($enableChart) { @@ -514,11 +514,14 @@ class ReportController extends BaseController return $data; } - private function export($data, $columns, $totals) + private function export($reportType, $data, $columns, $totals) { $output = fopen('php://output', 'w') or Utils::fatalError(); + $reportType = trans("texts.{$reportType}s"); + $date = date('Y-m-d'); + header('Content-Type:application/csv'); - header('Content-Disposition:attachment;filename=ninja-report.csv'); + header("Content-Disposition:attachment;filename={$date}_Ninja_{$reportType}.csv"); Utils::exportData($output, $data, Utils::trans($columns));