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

new update

Browse Source
This commit is contained in:
Fateme
2020-04-05 12:07:12 +04:30
parent d654566a1b
commit 91f954c9dd
18 changed files with 371 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+4 -7
View File
@@ -70,10 +70,6 @@ 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('input_values', function($query) use($request, $device_label){
$query->whereHas('input', function($query) use($request, $device_label){
$query->where('name', $device_label);
@@ -82,7 +78,7 @@ class TestResultController extends Controller
}
else{
$query->where(function($query) use($request){
$query->where('device_id', $request->device_id)->orWhere('id', $request->device_id);
$query->where('id', $request->device_id);
});
}
})
@@ -115,7 +111,7 @@ class TestResultController extends Controller
$TestResult = [
'user_id' => auth('api')->user()->id,
'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id,
// 'device_id' => $request->device_id,
'date' => $request->date,
'test_type_id' => $request->test_type_id,
'result' => $request->result,
@@ -300,7 +296,7 @@ class TestResultController extends Controller
$TestResultData = [
// 'autoclave_id' => $request->autoclave_id,
'cycle_number' => $request->cycle_number,
'device_id' => $request->device_id,
// 'device_id' => $request->device_id,
'date' => $request->date,
'test_type_id' => $request->test_type_id,
'result' => $request->result,
@@ -453,6 +449,7 @@ class TestResultController extends Controller
{
$query->where('id', $user->medical_center_id);
})->select('name', 'id')->get()->toArray();
$TestType = TestType::select('name', 'id')->get()->toArray();
return \MessageResponse::data([
'MedicalCenters' => $MedicalCenter,