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

Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include

Browse source 
adds a checkbox to exclude archived assets from custom reports
This commit is contained in:
snipe 2022-07-12 12:59:18 -07:00 committed by GitHub
parent bb5ac900ec 27039325f3
commit 0ccd7e09de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -642,6 +642,10 @@ 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')){
$assets->notArchived();
}
$assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];

1
resources/lang/en/general.php
View file

@ -101,6 +101,7 @@ return [
'employee_number' => 'Employee Number', 'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing', 'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error', 'error' => 'Error',
'exclude_archived' => 'Exclude Archived Assets',
'example' => 'Example: ', 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)', 'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',

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

@ -340,11 +340,14 @@
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
<label>
{{ Form::checkbox('exclude_archived', '1') }}
{{ trans('general.exclude_archived') }}
</label>
<label> <label>
{{ Form::checkbox('use_bom', '1') }} {{ Form::checkbox('use_bom', '1') }}
{{ trans('general.bom_remark') }} {{ trans('general.bom_remark') }}
</label> </label>
</div> </div>
</div> </div>