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

update item & package & label & cycle

Browse Source
This commit is contained in:
Fayyazi
2019-10-30 14:19:47 +03:30
parent dbd0ddc1d4
commit da3dd22ec5
19 changed files with 292 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CycleController.php
+62 -10
View File
@@ -10,7 +10,21 @@ class CycleController extends Controller
{
public function index(Request $request)
{
$Cycles = Cycle::when($request->has('name') && $request->name != '', function($query) use($request){
$user = auth('api')->user();
$Cycles = Cycle::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -31,7 +45,7 @@ class CycleController extends Controller
}
public function show(Cycle $Cycle)
{
$Cycle->load('user', 'packs');
$Cycle->load('user', 'labels', 'labels.package', 'labels.package.items');
return \MessageResponse::data($Cycle);
}
public function store(StoreCycleRequest $request)
@@ -48,21 +62,59 @@ class CycleController extends Controller
'verified' => 'NotVerified',
];
$CycleObj = Cycle::create($CycleData);
$CycleObj->packs()->attach($request->packs);
$Labels = [];
$count = 1;
foreach ($request->labels as $key => $label) {
if (array_key_exists($label['id'], $Labels)) {
$preCount = $Labels[$label['id']];
$Labels[$label['id']] = $preCount + 1;
}
else {
$Labels[$label['id']] = $count;
}
}
foreach ($Labels as $Label => $Count) {
$CycleObj->labels()->attach(array($Label), ['count' => $Count]);
}
// $CycleObj->labels()->attach($request->labels);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Cycle $Cycle)
{
$Packs = $Cycle->packs->pluck('id')->toArray();
unset($Cycle->packs);
$Cycle->packs = $Packs;
$Labels = [];
$Cycle->load('labels');
foreach ($Cycle->labels as $label) {
for ($i=0; $i < $label->pivot->count ; $i++) {
$Labels[] = (object) array('id' => $label->id, 'name' => $label->name);
}
}
unset($Cycle->labels);
$Cycle->labels = $Labels;
return \MessageResponse::data($Cycle);
}
public function update(StoreCycleRequest $request, Cycle $Cycle)
{
$Cycle->update($request->except(['packs']));
$Cycle->packs()->sync($request->packs);
$Cycle->update($request->except(['labels']));
$Labels = [];
$count = 1;
foreach ($request->labels as $key => $label) {
if (array_key_exists($label['id'], $Labels)) {
$preCount = $Labels[$label['id']];
$Labels[$label['id']] = $preCount + 1;
}
else {
$Labels[$label['id']] = $count;
}
}
$Cycle->labels()->detach();
foreach ($Labels as $Label => $Count) {
$Cycle->labels()->attach(array($Label), ['count' => $Count]);
}
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Cycle $Cycle)
@@ -70,9 +122,9 @@ class CycleController extends Controller
if (auth('api')->user()->cant('delete', $Cycle)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if(count($Cycle->packs))
if(count($Cycle->labels))
{
$Cycle->packs()->detach();
$Cycle->labels()->detach();
}
$Cycle->delete();
return \MessageResponse::success(trans('messages.success'));
app/Http/Controllers/ItemController.php
+14 -1
View File
@@ -10,7 +10,21 @@ class ItemController extends Controller
{
public function index(Request $request)
{
$user = auth('api')->user();
$Items = Item::with('user')
->when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
@@ -23,7 +37,6 @@ class ItemController extends Controller
->when($request->has('specific') && $request->specific != '', function($query) use($request){
$query->where('specific', $request->specific);
})
->where('user_id', auth('api')->user()->id)
->paginate(10);
return \MessageResponse::data($Items);
}
app/Http/Controllers/LabelController.php
+23 -12
View File
@@ -11,7 +11,25 @@ class LabelController extends Controller
{
public function index(Request $request)
{
$Labels = Label::when($request->has('name') && $request->name != '', function($query) use($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;
}
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -26,7 +44,7 @@ class LabelController extends Controller
->when($request->has('department') && $request->department != '', function($query) use($request){
$query->where('department', 'LIKE', '%'.$request->department.'%');
})
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
->when($medical_center_id, function($query) use($request){
$query->whereHas('user', function($query) use($request){
$query->where('medical_center_id', $request->medical_center_id);
});
@@ -40,7 +58,7 @@ class LabelController extends Controller
}
public function show(Label $Label)
{
$Label->load('user', 'packages', 'user.medical_center');
$Label->load('user', 'package', 'package.items', 'user.medical_center');
return \MessageResponse::data($Label);
}
public function store(StoreLabelRequest $request)
@@ -55,27 +73,20 @@ class LabelController extends Controller
'department' => $request->department,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
'package_id' => $request->package_id
];
$LabelObj = Label::create($LabelData);
Package::find($request->package_id)->update(['label_id' => $Label->id]);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Label $Label)
{
$Label->load('package');
dd($Label);
// $Packages = $Label->packages->pluck('id')->toArray();
// unset($Label->packages);
// $Label->package_id = $Label->package->id;
return \MessageResponse::data($Label);
}
public function update(Request $request, Label $Label)
{
$Label->update($request->except(['package_id']));
Package::find($request->package_id)->update(['label_id' => $Label->id]);
// $Label->package()->save($request->package_id);
// $Label->packages()->sync($request->packages);
$Label->update($request->all());
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Label $Label)
app/Http/Controllers/PackageController.php
+24 -7
View File
@@ -10,7 +10,21 @@ class PackageController extends Controller
{
public function index(Request $request)
{
$Packages = Package::when($request->has('name') && $request->name != '', function($query) use($request){
$user = auth('api')->user();
$Packages = Package::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
@@ -19,6 +33,7 @@ class PackageController extends Controller
->with('user')->paginate(10);
return \MessageResponse::data($Packages);
}
public function create()
{
@@ -50,10 +65,12 @@ class PackageController extends Controller
$Items[$item['id']] = $count;
}
}
// dd($Items);
foreach ($Items as $Item => $Count) {
$Package->items()->attach(array($Item), ['count' => $Count]);
// dump($Item);
$PackageObj->items()->attach(array($Item), ['count' => $Count]);
}
$PackageObj->items()->attach($request->items);
// $PackageObj->items()->attach($request->items);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Package $Package)
@@ -72,7 +89,6 @@ class PackageController extends Controller
}
public function update(StorePackageRequest $request, Package $Package)
{
// dd($request->items);
$Package->update($request->except(['items']));
$Items = [];
$count = 1;
@@ -97,12 +113,13 @@ class PackageController extends Controller
$Items[$item['id']] = $count;
}
}
// dd($Items);
$Package->items()->detach();
// foreach ($Items as $Item) {
// $Package->items()->attach(array($Item['id']), ['count' => $Item['count']]);
// }
foreach ($Items as $Item => $Count) {
// dump($Item, array($Item));
$Package->items()->attach(array($Item), ['count' => $Count]);
}
// $Package->items()->sync($request->items);
@@ -117,9 +134,9 @@ class PackageController extends Controller
{
$Package->items()->detach();
}
if(count($Package->packs))
if(count($Package->labels))
{
$Package->packs()->detach();
$Package->labels()->delete();
}
$Package->delete();
return \MessageResponse::success(trans('messages.success'));