diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 116cb81..b83072f 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -4,10 +4,10 @@ use App\DAL\Studies\WorklistFactory; use App\Models\Study; -use Illuminate\Support\Facades\Blade; use Carbon\Carbon; use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Builder as QueryBuilder; +use Illuminate\Support\Facades\Blade; use Illuminate\Support\Str; use Yajra\DataTables\EloquentDataTable; use Yajra\DataTables\Html\Builder as HtmlBuilder; @@ -28,14 +28,14 @@ public function dataTable(QueryBuilder $query): EloquentDataTable { return (new EloquentDataTable($query)) ->addColumn('action', 'worklist.action') - ->editColumn('patient_name', fn(Study $study) => $study->sanitizedPatientName()) - ->editColumn('study_description', fn(Study $study) => $study->sanitizedStudyDescription()) + ->editColumn('patient_name', fn (Study $study) => $study->sanitizedPatientName()) + ->editColumn('study_description', fn (Study $study) => $study->sanitizedStudyDescription()) ->editColumn('reader', function (Study $study) { if ($study->readingPhysician == null) { return ''; } - return Blade::render('staff.worklist.partials._radiologist-listing', + return Blade::render('staff.worklist.partials._radiologist-listing', [ 'avatar_url' => $study->readingPhysician->avatar(), 'name' => $study->readingPhysician->display_name, @@ -49,7 +49,7 @@ public function dataTable(QueryBuilder $query): EloquentDataTable return ''; } - return Blade::render('staff.worklist.partials._radiologist-listing', + return Blade::render('staff.worklist.partials._radiologist-listing', [ 'avatar_url' => $study->assignedPhysician->avatar(), 'name' => $study->assignedPhysician->display_name, diff --git a/app/Http/Controllers/Staff/StudyAssignmentController.php b/app/Http/Controllers/Staff/StudyAssignmentController.php index 6ec9dbd..6f815ca 100644 --- a/app/Http/Controllers/Staff/StudyAssignmentController.php +++ b/app/Http/Controllers/Staff/StudyAssignmentController.php @@ -10,7 +10,6 @@ use App\Models\User; use App\Services\AuditTrail\Activity; use Carbon\Carbon; -use Carbon\CarbonInterface; class StudyAssignmentController extends HashidControllerBase { @@ -24,7 +23,7 @@ public function show() $found = $rads->where('id', $rad->id)->first(); if ($found) { $found->info['workload'] = $rad->workload; - $found->info['last_seen'] = 'Seen: '. ($rad->last_seen ?? Carbon::now()->addHours(-10))->diffForHumans(); + $found->info['last_seen'] = 'Seen: ' . ($rad->last_seen ?? Carbon::now()->addHours(-10))->diffForHumans(); } } diff --git a/app/Models/User.php b/app/Models/User.php index 3a414c9..8926604 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -32,7 +32,6 @@ class User extends Authenticatable use Notifiable; use TwoFactorAuthenticatable; - public array $info = []; /**