diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 00595f18..0b93e067 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -6,19 +6,16 @@ use App\Http\Requests\StoreTestResultRequest; use App\Http\Resources\TestResultResource; use App\Input; use App\InputValue; -use App\Media; use App\MedicalCenter; use App\Services\Media\MediaHelper; use App\TestResult; use App\TestType; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Storage; use Packages\Messaging\src\Facades\MessageResponse; class TestResultController extends Controller { - public function index( Request $request ) { $user = auth( 'api' )->user(); diff --git a/app/Policies/TestResultPolicy.php b/app/Policies/TestResultPolicy.php index 4747a092..6aa27c17 100644 --- a/app/Policies/TestResultPolicy.php +++ b/app/Policies/TestResultPolicy.php @@ -4,14 +4,15 @@ namespace App\Policies; use App\User; use App\TestResult; -use Doctrine\Tests\Common\Inflector\InflectorTest; class TestResultPolicy { - public function delete(User $User, TestResult $TestResult) { - if($User->hasRole('Admin') || ($User->hasRole('User') && $TestResult->verified == 'NotVerified' && $TestResult->user_id == $User->id)) + if( $User->hasRole('Admin') || + ($User->hasRole('Supervisor') && $TestResult->verified == 'NotVerified') || + ($User->hasRole('User') && $TestResult->verified == 'NotVerified' && $TestResult->user_id == $User->id) + ) return true; }