DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-10-02 05:37:53 -07:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Feature #9378 update phpdoc comment

Browse source
This commit is contained in:
sh1hab 2021-04-29 16:32:37 +06:00
parent 98a42afa78
commit 193a8d923b
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,6 @@ use App\Models\Depreciation;
use App\Models\License; use App\Models\License;
use App\Models\Setting; use App\Models\Setting;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
@ -417,7 +416,7 @@ class ReportsController extends Controller
// Open output stream // Open output stream
$handle = fopen('php://output', 'w'); $handle = fopen('php://output', 'w');
stream_set_timeout($handle, 2000); stream_set_timeout($handle, 2000);
if ($request->filled('use_bom')) { if ($request->filled('use_bom')) {
fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF)); fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF));
} }
@ -488,7 +487,7 @@ class ReportsController extends Controller
if ($request->filled('rtd_location')) { if ($request->filled('rtd_location')) {
$header[] = trans('admin/hardware/form.default_location'); $header[] = trans('admin/hardware/form.default_location');
} }
if ($request->filled('rtd_location_address')) { if ($request->filled('rtd_location_address')) {
$header[] = trans('general.address'); $header[] = trans('general.address');
$header[] = trans('general.address'); $header[] = trans('general.address');
@ -579,7 +578,7 @@ class ReportsController extends Controller
$assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with( $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with(
'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', 'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
'model.category', 'model.manufacturer','supplier'); 'model.category', 'model.manufacturer','supplier');
if ($request->filled('by_location_id')) { if ($request->filled('by_location_id')) {
$assets->where('assets.location_id', $request->input('by_location_id')); $assets->where('assets.location_id', $request->input('by_location_id'));
} }
@ -641,7 +640,7 @@ 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')]);
} }
$assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) { $assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) {
$executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"];
@ -650,7 +649,7 @@ class ReportsController extends Controller
foreach ($assets as $asset) { foreach ($assets as $asset) {
$count++; $count++;
$row = []; $row = [];
if ($request->filled('company')) { if ($request->filled('company')) {
$row[] = ($asset->company) ? $asset->company->name : ''; $row[] = ($asset->company) ? $asset->company->name : '';
} }
@ -699,7 +698,7 @@ class ReportsController extends Controller
if ($request->filled('supplier')) { if ($request->filled('supplier')) {
$row[] = ($asset->supplier) ? $asset->supplier->name : ''; $row[] = ($asset->supplier) ? $asset->supplier->name : '';
} }
if ($request->filled('location')) { if ($request->filled('location')) {
$row[] = ($asset->location) ? $asset->location->present()->name() : ''; $row[] = ($asset->location) ? $asset->location->present()->name() : '';
@ -930,9 +929,8 @@ class ReportsController extends Controller
* getAssetAcceptanceReport * getAssetAcceptanceReport
* *
* @return mixed * @return mixed
* @throws AuthorizationException
* @version v1.0
* @author Vincent Sposato <vincent.sposato@gmail.com> * @author Vincent Sposato <vincent.sposato@gmail.com>
* @version v1.0
*/ */
public function getAssetAcceptanceReport() public function getAssetAcceptanceReport()
{ {