cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-12 02:01:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

change message & testresult

Browse Source
This commit is contained in:
Fayyazi
2019-07-22 13:04:53 +04:30
parent 69c608a263
commit f181a0c84a
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MessageController.php
+4 -3
View File
@@ -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);
app/Http/Controllers/TestResultController.php
+7 -6
View File
@@ -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;