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

add device label to test result filter

Browse Source
This commit is contained in:
Fateme
2020-02-26 11:30:05 +03:30
parent 71f8dae1c9
commit 13012c934d
10 changed files with 295 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+11 -3
View File
@@ -53,9 +53,17 @@ class TestResultController extends Controller
$query->where('test_type_id', $request->testType_id);
})
->when($request->has('device_id') && $request->device_id, function($query) use($request){
$query->where(function($query) use($request){
$query->where('device_id', 'LIKE', '%'.$request->device_id.'%')->orWhere('id', $request->device_id);
});
$device_label = $request->device_label ? $request->device_label : '';
if ($device_label){
$query->whereHas('test_type', function($query) use($request, $device_label){
$query->where('device_label', $device_label);
})->where('device_id', $request->device_id);
}
else{
$query->where(function($query) use($request){
$query->where('device_id', $request->device_id)->orWhere('id', $request->device_id);
});
}
})
->when($user_name, function($query) use($user_name){
$query->whereHas('user', function($query) use($user_name){