DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added deleted at value

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-08-02 19:58:37 -07:00
parent 02caa13222
commit cc92d342ea
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -644,13 +644,13 @@ class ReportsController extends Controller
if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) { if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
$assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
} }
if($request->filled('exclude_archived')){ if ($request->filled('exclude_archived')) {
$assets->notArchived(); $assets->notArchived();
} }
if($request->input('deleted_assets') == '1'){ if ($request->input('deleted_assets') == '1') {
$assets->withTrashed(); $assets->withTrashed();
} }
if($request->input('deleted_assets') == '0'){ if ($request->input('deleted_assets') == '0') {
$assets->onlyTrashed(); $assets->onlyTrashed();
} }
@ -818,6 +818,10 @@ class ReportsController extends Controller
$row[] = ($asset->updated_at) ? $asset->updated_at : ''; $row[] = ($asset->updated_at) ? $asset->updated_at : '';
} }
if ($request->filled('deleted_at')) {
$row[] = ($asset->deleted_at) ? $asset->deleted_at : '';
}
if ($request->filled('last_audit_date')) { if ($request->filled('last_audit_date')) {
$row[] = ($asset->last_audit_date) ? $asset->last_audit_date : ''; $row[] = ($asset->last_audit_date) ? $asset->last_audit_date : '';
} }