mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -08: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
152 lines
6.7 KiB
PHP
152 lines
6.7 KiB
PHP
@extends('layouts/default')
|
|
|
|
@section('title0')
|
|
{{ trans('admin/hardware/general.requested') }}
|
|
{{ trans('general.assets') }}
|
|
@stop
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
@yield('title0') @parent
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box">
|
|
<div class="box-body">
|
|
{{ Form::open([
|
|
'method' => 'POST',
|
|
'route' => ['hardware/bulkedit'],
|
|
'class' => 'form-inline',
|
|
'id' => 'bulkForm']) }}
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
|
|
@if ($requestedItems->count() > 0)
|
|
<div class="table-responsive">
|
|
<table
|
|
name="requestedAssets"
|
|
data-toolbar="#toolbar"
|
|
class="table table-striped snipe-table"
|
|
id="requestedAssets"
|
|
data-advanced-search="true"
|
|
data-search="true"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-pagination="true"
|
|
data-id-table="requestedAssets"
|
|
data-cookie-id-table="requestedAssets"
|
|
data-url="{{ route('api.consumables.index') }}"
|
|
data-export-options='{
|
|
"fileName": "export-assetrequests-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr role="row">
|
|
<th class="col-md-1">Image</th>
|
|
<th class="col-md-2">Item Name</th>
|
|
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
|
|
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
|
|
<th class="col-md-3" data-sortable="true">Requesting User</th>
|
|
<th class="col-md-2">Requested Date</th>
|
|
<th class="col-md-1"></th>
|
|
<th class="col-md-1"></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($requestedItems as $request)
|
|
|
|
@if ($request->requestable)
|
|
<tr>
|
|
{{ csrf_field() }}
|
|
<td>
|
|
@if (($request->itemType() == "asset") && ($request->requestable))
|
|
<a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>
|
|
@elseif (($request->itemType() == "asset_model") && ($request->requestable))
|
|
<a href="{{ url('/') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ url('/') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>
|
|
@endif
|
|
|
|
|
|
</td>
|
|
<td>
|
|
|
|
@if ($request->itemType() == "asset")
|
|
<a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}">
|
|
{{ $request->name() }}
|
|
</a>
|
|
@elseif ($request->itemType() == "asset_model")
|
|
<a href="{{ url('/') }}/models/{{ $request->requestable->id }}">
|
|
{{ $request->name() }}
|
|
</a>
|
|
@endif
|
|
|
|
</td>
|
|
@if ($request->location())
|
|
<td>{{ $request->location()->name }}</td>
|
|
@else
|
|
<td></td>
|
|
@endif
|
|
|
|
<td>
|
|
@if ($request->itemType() == "asset")
|
|
{{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }}
|
|
@endif
|
|
</td>
|
|
<td>
|
|
@if ($request->requestingUser())
|
|
<a href="{{ url('/') }}/users/{{ $request->requestingUser()->id }}">
|
|
{{ $request->requestingUser()->present()->fullName() }}
|
|
</a>
|
|
@else
|
|
(deleted user)
|
|
@endif
|
|
</td>
|
|
<td>{{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }}</td>
|
|
<td>
|
|
@if ($request->itemType() == "asset")
|
|
@if ($request->requestable->assigned_to=='')
|
|
<a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="Check this item out to a user">{{ trans('general.checkout') }}</a>
|
|
@else
|
|
<a href="{{ url('/') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this itemi">{{ trans('general.checkin') }}</a>
|
|
@endif
|
|
|
|
@endif
|
|
</td>
|
|
|
|
|
|
</tr>
|
|
@endif
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
@else
|
|
<div class="col-md-12">
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div> <!-- .col-md-12> -->
|
|
</div> <!-- .row -->
|
|
@stop
|
|
|
|
@section('moar_scripts')
|
|
@include ('partials.bootstrap-table', [
|
|
'exportFile' => 'requested-export',
|
|
'search' => true,
|
|
'clientSearch' => true,
|
|
])
|
|
|
|
@stop
|