DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added notes to custom report

Browse source
This commit is contained in:
snipe 2017-02-03 02:20:56 -08:00
parent 7b1d2ee050
commit bb4c443cd9
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -580,6 +580,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[] = trans('general.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') {
@ -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) { 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') {

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

@ -159,11 +159,18 @@
{{ 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">
<label> <label>
{{ Form::checkbox($customfield->db_column_name(), '1') }} {{ Form::checkbox($customfield->db_column_name(), '1') }}