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

Added sorting by status label

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-02-14 09:58:39 +00:00
parent 56ba26eb45
commit 35a70988cb
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Api/AssetMaintenancesController.php
View file

@ -37,7 +37,7 @@ class AssetMaintenancesController extends Controller
$this->authorize('view', Asset::class); $this->authorize('view', Asset::class);
$maintenances = AssetMaintenance::select('asset_maintenances.*') $maintenances = AssetMaintenance::select('asset_maintenances.*')
->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'admin'); ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'admin');
if ($request->filled('search')) { if ($request->filled('search')) {
$maintenances = $maintenances->TextSearch($request->input('search')); $maintenances = $maintenances->TextSearch($request->input('search'));
@ -75,7 +75,9 @@ class AssetMaintenancesController extends Controller
'user_id', 'user_id',
'supplier', 'supplier',
'is_warranty', 'is_warranty',
'status_label',
]; ];
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
@ -93,9 +95,11 @@ class AssetMaintenancesController extends Controller
$maintenances = $maintenances->OrderByAssetName($order); $maintenances = $maintenances->OrderByAssetName($order);
break; break;
case 'serial': case 'serial':
\Log::debug('sort by serial');
$maintenances = $maintenances->OrderByAssetSerial($order); $maintenances = $maintenances->OrderByAssetSerial($order);
break; break;
case 'status_label':
$maintenances = $maintenances->OrderStatusName($order);
break;
default: default:
$maintenances = $maintenances->orderBy($sort, $order); $maintenances = $maintenances->orderBy($sort, $order);
break; break;