From 302b02e025002b94d9510955fc34c3950a75d346 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Tue, 14 Jan 2025 12:43:01 +0600 Subject: [PATCH] minor --- app/Http/Controllers/Staff/MetadataController.php | 6 +----- app/Models/Study.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Staff/MetadataController.php b/app/Http/Controllers/Staff/MetadataController.php index b9df9e7..6a0e64c 100644 --- a/app/Http/Controllers/Staff/MetadataController.php +++ b/app/Http/Controllers/Staff/MetadataController.php @@ -26,11 +26,7 @@ public function edit() $this->decodeKeys(); $study = Study::findOrFail($this->key); - if (in_array($study->report_status->value, [ - ReportStatus::Finalized->value, - ReportStatus::Approved->value, - ], - true)) { + if ($study->isReportReady()) { return view('content.pages.notice', [ 'title' => 'Study Locked', 'color' => 'danger', diff --git a/app/Models/Study.php b/app/Models/Study.php index de8b8de..38a8ae4 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -450,6 +450,17 @@ public function hasReports(): bool return $this->reports->isNotEmpty(); } + public function isReportReady(): bool + { + return ($this->report_status->value == ReportStatus::Finalized->value) || + ($this->report_status->value == ReportStatus::Approved->value); + } + + public function isStudyComplete(): bool + { + return $this->report_status->value >= ReportStatus::Finalized->value; + } + protected function casts(): array { return [