From bb4c443cd91c7235cf8e68d9f8ed2e4168e554df Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 3 Feb 2017 02:20:56 -0800
Subject: [PATCH] Added notes to custom report

---
 app/Http/Controllers/ReportsController.php | 12 ++++++++++++
 resources/views/reports/custom.blade.php   |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index b1483f094e..ba2b5bf780 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -580,6 +580,10 @@ class ReportsController extends Controller
             $header[] = trans('admin/hardware/form.expected_checkin');
         }
 
+        if (e(Input::get('notes')) == '1') {
+            $header[] = trans('general.notes');
+        }
+
 
         foreach ($customfields as $customfield) {
             if (e(Input::get($customfield->db_column_name())) == '1') {
@@ -724,6 +728,14 @@ class ReportsController extends Controller
                 }
             }
 
+            if (e(Input::get('notes')) == '1') {
+                if ($asset->notes) {
+                    $row[] = '"' .$asset->notes . '"';
+                } else {
+                    $row[] = '';
+                }
+            }
+
             foreach ($customfields as $customfield) {
                 $column_name = $customfield->db_column_name();
                 if (e(Input::get($customfield->db_column_name())) == '1') {
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 756ea16f77..d9892526b3 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -159,11 +159,18 @@
             {{ trans('admin/hardware/form.expected_checkin') }}
           </label>
         </div>
+        <div class="checkbox col-md-12">
+          <label>
+            {{ Form::checkbox('notes', '1') }}
+            {{ trans('general.notes') }}
+          </label>
+        </div>
 
 
 
 
-          @foreach ($customfields as $customfield)
+
+        @foreach ($customfields as $customfield)
             <div class="checkbox col-md-12">
               <label>
                 {{ Form::checkbox($customfield->db_column_name(), '1') }}