melabidi/alrahma_sunday_school_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parent, teacher and admin pages

Browse Source
This commit is contained in:
root
2026-04-25 00:00:23 -04:00
parent 4cd98f1d30
commit eafe4eb134
30 changed files with 1566 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Roles/RoleQueryService.php
+8 -2
View File
@@ -13,7 +13,10 @@ class RoleQueryService
{
$query = Role::query()
->select('roles.*')
->leftJoin('user_roles', 'user_roles.role_id', '=', 'roles.id')
->leftJoin('user_roles', function ($join) {
$join->on('user_roles.role_id', '=', 'roles.id')
->whereNull('user_roles.deleted_at');
})
->selectRaw('COUNT(DISTINCT user_roles.user_id) AS user_count')
->groupBy('roles.id');
@@ -42,7 +45,10 @@ class RoleQueryService
public function listUsersWithRoles(array $filters): LengthAwarePaginator
{
$query = DB::table('users')
->leftJoin('user_roles', 'user_roles.user_id', '=', 'users.id')
->leftJoin('user_roles', function ($join) {
$join->on('user_roles.user_id', '=', 'users.id')
->whereNull('user_roles.deleted_at');
})
->leftJoin('roles', 'roles.id', '=', 'user_roles.role_id')
->select(
'users.id',