lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Set order by on companies

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-01-06 16:11:18 +00:00
parent 9564f7fdb8
commit 9672a13402
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/DepartmentsController.php
View file

@ -72,6 +72,9 @@ class DepartmentsController extends Controller
case 'manager': case 'manager':
$departments->OrderManager($order); $departments->OrderManager($order);
break; break;
case 'company':
$departments->OrderCompany($order);
break;
default: default:
$departments->orderBy($sort, $order); $departments->orderBy($sort, $order);
break; break;

13
app/Models/Department.php
View file

@ -141,4 +141,17 @@ class Department extends SnipeModel
{ {
return $query->leftJoin('users as department_user', 'departments.manager_id', '=', 'department_user.id')->orderBy('department_user.first_name', $order)->orderBy('department_user.last_name', $order); return $query->leftJoin('users as department_user', 'departments.manager_id', '=', 'department_user.id')->orderBy('department_user.first_name', $order)->orderBy('department_user.last_name', $order);
} }
/**
* Query builder scope to order on company
*
* @param \Illuminate\Database\Query\Builder $query Query builder instance
* @param text $order Order
*
* @return \Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeOrderCompany($query, $order)
{
return $query->leftJoin('companies as company_sort', 'departments.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order);
}
} }