diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 6f33472e..80eee6fb 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -145,7 +145,8 @@ class ItemController extends Controller $query->select('id','name','cell_number'); } ] ); - } + }, + 'media' ] ); return ItemResource::make( $Item ); diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index f6ef6f5e..f903081a 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -167,7 +167,7 @@ class TestResultController extends Controller public function show($id) { - $TestResult = TestResult::with('input_values', 'user.medical_center', 'test_type') + $TestResult = TestResult::with('input_values', 'user.medical_center', 'test_type', 'media') ->select('result', 'verified', 'device_id', 'user_id', 'id', 'test_type_id', 'created_at') ->findOrFail($id); $options = []; diff --git a/app/Http/Resources/ItemResource.php b/app/Http/Resources/ItemResource.php index fca58492..28615a54 100644 --- a/app/Http/Resources/ItemResource.php +++ b/app/Http/Resources/ItemResource.php @@ -32,7 +32,7 @@ class ItemResource extends JsonResource 'package_id' => $this->package_id, 'package' => PackageResource::make($this->whenLoaded('package')), 'transfers' => TransferResource::collection($this->whenLoaded('transfers')), - 'files' => MediaResource::collection($this->media), + 'files' => MediaResource::collection($this->whenLoaded('media')), 'created_at' => $this->created_at, 'updated_at' => $this->updated_at ]; diff --git a/app/Http/Resources/TestResultResource.php b/app/Http/Resources/TestResultResource.php index 1757d91f..650ada9e 100644 --- a/app/Http/Resources/TestResultResource.php +++ b/app/Http/Resources/TestResultResource.php @@ -33,7 +33,7 @@ class TestResultResource extends JsonResource 'device_label' => $this->when( $this->device_label , $this->device_label ) , 'input_values' => $this->when( $this->input_values , $this->input_values ) , 'user' => UserResource::make( $this->whenLoaded( 'user' ) ) , - 'files' => MediaResource::collection( $this->media ) , + 'files' => MediaResource::collection($this->whenLoaded('media')) , 'created_at' => $this->created_at , 'updated_at' => $this->updated_at ];