Added notes to custom report

2017-02-03 02:20:56 -08:00
parent 7b1d2ee050
commit bb4c443cd9
2 changed files with 20 additions and 1 deletions
@@ -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') {