From 5b5182c0bcb5d8a718f5d277edfc3c34701fba93 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Sat, 18 Jan 2025 11:55:25 +0600 Subject: [PATCH] guard --- app/Services/ACL/WorklistGuard.php | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/app/Services/ACL/WorklistGuard.php b/app/Services/ACL/WorklistGuard.php index 57590ff..8c815a2 100644 --- a/app/Services/ACL/WorklistGuard.php +++ b/app/Services/ACL/WorklistGuard.php @@ -13,23 +13,37 @@ public static function worklistColumns(User|int|null $usr = null): Collection $columns = collect([ WorklistColumn::Priority, WorklistColumn::ReportStatus, - WorklistColumn::History, - WorklistColumn::Modality, + WorklistColumn::ActionButtons, WorklistColumn::PatientId, WorklistColumn::PatientName, WorklistColumn::PatientSexAge, - WorklistColumn::StudyDescription, WorklistColumn::StudyDate, + WorklistColumn::ReceiveDate, + WorklistColumn::StudyDescription, WorklistColumn::AssignedPhysician, WorklistColumn::ReadingPhysician, - // WorklistColumn::ReportDate, + WorklistColumn::ReportDate, + WorklistColumn::History, + WorklistColumn::Modality, WorklistColumn::Series, - WorklistColumn::ReceiveDate, - WorklistColumn::ActionButtons, WorklistColumn::ReportButtons, WorklistColumn::ViewerButtons, ]); + if ($user->isRadiologist()) { + $columns = $columns->except([ + WorklistColumn::AssignedPhysician, + WorklistColumn::ReadingPhysician, + ]); + $columns = $columns->reject(function ($col) { + return $col == WorklistColumn::AssignedPhysician || $col == WorklistColumn::ReadingPhysician; + }); + } else { + $columns = $columns->reject(function ($col) { + return $col == WorklistColumn::ReportDate; + }); + } + return $columns; }