DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Include notes in custom asset report

Browse source
This commit is contained in:
snipe 2017-02-03 02:16:37 -08:00
parent f1592aa63f
commit 729b709de2
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/ReportsController.php
View file

@ -502,6 +502,10 @@ class ReportsController extends Controller
$header[] = trans('admin/hardware/form.expected_checkin'); $header[] = trans('admin/hardware/form.expected_checkin');
} }
if (e(Input::get('notes')) == '1') {
$header[] = 'Notes';
}
foreach ($customfields as $customfield) { foreach ($customfields as $customfield) {
if (e(Input::get($customfield->db_column_name())) == '1') { if (e(Input::get($customfield->db_column_name())) == '1') {
@ -638,6 +642,14 @@ class ReportsController extends Controller
} }
} }
if (e(Input::get('notes')) == '1') {
if ($asset->notes) {
$row[] = '"' .$asset->notes. '"';
} else {
$row[] = ''; // Empty string if unassigned
}
}
foreach ($customfields as $customfield) { foreach ($customfields as $customfield) {
$column_name = $customfield->db_column_name(); $column_name = $customfield->db_column_name();
if (e(Input::get($customfield->db_column_name())) == '1') { if (e(Input::get($customfield->db_column_name())) == '1') {

6
resources/views/reports/custom.blade.php
View file

@ -150,6 +150,12 @@
{{ trans('admin/hardware/form.expected_checkin') }} {{ trans('admin/hardware/form.expected_checkin') }}
</label> </label>
</div> </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"> <div class="checkbox col-md-12">