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

modify backend

Browse Source
This commit is contained in:
Fateme
2020-04-26 13:12:51 +04:30
parent a76f0ce068
commit ff3dd87778
6 changed files with 122 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CycleController.php
+24 -3
View File
@@ -40,7 +40,15 @@ class CycleController extends Controller
$query->where('medical_center_id', $request->medical_center_id); $query->where('medical_center_id', $request->medical_center_id);
}); });
}) })
->with('user')->paginate(10); ->with(['user' => function($query){
$query->select('id', 'name');
},
'labels',
'labels.package' => function($query){
$query->select('id', 'name');
},
])->paginate(10);
return \MessageResponse::data($Cycles); return \MessageResponse::data($Cycles);
} }
public function create() public function create()
@@ -49,7 +57,14 @@ class CycleController extends Controller
} }
public function show(Cycle $Cycle) public function show(Cycle $Cycle)
{ {
$Cycle->load('user', 'user.medical_center', 'labels', 'labels.package', 'labels.package.items'); $Cycle->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'labels',
'labels.package', 'labels.package.items']);
return \MessageResponse::data($Cycle); return \MessageResponse::data($Cycle);
} }
public function store(StoreCycleRequest $request) public function store(StoreCycleRequest $request)
@@ -149,7 +164,13 @@ class CycleController extends Controller
public function showCycle(Cycle $Cycle) public function showCycle(Cycle $Cycle)
{ {
$Cycle->load('user', 'user.medical_center', 'labels', 'labels.package', 'labels.package.items'); $Cycle->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'labels', 'labels.package', 'labels.package.items']);
return \MessageResponse::data($Cycle); return \MessageResponse::data($Cycle);
} }
} }
app/Http/Controllers/ItemController.php
+28 -9
View File
@@ -15,9 +15,7 @@ class ItemController extends Controller
$admin_users = User::role('Admin')->get()->pluck('id')->toArray(); $admin_users = User::role('Admin')->get()->pluck('id')->toArray();
$admin_users[] = $user->id; $admin_users[] = $user->id;
$Items = Item::with('user') $Items = Item::when($user->cant('showAll'), function($query) use ($user, $admin_users) {
->when($user->cant('showAll'), function($query) use ($user, $admin_users) {
if ($user->hasRole('Supervisor|User')) { if ($user->hasRole('Supervisor|User')) {
$query->whereHas('user', function($query) use ($user, $admin_users) { $query->whereHas('user', function($query) use ($user, $admin_users) {
$query->where('medical_center_id', $user->medical_center_id)->orWhereIn('id', $admin_users); $query->where('medical_center_id', $user->medical_center_id)->orWhereIn('id', $admin_users);
@@ -41,6 +39,12 @@ class ItemController extends Controller
$query->where('medical_center_id', $request->medical_center_id); $query->where('medical_center_id', $request->medical_center_id);
}); });
}) })
->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}])
->paginate(10); ->paginate(10);
return \MessageResponse::data($Items); return \MessageResponse::data($Items);
} }
@@ -51,7 +55,12 @@ class ItemController extends Controller
} }
public function show(Item $Item) public function show(Item $Item)
{ {
$Item->load('user', 'user.medical_center'); $Item->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}]);
return \MessageResponse::data($Item); return \MessageResponse::data($Item);
} }
public function store(StoreItemRequest $request) public function store(StoreItemRequest $request)
@@ -96,22 +105,32 @@ class ItemController extends Controller
$admin_users = User::role('Admin')->get()->pluck('id')->toArray(); $admin_users = User::role('Admin')->get()->pluck('id')->toArray();
$admin_users[] = $user->id; $admin_users[] = $user->id;
$Items = Item::with('user') $Items = Item::when($user->cant('showAll'), function($query) use ($user, $admin_users) {
->when($user->cant('showAll'), function($query) use ($user, $admin_users) {
if ($user->hasRole('Supervisor|User')) { if ($user->hasRole('Supervisor|User')) {
$query->whereHas('user', function($query) use ($user, $admin_users) { $query->whereHas('user', function($query) use ($user, $admin_users) {
$query->where('medical_center_id', $user->medical_center_id)->orWhereIn('id', $admin_users); $query->where('medical_center_id', $user->medical_center_id)->orWhereIn('id', $admin_users);
}); });
} }
})->get(); })
->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}])
->get();
return \MessageResponse::data($Items); return \MessageResponse::data($Items);
} }
public function showItem(Item $Item) public function showItem(Item $Item)
{ {
$Item->load('user', 'user.medical_center'); $Item->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}]);
return \MessageResponse::data($Item); return \MessageResponse::data($Item);
} }
} }
app/Http/Controllers/LabelController.php
+25 -3
View File
@@ -41,7 +41,17 @@ class LabelController extends Controller
$query->where('medical_center_id', $request->medical_center_id); $query->where('medical_center_id', $request->medical_center_id);
}); });
}) })
->with('user', 'user.medical_center')->paginate(10); ->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'package' => function($query){
$query->select('id', 'name');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
])->paginate(10);
return \MessageResponse::data($Labels); return \MessageResponse::data($Labels);
} }
public function create() public function create()
@@ -50,7 +60,13 @@ class LabelController extends Controller
} }
public function show(Label $Label) public function show(Label $Label)
{ {
$Label->load('user', 'package', 'package.items', 'user.medical_center'); $Label->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'package', 'package.items']);
return \MessageResponse::data($Label); return \MessageResponse::data($Label);
} }
@@ -111,7 +127,13 @@ class LabelController extends Controller
public function showLabel(Label $Label) public function showLabel(Label $Label)
{ {
$Label->load('user', 'package', 'package.items', 'user.medical_center'); $Label->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'package', 'package.items']);
return \MessageResponse::data($Label); return \MessageResponse::data($Label);
} }
app/Http/Controllers/PackageController.php
+27 -5
View File
@@ -34,7 +34,13 @@ class PackageController extends Controller
$query->where('medical_center_id', $request->medical_center_id); $query->where('medical_center_id', $request->medical_center_id);
}); });
}) })
->with('user')->paginate(10); ->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}])->paginate(10);
return \MessageResponse::data($Packages); return \MessageResponse::data($Packages);
} }
@@ -44,8 +50,13 @@ class PackageController extends Controller
} }
public function show(Package $Package) public function show(Package $Package)
{ {
$Package->load('user', 'items', 'user.medical_center'); $Package->load(['user' => function($query){
// dd($Package); $query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'items']);
return \MessageResponse::data($Package); return \MessageResponse::data($Package);
} }
public function store(StorePackageRequest $request) public function store(StorePackageRequest $request)
@@ -157,14 +168,25 @@ class PackageController extends Controller
}); });
} }
}) })
->with('user')->get(); ->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}])->get();
return \MessageResponse::data($Packages); return \MessageResponse::data($Packages);
} }
public function showPackage(Package $Package) public function showPackage(Package $Package)
{ {
$Package->load('user', 'user.medical_center', 'items'); $Package->load(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'items']);
return \MessageResponse::data($Package); return \MessageResponse::data($Package);
} }
} }
app/Http/Controllers/TestResultController.php
+10 -2
View File
@@ -55,8 +55,7 @@ class TestResultController extends Controller
$user_name = null; $user_name = null;
} }
$TestResult = TestResult::with('test_type', 'user', 'user.medical_center') $TestResult = TestResult::when($request->has('verified'), function ($query) use ($request){
->when($request->has('verified'), function ($query) use ($request){
return $query->where('verified', $request->verified); return $query->where('verified', $request->verified);
}) })
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request){ ->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request){
@@ -92,6 +91,15 @@ class TestResultController extends Controller
$query->where('medical_center_id', $medical_center_id); $query->where('medical_center_id', $medical_center_id);
}); });
}) })
->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
},
'test_type' => function($query){
$query->select('id', 'name');
}])
->paginate(10); ->paginate(10);
return \MessageResponse::data($TestResult); return \MessageResponse::data($TestResult);
app/Http/Controllers/TestTypeController.php
+8 -1
View File
@@ -41,7 +41,14 @@ class TestTypeController extends Controller
$query->where('name', 'LIKE', '%'.$request->user_name.'%'); $query->where('name', 'LIKE', '%'.$request->user_name.'%');
}); });
}) })
->withCount('test_results')->with('user','user.medical_center')->paginate(10); ->withCount('test_results')
->with(['user' => function($query){
$query->select('id', 'name', 'medical_center_id');
},
'user.medical_center' => function($query){
$query->select('id', 'name');
}])->paginate(10);
return \MessageResponse::data($TestTypes); return \MessageResponse::data($TestTypes);
} }