From 0bed01ff68918bafa72402a277a6b822c9a15995 Mon Sep 17 00:00:00 2001 From: Masroor Ehsan Date: Wed, 29 Jan 2025 15:39:57 +0600 Subject: [PATCH] enhancements --- app/Http/Controllers/Staff/AssignmentController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Staff/AssignmentController.php b/app/Http/Controllers/Staff/AssignmentController.php index 368462b..60a0609 100644 --- a/app/Http/Controllers/Staff/AssignmentController.php +++ b/app/Http/Controllers/Staff/AssignmentController.php @@ -10,7 +10,6 @@ use App\Http\Requests\AssignPhysicianRequest; use App\Models\User; use App\Services\AuditTrail\Activity; -use Carbon\Carbon; class AssignmentController extends HashedStudyControllerBase { @@ -18,13 +17,17 @@ public function show() { abort_unless(me()->may(Permission::AssignRadiologist), 403); $study = $this->getStudy('assignedPhysicians'); - $rads = User::active()->role(Role::Radiologist)->get(['id', 'display_name', 'profile_photo_path', 'first_name', 'last_name', 'created_at']); + $rads = User::active() + ->role(Role::Radiologist) + ->get(['id', 'display_name', 'profile_photo_path', 'first_name', 'last_name', 'created_at']) + ->each(fn ($rad) => $rad->info = ['workload' => '', 'last_seen' => '']); + $stats = Radiologists::worklist_stats(3, ReportStatus::Finalized->value); foreach ($stats as $rad) { $found = $rads->where('id', $rad->id)->first(); if ($found) { $found->info['workload'] = $rad->workload; - $found->info['last_seen'] = ($rad->last_seen ?? Carbon::now()->addHours(-random_int(1, 36)))->diffForHumans(); + $found->info['last_seen'] = $rad->last_seen?->diffForHumans() ?? '-'; } }