Skip to content

A free open source IT asset/license management system

Added model number as a separate field, added sorting

snipe7056656eab43
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index 319a7b0b18..a6cfd21f68 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -82,6 +82,8 @@ class MaintenancesController extends Controller
'location',
'is_warranty',
'status_label',
+ 'model',
+ 'model_number',
];
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -100,6 +102,12 @@ class MaintenancesController extends Controller
case 'asset_name':
$maintenances = $maintenances->OrderByAssetName($order);
break;
+ case 'model':
+ $maintenances = $maintenances->OrderByAssetModelName($order);
+ break;
+ case 'model_number':
+ $maintenances = $maintenances->OrderByAssetModelNumber($order);
+ break;
case 'serial':
$maintenances = $maintenances->OrderByAssetSerial($order);
break;
diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php
index 05268de5ac..131a414a27 100644
--- a/app/Http/Transformers/MaintenancesTransformer.php
+++ b/app/Http/Transformers/MaintenancesTransformer.php
@@ -37,7 +37,8 @@ class MaintenancesTransformer
'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('maintenances/'.e($assetmaintenance->image)) : null,
'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [
'id' => (int) $assetmaintenance->asset->model->id,
- 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null,
+ 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name) : null,
+ 'model_number'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->model_number) : null,
] : null,
'status_label' => (($assetmaintenance->asset) && ($assetmaintenance->asset->assetstatus)) ? [
'id' => (int) $assetmaintenance->asset->assetstatus->id,
diff --git a/app/Models/Maintenance.php b/app/Models/Maintenance.php
index df26e8c94d..37b632d361 100644
--- a/app/Models/Maintenance.php
+++ b/app/Models/Maintenance.php
@@ -323,4 +323,18 @@ class Maintenance extends SnipeModel implements ICompanyableChild
{
return $query->leftJoin('users as admin_sort', 'maintenances.created_by', '=', 'admin_sort.id')->select('maintenances.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
}
+
+ public function scopeOrderByAssetModelName($query, $order)
+ {
+ return $query->join('assets as maintained_asset', 'maintenances.asset_id', '=', 'maintained_asset.id')
+ ->leftjoin('models as maintained_asset_model', 'maintained_asset_model.id', '=', 'maintained_asset.model_id')
+ ->orderBy('maintained_asset_model.name', $order);
+ }
+
+ public function scopeOrderByAssetModelNumber($query, $order)
+ {
+ return $query->join('assets as maintained_asset', 'maintenances.asset_id', '=', 'maintained_asset.id')
+ ->leftjoin('models as maintained_asset_model', 'maintained_asset_model.id', '=', 'maintained_asset.model_id')
+ ->orderBy('maintained_asset_model.model_number', $order);
+ }
}
diff --git a/app/Presenters/MaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.php
index 9edd0f5035..2438f61c16 100644
--- a/app/Presenters/MaintenancesPresenter.php
+++ b/app/Presenters/MaintenancesPresenter.php
@@ -81,6 +81,14 @@ class MaintenancesPresenter extends Presenter
'visible' => false,
'formatter' => 'modelsLinkObjFormatter',
], [
+ 'field' => 'model.model_number',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'switchable' => true,
+ 'title' => trans('general.model_no'),
+ 'visible' => true,
+ ],
+ [
'field' => 'supplier',
'searchable' => true,
'sortable' => true,