fix

app/Http/Controllers/TestResultController.php

@@ -2,6 +2,7 @@
 
     namespace App\Http\Controllers;
 
+<<<<<<< HEAD
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
     use App\Http\Requests\StoreTestResultRequest;
@@ -15,26 +16,21 @@
     use App\Media;
     use Intervention\Image\ImageManagerStatic as Image;
     use Intervention\Image\ImageManager;
+=======
+    use App\Http\Requests\StoreTestResultRequest;
+    use App\Input;
+    use App\InputValue;
+    use App\Media;
+    use App\MedicalCenter;
+    use App\TestResult;
+    use App\TestType;
+    use Illuminate\Http\Request;
+>>>>>>> b389ea53068b2084084b9704400a50529ba035eb
     use Illuminate\Support\Facades\Storage;
 
     class TestResultController extends Controller
     {
 
-//    private function filterByInputs($inputArray){
-//        $searchArray = ['Patient ID' => 1111, 'Autoclave ID' => 2222];
-//
-//        $TestResults = TestResult::query();
-//
-//        foreach ($inputArray as $key => $value) {
-//            $TestResults .= $TestResults->whereHas('input_values', function($query) use($value, $key){
-//                $query->whereHas('input', function($query) use($key){
-//                    $query->where('name', $key);
-//                })->where('value', $value);
-//            });
-//        }
-//        return $query;
-//    }
-
         public function index( Request $request )
         {
             $user = auth( 'api' )->user();
@@ -56,7 +52,7 @@
             }
 
             $TestResult = TestResult::when( $request->has( 'verified' ) , function ( $query ) use ( $request ) {
-                return $query->where( 'verified' , $request->verified )->orWhere( 'verified' , "None" );
+                return $query->where( 'verified' , $request->verified )->orWhere('verified' , "None" );
             } )
                 ->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
                     $from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
@@ -445,7 +441,6 @@
             return \MessageResponse::data( [ 'labels' => [ 'Number Of Accepted Test Results' , 'Number Of Rejected Test Results' ] , 'data' => [ $AcceptCount , $RejectCount ] ] );
         }
 
-        //--------------------------------------------------------------------------Show
         public function showTestResult( $id )
         {
             $TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )->findOrFail( $id );
@@ -501,4 +496,5 @@
             $TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
             return \MessageResponse::data( $TestResult );
         }
+
     }