From 71be73781bbef25461d785f7b227074b73878ffa Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 19 Sep 2016 22:27:34 -0700 Subject: [PATCH] Add company name option to reports --- app/Http/Controllers/ReportsController.php | 9 +++++++++ resources/views/reports/custom.blade.php | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index d3f86767e4..5f0eb81832 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -399,6 +399,10 @@ class ReportsController extends Controller $rows = [ ]; $header = [ ]; + if (e(Input::get('company_name')) == '1') { + $header[] = 'Company Name'; + } + if (e(Input::get('asset_name')) == '1') { $header[] = 'Asset Name'; } @@ -464,6 +468,11 @@ class ReportsController extends Controller foreach ($assets as $asset) { $row = [ ]; + + if (e(Input::get('company_name')) == '1') { + $row[] = is_null($asset->company) ? '' : e($asset->company->name); + } + if (e(Input::get('asset_name')) == '1') { $row[] = '"' .e($asset->name) . '"'; } diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 6a5f489383..7625c49e38 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -34,6 +34,13 @@
+
+ +
+