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

Enable display of deleted acceptances, strike deleted users, add date, enable sorting

Browse source
This commit is contained in:
Dampfklon 2021-07-17 01:37:11 +02:00
parent 12ee06deb6
commit 4418ad2340
4 changed files with 51 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -911,14 +911,21 @@ class ReportsController extends Controller
* @author Vincent Sposato <vincent.sposato@gmail.com> * @author Vincent Sposato <vincent.sposato@gmail.com>
* @version v1.0 * @version v1.0
*/ */
public function getAssetAcceptanceReport() public function getAssetAcceptanceReport($deleted = false)
{ {
$this->authorize('reports.view'); $this->authorize('reports.view');
$showDeleted = $deleted == 'deleted';
/** /**
* Get all assets with pending checkout acceptances * Get all assets with pending checkout acceptances
*/ */
$acceptances = CheckoutAcceptance::pending()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get(); if($showDeleted) {
$acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
} else {
$acceptances = CheckoutAcceptance::pending()->with(['assignedTo' => function ($query) {
$query->withTrashed();
}, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
}
$assetsForReport = $acceptances $assetsForReport = $acceptances
->filter(function ($acceptance) { ->filter(function ($acceptance) {
@ -928,7 +935,7 @@ class ReportsController extends Controller
return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance]; return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
}); });
return view('reports/unaccepted_assets', compact('assetsForReport')); return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));
} }
/** /**
@ -997,14 +1004,19 @@ class ReportsController extends Controller
* @author Vincent Sposato <vincent.sposato@gmail.com> * @author Vincent Sposato <vincent.sposato@gmail.com>
* @version v1.0 * @version v1.0
*/ */
public function postAssetAcceptanceReport() public function postAssetAcceptanceReport($deleted = false)
{ {
$this->authorize('reports.view'); $this->authorize('reports.view');
$showDeleted = $deleted == 'deleted';
/** /**
* Get all assets with pending checkout acceptances * Get all assets with pending checkout acceptances
*/ */
if($showDeleted) {
$acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
} else {
$acceptances = CheckoutAcceptance::pending()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get(); $acceptances = CheckoutAcceptance::pending()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
}
$assetsForReport = $acceptances $assetsForReport = $acceptances
->filter(function($acceptance) { ->filter(function($acceptance) {

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

@ -248,4 +248,5 @@
'show_help' => 'Show help', 'show_help' => 'Show help',
'hide_help' => 'Hide help', 'hide_help' => 'Hide help',
'view_all' => 'view all', 'view_all' => 'view all',
'hide_deleted' => 'Hide Deleted',
]; ];

33
resources/views/reports/unaccepted_assets.blade.php
View file

@ -9,10 +9,22 @@
@stop @stop
@section('header_right') @section('header_right')
<div class="btn-toolbar" role="toolbar">
<div class="btn-group mr-2" role="group">
@if($showDeleted)
<a href="{{ route('reports/unaccepted_assets') }}" class="btn btn-default" ><i class="fa fa-trash icon-white" aria-hidden="true"></i> {{ trans('general.hide_deleted') }}</a>
@else
<a href="{{ route('reports/unaccepted_assets', ['deleted' => 'deleted']) }}" class="btn btn-default" ><i class="fa fa-trash icon-white" aria-hidden="true"></i> {{ trans('general.show_deleted') }}</a>
@endif
</div>
<div class="btn-group mr-2" role="group">
{{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }} {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
{{csrf_field()}} {{csrf_field()}}
<button type="submit" class="btn btn-default"><i class="fa fa-download icon-white" aria-hidden="true"></i> {{ trans('general.download_all') }}</button> <button type="submit" class="btn btn-default"><i class="fa fa-download icon-white" aria-hidden="true"></i> {{ trans('general.download_all') }}</button>
{{ Form::close() }} {{ Form::close() }}
</div>
</div>
@stop @stop
{{-- Page content --}} {{-- Page content --}}
@ -34,6 +46,7 @@
data-show-export="true" data-show-export="true"
data-show-refresh="true" data-show-refresh="true"
data-sort-order="asc" data-sort-order="asc"
data-sort-name="created_at"
id="unacceptedAssetsReport" id="unacceptedAssetsReport"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-export-options='{ data-export-options='{
@ -42,12 +55,13 @@
}'> }'>
<thead> <thead>
<tr role="row"> <tr role="row">
<th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th> <th class="col-sm-1" data-searchable="false" data-field="created_at" data-sortable="true">{{ trans('general.date') }}</th>
<th class="col-sm-1">{{ trans('general.category') }}</th> <th class="col-sm-1" data-sortable="true" >{{ trans('admin/companies/table.title') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/form.model') }}</th> <th class="col-sm-1" data-sortable="true" >{{ trans('general.category') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/form.name') }}</th> <th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/form.model') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/table.asset_tag') }}</th> <th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/form.name') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/table.checkoutto') }}</th> <th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/table.asset_tag') }}</th>
<th class="col-sm-1" data-sortable="true" >{{ trans('admin/hardware/table.checkoutto') }}</th>
<th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th> <th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
</tr> </tr>
</thead> </thead>
@ -55,16 +69,19 @@
@if ($assetsForReport) @if ($assetsForReport)
@foreach ($assetsForReport as $item) @foreach ($assetsForReport as $item)
@if ($item['assetItem']) @if ($item['assetItem'])
<tr> <tr @if($item['acceptance']->trashed()) style="text-decoration: line-through" @endif>
<td>{{ $item['acceptance']->created_at }}</td>
<td>{{ ($item['assetItem']->company) ? $assetItem->company->name : '' }}</td> <td>{{ ($item['assetItem']->company) ? $assetItem->company->name : '' }}</td>
<td>{!! $item['assetItem']->model->category->present()->nameUrl() !!}</td> <td>{!! $item['assetItem']->model->category->present()->nameUrl() !!}</td>
<td>{!! $item['assetItem']->present()->modelUrl() !!}</td> <td>{!! $item['assetItem']->present()->modelUrl() !!}</td>
<td>{!! $item['assetItem']->present()->nameUrl() !!}</td> <td>{!! $item['assetItem']->present()->nameUrl() !!}</td>
<td>{{ $item['assetItem']->asset_tag }}</td> <td>{{ $item['assetItem']->asset_tag }}</td>
<td>{!! ($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->nameUrl() : trans('admin/reports/general.deleted_user') !!}</td> <td @if($item['acceptance']->assignedTo === null || $item['acceptance']->assignedTo->trashed()) style="text-decoration: line-through" @endif>{!! ($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->nameUrl() : trans('admin/reports/general.deleted_user') !!}</td>
<td> <td>
@if(!$item['acceptance']->trashed())
@if ($item['acceptance']->assignedTo)<a href="{{ route('reports/unaccepted_assets_sent_reminder', ['acceptanceId' => $item['acceptance']->id]) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('admin/reports/general.send_reminder') }}</a>@endif @if ($item['acceptance']->assignedTo)<a href="{{ route('reports/unaccepted_assets_sent_reminder', ['acceptanceId' => $item['acceptance']->id]) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('admin/reports/general.send_reminder') }}</a>@endif
<a href="{{ route('reports/unaccepted_assets_delete', ['acceptanceId' => $item['acceptance']->id]) }}" class="btn btn-sm btn-danger delete-asset" data-tooltip="true" data-toggle="modal" data-content="{{ trans('general.delete_confirm', ['item' =>trans('admin/reports/general.acceptance_request')]) }}" data-title="{{ trans('general.delete') }}" onClick="return false;"><i class="fa fa-trash"></i></a> <a href="{{ route('reports/unaccepted_assets_delete', ['acceptanceId' => $item['acceptance']->id]) }}" class="btn btn-sm btn-danger delete-asset" data-tooltip="true" data-toggle="modal" data-content="{{ trans('general.delete_confirm', ['item' =>trans('admin/reports/general.acceptance_request')]) }}" data-title="{{ trans('general.delete') }}" onClick="return false;"><i class="fa fa-trash"></i></a>
@endif
</td> </td>
</tr> </tr>
@endif @endif

4
routes/web.php
View file

@ -319,7 +319,7 @@ Route::group(['middleware' => ['auth']], function () {
Route::post('reports/activity', [ReportsController::class, 'postActivityReport']); Route::post('reports/activity', [ReportsController::class, 'postActivityReport']);
Route::get( Route::get(
'reports/unaccepted_assets', 'reports/unaccepted_assets/{deleted?}',
[ReportsController::class, 'getAssetAcceptanceReport'] [ReportsController::class, 'getAssetAcceptanceReport']
)->name('reports/unaccepted_assets'); )->name('reports/unaccepted_assets');
Route::get( Route::get(
@ -331,7 +331,7 @@ Route::group(['middleware' => ['auth']], function () {
[ReportsController::class, 'deleteAssetAcceptance'] [ReportsController::class, 'deleteAssetAcceptance']
)->name('reports/unaccepted_assets_delete'); )->name('reports/unaccepted_assets_delete');
Route::post( Route::post(
'reports/unaccepted_assets', 'reports/unaccepted_assets/{deleted?}',
[ReportsController::class, 'exportAssetAcceptanceReport'] [ReportsController::class, 'exportAssetAcceptanceReport']
)->name('reports/export/unaccepted_assets'); )->name('reports/export/unaccepted_assets');
}); });