From 2e68b390825a267ac3f92eef64301ac5fb0f8c4b Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Tue, 21 Jan 2025 23:57:24 +0600 Subject: [PATCH] minor UI improvement --- app/Http/Controllers/Staff/ReportController.php | 9 +++++++++ resources/views/content/pages/notice.blade.php | 7 +------ .../views/content/pages/partials/_alert-div.blade.php | 7 ++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Staff/ReportController.php b/app/Http/Controllers/Staff/ReportController.php index 71bd170..9f634c8 100644 --- a/app/Http/Controllers/Staff/ReportController.php +++ b/app/Http/Controllers/Staff/ReportController.php @@ -16,6 +16,15 @@ public function popup() ReportManager::ensureDownloadAccess(); $this->decodeKeys(); $study = Study::with(['reports.radiologist', 'reports.study', 'assignedPhysicians'])->findOrFail($this->key); + if ($study->reports->isEmpty()) { + return view('content.pages.partials._alert-div', + [ + 'color' => 'secondary', + 'heading' => 'Unread study', + 'message' => 'This study has not been interpreted yet.', + ]); + } + if (me()->isRadiologist()) { // abort_unless($study->isAssigned(), 403); abort_unless($study->isUserInStudyAssignmentsOrReadingPhysician(), 403); diff --git a/resources/views/content/pages/notice.blade.php b/resources/views/content/pages/notice.blade.php index d71b1d8..c9212fa 100644 --- a/resources/views/content/pages/notice.blade.php +++ b/resources/views/content/pages/notice.blade.php @@ -35,12 +35,7 @@
-
-
-

{{ $heading }}

-

{{ $message }}

-
-
+ @include('content.pages.partials._alert-div', compact('color', 'heading', 'message'))
diff --git a/resources/views/content/pages/partials/_alert-div.blade.php b/resources/views/content/pages/partials/_alert-div.blade.php index b3d9bbc..ce8f4b3 100644 --- a/resources/views/content/pages/partials/_alert-div.blade.php +++ b/resources/views/content/pages/partials/_alert-div.blade.php @@ -1 +1,6 @@ - +
+

{{ $heading }}

+

{{ $message }}

+
+