From 249ff868e5e06ea6e5b6a293abce9ee841aedfd9 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 4 Jan 2024 14:26:07 -0800 Subject: [PATCH 1/3] removes empty seats when sorting by department --- app/Models/LicenseSeat.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index 8a51c0c9cf6f..397a14146870 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -126,6 +126,7 @@ public function scopeOrderDepartments($query, $order) { return $query->leftJoin('users as license_seat_users', 'license_seats.assigned_to', '=', 'license_seat_users.id') ->leftJoin('departments as license_user_dept', 'license_user_dept.id', '=', 'license_seat_users.department_id') + ->whereNotNull('license_seats.assigned_to') ->orderBy('license_user_dept.name', $order); } } From 07eeaea3bf37ba05f3dc48347339749ac659e029 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 4 Jan 2024 14:30:59 -0800 Subject: [PATCH 2/3] adds an additional clause --- app/Models/LicenseSeat.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index 397a14146870..9bd9a66cfa8d 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -127,6 +127,7 @@ public function scopeOrderDepartments($query, $order) return $query->leftJoin('users as license_seat_users', 'license_seats.assigned_to', '=', 'license_seat_users.id') ->leftJoin('departments as license_user_dept', 'license_user_dept.id', '=', 'license_seat_users.department_id') ->whereNotNull('license_seats.assigned_to') + ->whereNotNull('license_user_dept.id') ->orderBy('license_user_dept.name', $order); } } From 43737263d42c9548c653d6b1bdcda41a182cbf83 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 4 Jan 2024 14:32:03 -0800 Subject: [PATCH 3/3] removed that clause --- app/Models/LicenseSeat.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index 9bd9a66cfa8d..397a14146870 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -127,7 +127,6 @@ public function scopeOrderDepartments($query, $order) return $query->leftJoin('users as license_seat_users', 'license_seats.assigned_to', '=', 'license_seat_users.id') ->leftJoin('departments as license_user_dept', 'license_user_dept.id', '=', 'license_seat_users.department_id') ->whereNotNull('license_seats.assigned_to') - ->whereNotNull('license_user_dept.id') ->orderBy('license_user_dept.name', $order); } }