From f181a0c84a63164a774043e4e6fa4d3e9f2c5368 Mon Sep 17 00:00:00 2001 From: Fayyazi Date: Mon, 22 Jul 2019 13:04:53 +0430 Subject: [PATCH] change message & testresult --- app/Http/Controllers/MessageController.php | 7 ++++--- app/Http/Controllers/TestResultController.php | 13 +++++++------ app/TestResult.php | 2 +- public/js/vue/app.js | 6 +----- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index c19c2bec..e1479cc1 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -22,9 +22,10 @@ class MessageController extends Controller } $remove = $User->id; $Users = User::whereHas('messagesSent', function($q) use($User){ - $q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id); - })->orWhereHas('messagesReceived', function($q) use($User){ - $q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id); + $q->where('recipient_user_id', $User->id); + }) + ->orWhereHas('messagesReceived', function($q) use($User){ + $q->where('sender_user_id', $User->id); }) ->when($medical_center_id, function($query) use ($medical_center_id){ $query->where('medical_center_id', $medical_center_id); diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 34491f1c..9f802b2a 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -54,8 +54,8 @@ class TestResultController extends Controller ->when($request->has('testType_id') && $request->testType_id, function($query) use($request){ $query->where('test_type_id', $request->testType_id); }) - ->when($request->has('auto_clave_id') && $request->auto_clave_id, function($query) use($request){ - $query->where('autoclave_id', 'LIKE', '%'.$request->auto_clave_id.'%'); + ->when($request->has('device_id') && $request->device_id, function($query) use($request){ + $query->where('device_id', 'LIKE', '%'.$request->device_id.'%'); }) ->when($user_name, function($query) use($user_name){ $query->whereHas('user', function($query) use($user_name){ @@ -143,7 +143,6 @@ class TestResultController extends Controller if ($request->imgs != null) { foreach ($request->imgs as $key => $img) { - // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); $Image = $img; $InterventionImage = Image::make($Image); $Mime = explode('/', $InterventionImage->mime()); @@ -170,7 +169,7 @@ class TestResultController extends Controller public function show($id) { - $TestResult = TestResult::with('input_values', 'user.medical_center')->select('result', 'verified', 'autoclave_id','user_id','id', 'created_at')->findOrFail($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); $options = []; foreach ($TestResult->input_values as $value) { $input = $value->input; @@ -222,6 +221,8 @@ class TestResultController extends Controller } $TestResult['imagesPath'] = $ImagesPath; } + // dd($TestResult->test_type()->device_label); + $TestResult['device_label'] = $TestResult->test_type->device_label; return \MessageResponse::data($TestResult); } @@ -326,11 +327,11 @@ class TestResultController extends Controller } /////////////////////////////////////////////////////////////////////Images $images = ''; + $imageExist = []; + $imagesDeleted = []; if (count($TestResult->TitleImage)) { $images = $TestResult->TitleImage; - $imageExist = []; - $imagesDeleted = []; foreach ($images as $key => $image) { $imageExist[] = '/'.$image->path; diff --git a/app/TestResult.php b/app/TestResult.php index d4c89e81..63de83f3 100644 --- a/app/TestResult.php +++ b/app/TestResult.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model; class TestResult extends Model { - public $fillable = ['result','verified','autoclave_id','test_type_id','user_id','device_id', 'cycle_number']; + public $fillable = ['result','verified','test_type_id','user_id','device_id', 'cycle_number']; public function test_type() { return $this->belongsTo('App\TestType'); diff --git a/public/js/vue/app.js b/public/js/vue/app.js index 8fd6fd0d..5a2ba48e 100644 --- a/public/js/vue/app.js +++ b/public/js/vue/app.js @@ -43,11 +43,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -<<<<<<< HEAD -/******/ return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"cee19c932dbc149a1cc9","1":"1a2ec2568db9e0d01036","2":"567342defd47adb4346e","3":"edff967a6e6d462943a1","4":"e565c025f6fe488409e8","5":"96bde56e75e96f96d773","6":"5a5158e2d37fea70c0ad","7":"b9cc1f0bbb86abca8821","8":"973b0649ccc38b9bdade","9":"1b12af34e8e809cd2cc5","10":"1a0d4926180438b7d7dd","11":"6a1dd0825a7b78dd66b2","12":"2fbc698c12dd792658de","13":"2a534d941dedd3e2828b","14":"21ee580c8e59c779a80a","15":"b930000cc9d8f16779ae","16":"642ab7c8fa65b0639c84","17":"0cd7d9cfdd466475ba79","18":"17734129a0e2e4afdd89","19":"cfb8b7752ecb0c044cf9","20":"75f4f9028bacfd88dbae","21":"4756b5a7dd1daa6f2bb9","22":"fb95807ca2e8a3eee080","23":"0bd0fd4380524b2abc6e","24":"c24930cf7b1ec90bcb23","25":"be75aab13d8369be063b","26":"e816ed8939bdeb632640","27":"54547f942de04358714d"}[chunkId] + ".js" -======= -/******/ return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"cee19c932dbc149a1cc9","1":"5281a63adedfa1ab604f","2":"743b89b9bb2dabfa3ffe","3":"a050b1a548ee0857d2f7","4":"7c6e05813e662d286d09","5":"8d7463d42653e02550f1","6":"68a5b0bbe6eb4c67723e","7":"7b4c284293f5dd57a85d","8":"320bd23018e7d45c2399","9":"8ee8007e77852469f798","10":"9603d5be0ae5c93d2b34","11":"cf996f3dc28b604a3d3a","12":"febbfeb844354a0cdbff","13":"7441ce1b806f3f78bcbb","14":"8da587ed5e5037bb178c","15":"dc3f54190c64738d2bee","16":"b032a406fa78aefbf408","17":"aeda8d2fe82355b16c66","18":"4c39b4598f53fc5610c2","19":"44988f4163efeba55699","20":"08150bc9a6df0102406e","21":"bc068c1d2ec99a9965de","22":"9aa5bdc2ef1c37f1d6f4","23":"99044b1527f8753dde51","24":"8e2e76e3b7f37492e02f","25":"99927094d1dc83174482","26":"174e16952c4ab044e8bf","27":"bfdd4afc7d67ccd7ea27"}[chunkId] + ".js" ->>>>>>> 2e210805fe7a872d2f3a6e4296298d1b258bb6d5 +/******/ return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"cee19c932dbc149a1cc9","1":"5281a63adedfa1ab604f","2":"743b89b9bb2dabfa3ffe","3":"a050b1a548ee0857d2f7","4":"7c6e05813e662d286d09","5":"8d7463d42653e02550f1","6":"68a5b0bbe6eb4c67723e","7":"440261d4999a3043dddc","8":"83ba6361372aac393521","9":"62c6f07e0e751126652d","10":"9603d5be0ae5c93d2b34","11":"423ddeaf58f54d25364b","12":"febbfeb844354a0cdbff","13":"7441ce1b806f3f78bcbb","14":"8da587ed5e5037bb178c","15":"dc3f54190c64738d2bee","16":"0283c44e44dbd778be39","17":"aeda8d2fe82355b16c66","18":"4c39b4598f53fc5610c2","19":"44988f4163efeba55699","20":"08150bc9a6df0102406e","21":"bc068c1d2ec99a9965de","22":"9aa5bdc2ef1c37f1d6f4","23":"99044b1527f8753dde51","24":"8e2e76e3b7f37492e02f","25":"b735a42cedd74022a9ee","26":"174e16952c4ab044e8bf","27":"bfdd4afc7d67ccd7ea27"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function