From da16e247c43d3f7ee67ba3b892baef15c77cfb0f Mon Sep 17 00:00:00 2001 From: Masroor Ehsan Date: Wed, 29 Jan 2025 17:31:32 +0600 Subject: [PATCH] FIX #39 - unassign bug --- app/Http/Controllers/Staff/AssignmentController.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Staff/AssignmentController.php b/app/Http/Controllers/Staff/AssignmentController.php index 60a0609..be9a424 100644 --- a/app/Http/Controllers/Staff/AssignmentController.php +++ b/app/Http/Controllers/Staff/AssignmentController.php @@ -38,16 +38,18 @@ public function remove(AssignPhysicianRequest $request) { abort_unless(me()->may(Permission::AssignRadiologist), 403); $study = $this->getStudy('assignedPhysicians'); - $user = User::active()->findOrFail($request->input('rad_id')); + $rad = User::active()->findOrFail($request->input('rad_id')); - if ($study->isAssigned($user)) { - $study->assignedPhysicians()->detach($user->id); - if ($study->assignedPhysicians->count() === 0) { + if ($study->isAssigned($rad)) { + $study->assignedPhysicians()->detach($rad->id); + + if ($study->assignedPhysicians()->count() === 0) { $study->update(['assigned_at' => null]); } + audit() ->did(Activity::Unassign_Physician) - ->notes($user->display_name) + ->notes($rad->display_name) ->on($study) ->log(); }