change filter of test result

This commit is contained in:
Fateme
2020-03-04 10:04:45 +03:30
parent 13012c934d
commit bf362a8265
3 changed files with 36 additions and 15 deletions
+24 -3
View File
@@ -17,6 +17,21 @@ 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();
@@ -55,9 +70,15 @@ class TestResultController extends Controller
->when($request->has('device_id') && $request->device_id, function($query) use($request){
$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);
// $query->whereHas('test_type', function($query) use($request, $device_label){
// $query->where('device_label', $device_label);
// })->where('device_id', $request->device_id);
$query->whereHas('input_values', function($query) use($request, $device_label){
$query->whereHas('input', function($query) use($request, $device_label){
$query->where('name', $device_label);
})->where('value', $request->device_id);
});
}
else{
$query->where(function($query) use($request){