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

Merge pull request #10433 from inietov/features/adding_title_to_custom_report_master

Browse source 
Add title column to custom reports on master branch
This commit is contained in:
snipe 2021-12-14 10:28:18 -08:00 committed by GitHub
parent 25e2e7ecc6 c80aa2a289
commit ace4a00e29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -515,6 +515,10 @@ class ReportsController extends Controller
$header[] = trans('general.department');
}
if ($request->filled('title')) {
$header[] = trans('admin/users/table.title');
}
if ($request->filled('status')) {
$header[] = trans('general.status');
}
@ -754,7 +758,6 @@ class ReportsController extends Controller
}
}
if ($request->filled('department')) {
if ($asset->checkedOutToUser()) {
$row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : '';
@ -763,6 +766,14 @@ class ReportsController extends Controller
}
}
if ($request->filled('title')) {
if ($asset->checkedOutToUser()) {
$row[] = ($asset->assignedto) ? $asset->assignedto->jobtitle : '';
} else {
$row[] = ''; // Empty string if unassigned
}
}
if ($request->filled('status')) {
$row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
}

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

@ -235,9 +235,13 @@
</label>
</div>
<div class="checkbox col-md-12">
<label>
{{ Form::checkbox('title', '1', '1', ['class' => 'minimal']) }}
{{ trans('admin/users/table.title') }}
</label>
</div>
@if ($customfields->count() > 0)
<div class="checkbox col-md-12">