cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 23:21:05 +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/CycleController.php
+5
View File
@@ -35,6 +35,11 @@ class CycleController extends Controller
->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){
$query->where('cycle_number', $request->cycle_number);
})
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
$query->whereHas('user', function($query) use ($request) {
$query->where('medical_center_id', $request->medical_center_id);
});
})
->with('user')->paginate(10);
return \MessageResponse::data($Cycles);
}
app/Http/Controllers/ItemController.php
+5
View File
@@ -36,6 +36,11 @@ class ItemController extends Controller
->when($request->has('specific') && $request->specific != '', function($query) use($request){
$query->where('specific', $request->specific);
})
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
$query->whereHas('user', function($query) use ($request) {
$query->where('medical_center_id', $request->medical_center_id);
});
})
->paginate(10);
return \MessageResponse::data($Items);
}
app/Http/Controllers/LabelController.php
+5 -19
View File
@@ -16,20 +16,6 @@ class LabelController extends Controller
$admin_users = User::role('Admin')->get()->pluck('id')->toArray();
$admin_users[] = $user->id;
// if ($user->hasRole('Supervisor|User')) {
// $medical_center_id = $user->medical_center_id;
// }
// elseif($request->has('medical_center_id') && $request->medical_center_id != '') {
// $medical_center_id = $request->medical_center_id;
// } else {
// $medical_center_id = null;
// }
// $medical_center_id = null;
// if($request->has('medical_center_id') && $request->medical_center_id != '') {
// $medical_center_id = $request->medical_center_id;
// }
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user, $admin_users) {
if ($user->hasRole('Supervisor|User')) {
@@ -50,11 +36,11 @@ class LabelController extends Controller
->when($request->has('label_id') && $request->label_id != '', function($query) use($request){
$query->where('id', $request->label_id);
})
// ->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);
// });
// })
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
$query->whereHas('user', function($query) use ($request) {
$query->where('medical_center_id', $request->medical_center_id);
});
})
->with('user', 'user.medical_center')->paginate(10);
return \MessageResponse::data($Labels);
}
app/Http/Controllers/PackageController.php
+4 -2
View File
@@ -29,8 +29,10 @@ class PackageController extends Controller
->when($request->has('package_id') && $request->package_id != '', function($query) use($request){
$query->where('id', $request->package_id);
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
$query->whereHas('user', function($query) use ($request) {
$query->where('medical_center_id', $request->medical_center_id);
});
})
->with('user')->paginate(10);
return \MessageResponse::data($Packages);
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,
app/Http/Controllers/TestTypeController.php
-41
View File
@@ -21,47 +21,6 @@ class TestTypeController extends Controller
{
public function index(Request $request)
{
// $testTypes = TestType::where('deleted_at','<>', null)->get();
// try {
// $return_value = \DB::transaction(function () use ($request) {
//
// $testTypes = \DB::table('test_types')->where('deleted_at','<>', null)->get();
// dd($testTypes);
// foreach ($testTypes as $testType) {
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
// \DB::table('test_types')->where('id', $testType->id)->update(['unique_code' => $testType->unique_code.'--'.$UniqueID]);
// $test_results = TestResult::where('test_type_id', $testType->id)->get();
// if (count($test_results)) {
//
// foreach ($test_results as $test_result) {
// // code...
// if (count($test_result->input_values)) {
// InputValue::where('test_result_id', $test_result->id)->get()->each->delete();
// }
// if (count($test_result->TitleImage)){
// foreach ($test_result->TitleImage as $image) {
// Storage::disk('public')->delete(static::storage_path($image->path));
// Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $test_result->id)->where('uploadable_type', get_class($test_result))->delete();
// Gallery::where('id', $image->id)->delete();
// }
// }
// $test_result->delete();
// }
//
// }
// // dd($testType->id);
// $inputs = Input::with('options')->where('test_type_id', $testType->id)->get();
// foreach ($inputs as $input) {
// $input->options()->delete();
// $input->delete();
// }
// \DB::table('test_types')->where('id', $testType->id)->delete();
// }
// });
// } catch (\Exception $e) {
// return response()->json($e->getMessage(), 441);
// }
// dd('s');
if (!auth('api')->user()->can('list', TestType::class)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
app/Http/Requests/StoreTestResultRequest.php
+2 -2
View File
@@ -25,7 +25,7 @@ class StoreTestResultRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
'device_id' => 'required',
// 'device_id' => 'required',
// 'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
@@ -36,7 +36,7 @@ class StoreTestResultRequest extends FormRequest
case 'PATCH': {
// $TestResult = $this->route('TestResult');
return [
'device_id' => 'required',
// 'device_id' => 'required',
// 'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
app/Http/Requests/StoreTestTypeRequest.php
+16 -14
View File
@@ -6,7 +6,7 @@ use App\TestType;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Http\Request;
class StoreTestTypeRequest extends FormRequest
{
@@ -20,26 +20,29 @@ class StoreTestTypeRequest extends FormRequest
}
}
public function rules()
public function rules(Request $request)
{
switch ($this->method()) {
case 'POST': {
return [
'name' => 'required|max:100|unique:test_types',
// 'unique_code' => 'required|max:100|unique:test_types',
'device_label' => 'required',
$rules = [
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',
'info.*.parent_id'=>'nullable|numeric|exists:inputs,id',
];
// $rules['unique_code'] = [
// 'required',
// Rule::unique('test_types')->where(function ($query) use ($request) {
// return $query->whereNotNull('deleted_at');
// })
// ];
// return $rules;
$rules['name'] = [
'required',
Rule::unique('test_types')->where(function ($query) use ($request) {
return $query->whereNull('deleted_at');
})
];
$rules['unique_code'] = [
'required',
Rule::unique('test_types')->where(function ($query) use ($request) {
return $query->whereNull('deleted_at');
})
];
return $rules;
break;
}
case 'PUT':
@@ -48,7 +51,6 @@ class StoreTestTypeRequest extends FormRequest
return [
'name' => 'required|max:100|unique:test_types,id,'.$TestType->id,
'unique_code' => 'required|max:100|unique:test_types,id,'.$TestType->id,
'device_label' => 'required',
'info.*.name'=>'required',
'info.*.type'=>'required',
'info.*.size'=>'nullable',