This commit is contained in:
Dr Masroor Ehsan 2025-01-05 13:14:02 +06:00
parent ee14ce3aef
commit 4a87232dae
3 changed files with 17 additions and 2 deletions

View File

@ -159,10 +159,12 @@ public function setReportDate(string $from, ?string $to = null): self
protected function getStudiesQuery(): Builder protected function getStudiesQuery(): Builder
{ {
if ($this->archived === null) { if ($this->archived === null) {
return Study::active(); $q = Study::active();
} else {
$q = Study::query();
} }
return Study::query(); return $q->with(['readingPhysician', 'assignedPhysician']);
} }
protected function applySort(Builder $query): Builder protected function applySort(Builder $query): Builder

View File

@ -103,6 +103,11 @@ public function readingPhysician(): BelongsTo
return $this->belongsTo(User::class, 'reporting_physician_id'); return $this->belongsTo(User::class, 'reporting_physician_id');
} }
public function assignedPhysician(): BelongsTo
{
return $this->belongsTo(User::class, 'assigned_physician_id');
}
public function getReportStatusLedAttribute(): string public function getReportStatusLedAttribute(): string
{ {
$color = match ($this->report_status) { $color = match ($this->report_status) {
@ -230,6 +235,7 @@ public function toArray(): array
return array_merge(parent::toArray(), [ return array_merge(parent::toArray(), [
'disk_size_human' => human_filesize($this->disk_size), 'disk_size_human' => human_filesize($this->disk_size),
'reader_name' => $this->readingPhysician?->display_name, 'reader_name' => $this->readingPhysician?->display_name,
'assigned_physician_name' => $this->assignedPhysician?->display_name,
'reader_photo' => $this->readingPhysician?->profile_photo_url, 'reader_photo' => $this->readingPhysician?->profile_photo_url,
'report_status_led' => $this->getReportStatusLedAttribute(), 'report_status_led' => $this->getReportStatusLedAttribute(),
'priority_icon' => $this->getPriorityIcon(), 'priority_icon' => $this->getPriorityIcon(),

View File

@ -2,6 +2,7 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Pagination\Paginator; use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Vite; use Illuminate\Support\Facades\Vite;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
@ -21,6 +22,7 @@ public function register(): void
*/ */
public function boot(): void public function boot(): void
{ {
$this->configureModels();
Paginator::useBootstrapFive(); Paginator::useBootstrapFive();
Vite::useStyleTagAttributes(function (?string $src, string $url, ?array $chunk, ?array $manifest) { Vite::useStyleTagAttributes(function (?string $src, string $url, ?array $chunk, ?array $manifest) {
if ($src !== null) { if ($src !== null) {
@ -33,4 +35,9 @@ public function boot(): void
return []; return [];
}); });
} }
private function configureModels(): void
{
Model::shouldBeStrict(! $this->app->isProduction());
}
} }