From 31898d0f850caec697955336d8f9c06bf24e7293 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 12 Oct 2016 14:18:51 -0700
Subject: [PATCH] Fixes  #2751 - asset tag added to asset maintenance report

---
 app/Http/Controllers/ReportsController.php           | 2 ++
 resources/views/reports/asset_maintenances.blade.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index ef896fa9f5..85f65d26b7 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -755,6 +755,7 @@ class ReportsController extends Controller
         $rows = [ ];
 
         $header = [
+            trans('admin/hardware/table.asset_tag'),
             trans('admin/asset_maintenances/table.asset_name'),
             trans('admin/asset_maintenances/table.supplier_name'),
             trans('admin/asset_maintenances/form.asset_maintenance_type'),
@@ -770,6 +771,7 @@ class ReportsController extends Controller
 
         foreach ($assetMaintenances as $assetMaintenance) {
             $row   = [ ];
+            $row[] = str_replace(',', '', e($assetMaintenance->asset->asset_tag));
             $row[] = str_replace(',', '', e($assetMaintenance->asset->name));
             $row[] = str_replace(',', '', e($assetMaintenance->supplier->name));
             $row[] = e($assetMaintenance->improvement_type);
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index b602c98362..2dd4573c49 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -25,6 +25,7 @@
                 <thead>
                     <tr role="row">
                         <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
+                        <th class="col-sm-1">{{ trans('admin/hardware/table.asset_tag') }}</th>
                         <th class="col-sm-1">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
                         <th class="col-sm-1">{{ trans('admin/asset_maintenances/table.supplier_name') }}</th>
                         <th class="col-sm-1">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}</th>
@@ -43,6 +44,7 @@
                 @foreach ($assetMaintenances as $assetMaintenance)
                     <tr>
                         <td>{{ is_null($assetMaintenance->asset->company) ? '' : $assetMaintenance->asset->company->name }}</td>
+                        <td>{{ $assetMaintenance->asset->asset_tag }}</td>
                         <td>{{ $assetMaintenance->asset->name }}</td>
                         <td>{{ $assetMaintenance->supplier->name }}</td>
                         <td>{{ $assetMaintenance->asset_maintenance_type }}</td>