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

add package

Browse Source
This commit is contained in:
saeid_01
2019-06-15 19:05:17 +04:30
parent d26188d274
commit 7e8dd3c8e4
54 changed files with 946 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+40 -20
View File
@@ -20,18 +20,52 @@ class TestResultController extends Controller
public function index(Request $request)
{
$user = auth('api')->user();
if ($user->hasRole('Supervisor|User')) {
$medical_center_id = $user->medical_center_id;
}
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id) {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
if ($user->hasRole('User')) {
$user_name = $user->name;
}
elseif($request->has('user_name') && $request->user_name) {
$user_name = $request->user_name;
}
else {
$user_name = null;
}
$TestResult = TestResult::with('test_type', 'user', 'user.medical_center')
->when($request->has('verified'), function ($query) use ($request)
{
return $query->where('verified', $request->verified);
})
->when($user->hasRole('Supervisor') , function($query) {
return $query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request)
{
$from = ($request->fromPicker) ? date($request->fromPicker . ' 00:00:00') : date('2010-01-01' . ' 00:00:00');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
})
->when($user->hasRole('User') || ( !$user->hasRole('Admin') && !$user->hasRole('Supervisor')), function($query) use ($user) {
return $query->where('user_id', $user->id);
->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($user_name, function($query) use($user_name){
$query->whereHas('user', function($query) use($user_name){
$query->where('name', 'LIKE', '%'.$user_name.'%');
});
})
->when($medical_center_id, function($query) use($medical_center_id){
$query->whereHas('user', function($query) use ($medical_center_id) {
$query->where('medical_center_id', $medical_center_id);
});
})
->paginate(10);
@@ -43,20 +77,6 @@ class TestResultController extends Controller
//
}
// public function CreateChildFormValue2($Input,$TestResultObj,$TestResultInfo)
// {
// if ($Input['type'] != 'Form') {
// $Value = $TestResultInfo[$Input->name];
// $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id , 'input_id' => $Input->id , 'value' => $Value]);
// }
// else {
// foreach ($Input->children as $InputChild) {
// $this->CreateChildFormValue2($InputChild,$TestResultObj,$TestResultInfo[$Input->name]);
// }
// }
//
// }
public function store(StoreTestResultRequest $request)
{