Use status_type instead of status for filtering
This commit is contained in:
snipe
@@ -127,7 +127,6 @@ class AssetsController extends Controller
|
||||
'location',
|
||||
'rtd_location',
|
||||
'category',
|
||||
'status_label',
|
||||
'manufacturer',
|
||||
'supplier',
|
||||
'jobtitle',
|
||||
@@ -232,7 +231,7 @@ class AssetsController extends Controller
|
||||
// We switched from using query scopes here because of a Laravel bug
|
||||
// related to fulltext searches on complex queries.
|
||||
// I am sad. :(
|
||||
switch ($request->input('status')) {
|
||||
switch ($request->input('status_type')) {
|
||||
case 'Deleted':
|
||||
$assets->onlyTrashed();
|
||||
break;
|
||||
@@ -404,7 +403,7 @@ class AssetsController extends Controller
|
||||
case 'rtd_location':
|
||||
$assets->OrderRtdLocation($order);
|
||||
break;
|
||||
case 'status_label':
|
||||
case 'status':
|
||||
$assets->OrderStatus($order);
|
||||
break;
|
||||
case 'supplier':
|
||||
|
||||
@@ -43,10 +43,10 @@ class BreadcrumbsServiceProvider extends ServiceProvider
|
||||
/**
|
||||
* Asset Breadcrumbs
|
||||
*/
|
||||
if ((request()->is('hardware*')) && (request()->status != '')) {
|
||||
if ((request()->is('hardware*')) && (request()->status_type != '')) {
|
||||
Breadcrumbs::for('hardware.index', fn (Trail $trail) => $trail->parent('home', route('home'))
|
||||
->push(trans('general.assets'), route('hardware.index'))
|
||||
->push(trans('general.'.strtolower(e(request()->status))), route('hardware.index', ['status' => request()->status]))
|
||||
->push(trans('general.' . strtolower(e(request()->status_type))), route('hardware.index', ['status_type' => request()->status_type]))
|
||||
);
|
||||
|
||||
} else {
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
@section('title0')
|
||||
|
||||
@php
|
||||
$requestStatus = request()->input('status');
|
||||
$requestOrderNumber = request()->input('order_number');
|
||||
$requestCompanyId = request()->input('company_id');
|
||||
$requestStatusId = request()->input('status_id');
|
||||
$requestStatusType = request()->input('status_type');
|
||||
$requestOrderNumber = request()->input('order_number');
|
||||
$requestCompanyId = request()->input('company_id');
|
||||
$requestStatusTypeId = request()->input('status_id');
|
||||
@endphp
|
||||
|
||||
@if (($requestCompanyId) && ($company))
|
||||
@@ -15,24 +15,24 @@
|
||||
|
||||
|
||||
|
||||
@if ($requestStatus)
|
||||
@if ($requestStatus=='Pending')
|
||||
@if ($requestStatusType)
|
||||
@if ($requestStatusType=='Pending')
|
||||
{{ trans('general.pending') }}
|
||||
@elseif ($requestStatus=='RTD')
|
||||
@elseif ($requestStatusType=='RTD')
|
||||
{{ trans('general.ready_to_deploy') }}
|
||||
@elseif ($requestStatus=='Deployed')
|
||||
@elseif ($requestStatusType=='Deployed')
|
||||
{{ trans('general.deployed') }}
|
||||
@elseif ($requestStatus=='Undeployable')
|
||||
@elseif ($requestStatusType=='Undeployable')
|
||||
{{ trans('general.undeployable') }}
|
||||
@elseif ($requestStatus=='Deployable')
|
||||
@elseif ($requestStatusType=='Deployable')
|
||||
{{ trans('general.deployed') }}
|
||||
@elseif ($requestStatus=='Requestable')
|
||||
@elseif ($requestStatusType=='Requestable')
|
||||
{{ trans('admin/hardware/general.requestable') }}
|
||||
@elseif ($requestStatus=='Archived')
|
||||
@elseif ($requestStatusType=='Archived')
|
||||
{{ trans('general.archived') }}
|
||||
@elseif ($requestStatus=='Deleted')
|
||||
@elseif ($requestStatusType=='Deleted')
|
||||
{{ ucfirst(trans('general.deleted')) }}
|
||||
@elseif ($requestStatus=='byod')
|
||||
@elseif ($requestStatusType=='byod')
|
||||
{{ strtoupper(trans('general.byod')) }}
|
||||
@endif
|
||||
@else
|
||||
@@ -56,10 +56,10 @@
|
||||
<x-container>
|
||||
<x-box name="assets">
|
||||
<x-table.assets :route="route('api.assets.index',
|
||||
array('status' => e($requestStatus),
|
||||
array('status_type' => e($requestStatusType),
|
||||
'order_number'=>e(strval($requestOrderNumber)),
|
||||
'company_id'=>e($requestCompanyId),
|
||||
'status_id'=>e($requestStatusId)))"/>
|
||||
'status_id'=>e($requestStatusTypeId)))"/>
|
||||
</x-box>
|
||||
</x-container>
|
||||
@stop
|
||||
|
||||
@@ -1505,49 +1505,53 @@
|
||||
@endif
|
||||
|
||||
|
||||
<li id="deployed-sidenav-option" {!! (request()->query('status') == 'Deployed' ? ' class="active"' : '') !!}>
|
||||
<a href="{{ url('hardware?status=Deployed') }}">
|
||||
<li id="deployed-sidenav-option" {!! (request()->query('status_type') == 'Deployed' ? ' class="active"' : '') !!}>
|
||||
<a href="{{ url('hardware?status_type=Deployed') }}">
|
||||
<x-icon type="circle" class="text-blue fa-fw" />
|
||||
{{ trans('general.deployed') }}
|
||||
<span class="badge">{{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="rtd-sidenav-option"{!! (request()->query('status') == 'RTD' ? ' class="active"' : '') !!}>
|
||||
<a href="{{ url('hardware?status=RTD') }}">
|
||||
<li id="rtd-sidenav-option"{!! (request()->query('status_type') == 'RTD' ? ' class="active"' : '') !!}>
|
||||
<a href="{{ url('hardware?status_type=RTD') }}">
|
||||
<x-icon type="circle" class="text-green fa-fw" />
|
||||
{{ trans('general.ready_to_deploy') }}
|
||||
<span class="badge">{{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="pending-sidenav-option"{!! (request()->query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}">
|
||||
<li id="pending-sidenav-option"{!! (request()->query('status_type') == 'Pending' ? ' class="active"' : '') !!}>
|
||||
<a href="{{ url('hardware?status_type=Pending') }}">
|
||||
<x-icon type="circle" class="text-orange fa-fw" />
|
||||
{{ trans('general.pending') }}
|
||||
<span class="badge">{{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="undeployable-sidenav-option"{!! (request()->query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a
|
||||
href="{{ url('hardware?status=Undeployable') }}">
|
||||
href="{{ url('hardware?status_type=Undeployable') }}">
|
||||
<x-icon type="x" class="text-red fa-fw" />
|
||||
{{ trans('general.undeployable') }}
|
||||
<span class="badge">{{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="byod-sidenav-option"{!! (request()->query('status') == 'byod' ? ' class="active"' : '') !!}><a
|
||||
href="{{ url('hardware?status=byod') }}">
|
||||
<li id="byod-sidenav-option"{!! (request()->query('status_type') == 'byod' ? ' class="active"' : '') !!}>
|
||||
<a
|
||||
href="{{ url('hardware?status_type=byod') }}">
|
||||
<x-icon type="x" class="text-red fa-fw" />
|
||||
{{ trans('general.byod') }}
|
||||
<span class="badge">{{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="archived-sidenav-option"{!! (request()->query('status') == 'Archived' ? ' class="active"' : '') !!}><a
|
||||
href="{{ url('hardware?status=Archived') }}">
|
||||
<li id="archived-sidenav-option"{!! (request()->query('status_type') == 'Archived' ? ' class="active"' : '') !!}>
|
||||
<a
|
||||
href="{{ url('hardware?status_type=Archived') }}">
|
||||
<x-icon type="x" class="text-red fa-fw" />
|
||||
{{ trans('admin/hardware/general.archived') }}
|
||||
<span class="badge">{{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li id="requestable-sidenav-option"{!! (request()->query('status') == 'Requestable' ? ' class="active"' : '') !!}><a
|
||||
href="{{ url('hardware?status=Requestable') }}">
|
||||
<li id="requestable-sidenav-option"{!! (request()->query('status_type') == 'Requestable' ? ' class="active"' : '') !!}>
|
||||
<a
|
||||
href="{{ url('hardware?status_type=Requestable') }}">
|
||||
<x-icon type="checkmark" class="text-blue fa-fw" />
|
||||
{{ trans('admin/hardware/general.requestable') }}
|
||||
</a>
|
||||
|
||||
@@ -397,14 +397,14 @@
|
||||
},
|
||||
|
||||
btnShowDeleted: {
|
||||
text: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
|
||||
text: '{{ (request()->input('status_type') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
|
||||
icon: 'fa-solid fa-trash',
|
||||
event () {
|
||||
window.location.href = '{{ (request()->input('status') == "Deleted") ? route('hardware.index') : route('hardware.index', ['status' => 'Deleted']) }}';
|
||||
window.location.href = '{{ (request()->input('status_type') == "Deleted") ? route('hardware.index') : route('hardware.index', ['status_type' => 'Deleted']) }}';
|
||||
},
|
||||
attributes: {
|
||||
class: '{{ (request()->input('status') == "Deleted") ? 'btn-selected' : '' }}',
|
||||
title: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
|
||||
class: '{{ (request()->input('status_type') == "Deleted") ? 'btn-selected' : '' }}',
|
||||
title: '{{ (request()->input('status_type') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user