mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 00:07:42 -07:00
8a6713d5c0
* WIP - beginning of improved requested assets - Use Ajax tables for faster loading - Use new notifications for requesting an asset TODO: - Use ajax tables for requestable asset models - Use new notifications for canceling an asset request - Expire requests once the asset has been checked out to the requesting user * Only show asset name in email if it has one * Refactor requested method to only include non-canceled requests * Refactored requestable assets to log request and cancelation * Added softdeletes on checkout requests * Differentiate between canceling and deleting requests * Added asset request cancelation notification * Added timestamps and corrected unique key on requests table * Improved requests view * Re-use blade for cancel/request email * Refactored BS table formatter for requested assets * Location name min reduced to 2 * Added PAT test as maintenance option This needs to be refactored into database-driven options with a UI * Better slack message * Added getImageUrl method for assets * Include qty in request notifications TODO: - Try to pull requested info from original request for cancelation, otherwise it will default to 1 * Removed old asset request/cancel emails * Added user profile asset request routes * Added profile controller requested assets method * Added blade link to requested assets for profile view * Sort user history desc * Added requested assets blade * Added canceled at to checkoutRequest method * Include qty in request * Fixed comment, removed allowed_columns * Removed Queable methods, since we don’t use a queue * Fixed return type in method doc * Fixed version number * Changed id to user_id for clarity
299 lines
11 KiB
PHP
Executable file
299 lines
11 KiB
PHP
Executable file
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
View Assets for {{ $user->present()->fullName() }}
|
|
@parent
|
|
@stop
|
|
|
|
{{-- Account page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
|
|
@if ($user->id)
|
|
<div class="box-header with-border">
|
|
<div class="box-heading">
|
|
<h3 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h3>
|
|
</div>
|
|
</div><!-- /.box-header -->
|
|
@endif
|
|
|
|
<div class="box-body">
|
|
<!-- checked out assets table -->
|
|
<div class="table-responsive">
|
|
|
|
<table
|
|
data-cookie="true"
|
|
data-cookie-id-table="userAssets"
|
|
data-pagination="true"
|
|
data-id-table="userAssets"
|
|
data-search="true"
|
|
data-side-pagination="client"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="userAssets"
|
|
class="table table-striped snipe-table"
|
|
data-export-options='{
|
|
"fileName": "my-assets-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr>
|
|
<th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('general.category') }}</th>
|
|
<th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_tag') }}</th>
|
|
<th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('general.name') }}</th>
|
|
<th class="col-md-4" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_model') }}</th>
|
|
<th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.serial') }}</th>
|
|
<th>{{ trans('general.image') }}</th>
|
|
</tr>
|
|
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($user->assets as $asset)
|
|
<tr>
|
|
<td>{{ $asset->model->category->name }}</td>
|
|
<td>{{ $asset->asset_tag }}</td>
|
|
<td>{{ $asset->name }}</td>
|
|
<td>
|
|
@if ($asset->physical=='1')
|
|
{{ $asset->model->name }}
|
|
@endif
|
|
</td>
|
|
<td>{{ $asset->serial }}</td>
|
|
<td>
|
|
@if (($asset->image) && ($asset->image!=''))
|
|
<img src="{{ url('/') }}/uploads/assets/{{ $asset->image }}" height="50" width="50">
|
|
|
|
@elseif (($asset->model) && ($asset->model->image!=''))
|
|
<img src="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" height="50" width="50">
|
|
@endif
|
|
</td>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div> <!-- .table-responsive-->
|
|
</div> <!-- .box-body-->
|
|
</div><!--.box.box-default-->
|
|
</div> <!-- .col-md-12-->
|
|
</div> <!-- .row-->
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
@if ($user->id)
|
|
<div class="box-header with-border">
|
|
<div class="box-heading">
|
|
<h3 class="box-title"> {{ trans('admin/users/general.software_user', array('name' => $user->first_name)) }}</h3>
|
|
</div>
|
|
</div><!-- /.box-header -->
|
|
@endif
|
|
|
|
<div class="box-body">
|
|
<!-- checked out licenses table -->
|
|
|
|
<div class="table-responsive">
|
|
<table
|
|
data-cookie-id-table="userLicenses"
|
|
data-pagination="true"
|
|
data-id-table="userLicenses"
|
|
data-search="true"
|
|
data-side-pagination="client"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="userLicenses"
|
|
class="table table-striped snipe-table"
|
|
data-export-options='{
|
|
"fileName": "my-licenses-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr>
|
|
<th class="col-md-5">{{ trans('general.name') }}</th>
|
|
<th class="col-md-4">{{ trans('admin/hardware/form.serial') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($user->licenses as $license)
|
|
<tr>
|
|
<td>{{ $license->name }}</td>
|
|
<td>
|
|
@can('viewKeys', $license)
|
|
{{ mb_strimwidth($license->serial, 0, 50, "...") }}
|
|
@else
|
|
------------
|
|
@endcan
|
|
</td>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div> <!-- .table-responsive-->
|
|
</div> <!-- .box-body-->
|
|
</div><!--.box.box-default-->
|
|
</div> <!-- .col-md-12-->
|
|
</div> <!-- .row-->
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
@if ($user->id)
|
|
<div class="box-header with-border">
|
|
<div class="box-heading">
|
|
<h3 class="box-title"> {{ trans('general.consumables') }} </h3>
|
|
</div>
|
|
</div><!-- /.box-header -->
|
|
@endif
|
|
|
|
<div class="box-body">
|
|
<!-- checked out consumables table -->
|
|
<div class="table-responsive">
|
|
<table
|
|
data-cookie-id-table="userConsumables"
|
|
data-pagination="true"
|
|
data-id-table="userConsumables"
|
|
data-search="true"
|
|
data-side-pagination="client"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="userConsumables"
|
|
class="table table-striped snipe-table"
|
|
data-export-options='{
|
|
"fileName": "my-consumables-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr>
|
|
<th class="col-md-12">{{ trans('general.name') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($user->consumables as $consumable)
|
|
<tr>
|
|
<td>{{ $consumable->name }}</td>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
|
|
</div> <!-- .box-body-->
|
|
</div><!--.box.box-default-->
|
|
</div> <!-- .col-md-12-->
|
|
</div> <!-- .row-->
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
|
|
@if ($user->id)
|
|
<div class="box-header with-border">
|
|
<div class="box-heading">
|
|
<h3 class="box-title"> {{ trans('general.accessories') }}</h3>
|
|
</div>
|
|
</div><!-- /.box-header -->
|
|
@endif
|
|
|
|
<div class="box-body">
|
|
<!-- checked out licenses table -->
|
|
|
|
<div class="table-responsive">
|
|
<table
|
|
data-cookie-id-table="userAccessories"
|
|
data-pagination="true"
|
|
data-id-table="userAccessories"
|
|
data-search="true"
|
|
data-side-pagination="client"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="userAccessories"
|
|
class="table table-striped snipe-table"
|
|
data-export-options='{
|
|
"fileName": "my-accessories-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr>
|
|
<th class="col-md-12">Name</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($user->accessories as $accessory)
|
|
<tr>
|
|
<td>{{ $accessory->name }}</td>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
</div> <!-- .box-body-->
|
|
</div><!--.box.box-default-->
|
|
</div> <!-- .col-md-12-->
|
|
</div> <!-- .row-->
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
@if ($user->id)
|
|
<div class="box-header with-border">
|
|
<div class="box-heading">
|
|
<h3 class="box-title"> History</h3>
|
|
</div>
|
|
</div><!-- /.box-header -->
|
|
@endif
|
|
|
|
<div class="box-body">
|
|
<div class="table-responsive">
|
|
<table
|
|
data-cookie-id-table="userActivityReport"
|
|
data-pagination="true"
|
|
data-id-table="userActivityReport"
|
|
data-search="true"
|
|
data-side-pagination="server"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="desc"
|
|
id="userActivityReport"
|
|
class="table table-striped snipe-table"
|
|
data-url="{{route('api.activity.index', ['target_id' => $user->id, 'target_type' => 'User', 'order' => 'desc']) }}"
|
|
data-export-options='{
|
|
"fileName": "my-history-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr>
|
|
<th data-switchable="true" data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"></th>
|
|
<th data-switchable="true" data-visible="true" class="col-sm-3" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
|
|
<th data-switchable="true" data-visible="true" class="col-sm-3" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
|
|
<th data-switchable="true" data-visible="true" class="col-sm-3" data-field="action_type">{{ trans('general.action') }}</th>
|
|
<th data-switchable="true" data-visible="true" class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div> <!--.table-responsive-->
|
|
|
|
</div> <!-- .box-body-->
|
|
</div><!--.box.box-default-->
|
|
</div> <!-- .col-md-12-->
|
|
</div> <!-- .row-->
|
|
|
|
@stop
|
|
|
|
@section('moar_scripts')
|
|
@include ('partials.bootstrap-table')
|
|
@stop
|