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

add pack and update items & packegs & cycles

Browse Source
This commit is contained in:
Fayyazi
2019-09-07 13:49:04 +04:30
parent 3522700605
commit 976e4c075b
39 changed files with 628 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CycleController.php
+13 -17
View File
@@ -13,11 +13,8 @@ class CycleController extends Controller
$Cycles = Cycle::when($request->has('name') && $request->name, function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('result') && $request->result, function($query) use($request){
$query->where('result', $request->result);
})
->when($request->has('unique_id') && $request->unique_id, function($query) use($request){
$query->where('unique_id', $request->unique_id);
->when($request->has('sterilizer_id') && $request->sterilizer_id, function($query) use($request){
$query->where('date', $request->sterilizer_id);
})
->with('user')->paginate(10);
return \MessageResponse::data($Cycles);
@@ -28,34 +25,33 @@ class CycleController extends Controller
}
public function show(Cycle $Cycle)
{
$Cycle->load('user', 'packages');
$Cycle->load('user', 'packes');
return \MessageResponse::data($Cycle);
}
public function store(StoreCycleRequest $request)
{
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$CycleData = [
'name' => $request->name,
'unique_id' => $UniqueID,
'result' => $request->result,
'description' => $request->description,
'date' => $request->date,
'sterilizer_id' => $request->sterilizer_id,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
'verified' => 'NotVerified',
];
$CycleObj = Cycle::create($CycleData);
$CycleObj->packages()->attach($request->packages);
$CycleObj->packes()->attach($request->packes);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Cycle $Cycle)
{
$Cycle->load('user', 'packages');
$Cycle->load('user', 'packes');
return \MessageResponse::data($Cycle);
}
public function update(StoreCycleRequest $request, Cycle $Cycle)
{
$Cycle->update($request->except(['packages']));
$Cycle->packages()->sync($request->packages);
$Cycle->update($request->except(['packes']));
$Cycle->packes()->sync($request->packes);
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Cycle $Cycle)
@@ -63,9 +59,9 @@ class CycleController extends Controller
if (auth('api')->user()->cant('delete', $Cycle)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if(count($Cycle->packages))
if(count($Cycle->packes))
{
$Cycle->packages()->detach();
$Cycle->packes()->detach();
}
$Cycle->delete();
return \MessageResponse::success(trans('messages.success'));
app/Http/Controllers/ItemController.php
+15 -6
View File
@@ -11,12 +11,19 @@ class ItemController extends Controller
public function index(Request $request)
{
$Items = Item::with('user')
->when($request->has('name') && $request->name, function($query) use($request){
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('result') && $request->result, function($query) use($request){
$query->where('result', $request->result);
})->paginate(10);
->when($request->has('size') && $request->size != '', function($query) use($request){
$query->where('size', $request->size);
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
})
->when($request->has('specific') && $request->specific != '', function($query) use($request){
$query->where('specific', $request->specific);
})
->paginate(10);
return \MessageResponse::data($Items);
}
@@ -33,8 +40,10 @@ class ItemController extends Controller
{
$ItemData = [
'name' => $request->name,
'result' => $request->result,
'description' => $request->description,
'size' => $request->size,
'unique_id' => $request->unique_id,
'specific' => $request->specific,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
];
$ItemObj = Item::create($ItemData);
app/Http/Controllers/PackController.php
+96
View File
@@ -0,0 +1,96 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Requests\StorePackRequest;
use App\Pack;
class PackController extends Controller
{
public function index(Request $request)
{
$Packes = Pack::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){
$query->where('sterilizer_id', $request->sterilizer_id);
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
})
->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){
$query->where('cycle_number', $request->cycle_number);
})
->when($request->has('lot_number') && $request->lot_number != '', function($query) use($request){
$query->where('lot_number', $request->lot_number);
})
->when($request->has('department') && $request->department != '', function($query) use($request){
$query->where('department', 'LIKE', '%'.$request->department.'%');
})
->with('user')->paginate(10);
return \MessageResponse::data($Packes);
}
public function create()
{
}
public function show(Pack $Pack)
{
$Pack->load('user', 'packages');
return \MessageResponse::data($Pack);
}
public function store(StorePackRequest $request)
{
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackData = [
'name' => $request->name,
'unique_id' => $UniqueID,
'sterile_date' => $request->sterile_date,
'expire_date' => $request->expire_date,
'sterilizer_id' => $request->sterilizer_id,
'cycle_number' => $request->cycle_number,
'lot_number' => $request->lot_number,
'department' => $request->department,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
];
$PackObj = Pack::create($PackData);
$PackObj->packages()->attach($request->packages);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Pack $Pack)
{
$Pack->load('user', 'packages');
return \MessageResponse::data($Pack);
}
public function update(StorePackRequest $request, Pack $Pack)
{
$Pack->update($request->except(['packages']));
$Pack->packages()->sync($request->packages);
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Pack $Pack)
{
if (auth('api')->user()->cant('delete', $Pack)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if(count($Pack->packages))
{
$Pack->packages()->detach();
}
if(count($Pack->cycles))
{
$Pack->cycles()->detach();
}
$Pack->delete();
return \MessageResponse::success(trans('messages.success'));
}
public function getPackes()
{
$Packes = Pack::with('user')->get();
return \MessageResponse::data($Packes);
}
}
app/Http/Controllers/PackageController.php
+5 -9
View File
@@ -10,13 +10,10 @@ class PackageController extends Controller
{
public function index(Request $request)
{
$Packages = Package::when($request->has('name') && $request->name, function($query) use($request){
$Packages = Package::when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('result') && $request->result, function($query) use($request){
$query->where('result', $request->result);
})
->when($request->has('unique_id') && $request->unique_id, function($query) use($request){
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
$query->where('unique_id', $request->unique_id);
})
->with('user')->paginate(10);
@@ -37,8 +34,7 @@ class PackageController extends Controller
$PackageData = [
'name' => $request->name,
'unique_id' => $UniqueID,
'result' => $request->result,
'description' => $request->description,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
'verified' => 'NotVerified',
];
@@ -66,9 +62,9 @@ class PackageController extends Controller
{
$Package->items()->detach();
}
if(count($Package->cycles))
if(count($Package->packes))
{
$Package->cycles()->detach();
$Package->packes()->detach();
}
$Package->delete();
return \MessageResponse::success(trans('messages.success'));
app/Http/Requests/StoreCycleRequest.php
+8 -5
View File
@@ -26,8 +26,10 @@ class StoreCycleRequest extends FormRequest
case 'POST': {
return [
'name' => 'required|max:100|unique:cycles',
'result' => 'required',
'packages' => 'required',
'date' => 'required',
'sterilizer_id' => 'required',
'note' => 'nullable',
'packes' => 'required',
];
break;
}
@@ -36,9 +38,10 @@ class StoreCycleRequest extends FormRequest
$Cycle = $this->route('Cycle');
return [
'name' => 'required|max:100|unique:cycles,id,'.$Cycle->id,
// 'unique_id' => 'required|max:100|unique:cycles,id,'.$Cycle->id,
'result' => 'required',
'packages' => 'required',
'date' => 'required',
'sterilizer_id' => 'required',
'note' => 'nullable',
'packes' => 'required',
];
break;
app/Http/Requests/StoreItemRequest.php
+8 -4
View File
@@ -26,8 +26,10 @@ class StoreItemRequest extends FormRequest
case 'POST': {
return [
'name' => 'required|max:100|unique:items',
'result' => 'required',
// 'description' => 'required',
'unique_id' => 'required|max:100|unique:items',
'size' => 'required',
'specific' => 'required',
'note' => 'nullable',
];
break;
}
@@ -36,8 +38,10 @@ class StoreItemRequest extends FormRequest
$Item = $this->route('Item');
return [
'name' => 'required|max:100|unique:items,id,'.$Item->id,
'result' => 'required',
// 'description' => 'required',
'unique_id' => 'required|max:100|unique:items,id,'.$Item->id,
'size' => 'required',
'specific' => 'required',
'note' => 'nullable',
];
break;
app/Http/Requests/StorePackRequest.php
+63
View File
@@ -0,0 +1,63 @@
<?php
namespace App\Http\Requests;
use App\Pack;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\Validator;
class StorePackRequest extends FormRequest
{
public function authorize()
{
if ($this->method() == 'POST') {
return auth('api')->check() && auth('api')->user()->can('store', Pack::class);
} else {
$Pack = $this->route('Pack');
return auth('api')->check() && $Pack && auth('api')->user()->can('update', $Pack);
}
}
public function rules()
{
switch ($this->method()) {
case 'POST': {
return [
'name' => 'required|max:100|unique:packs',
'sterile_date' => 'required',
'expire_date' => 'required',
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'lot_number' => 'required',
'department' => 'required',
'note' => 'nullable',
'packages' => 'required',
];
break;
}
case 'PUT':
case 'PATCH': {
$Pack = $this->route('Pack');
return [
'name' => 'required|max:100|unique:packs,id,'.$Pack->id,
'sterile_date' => 'required',
'expire_date' => 'required',
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'lot_number' => 'required',
'department' => 'required',
'note' => 'nullable',
'packages' => 'required',
];
break;
}
default:
break;
}
}
}
app/Http/Requests/StorePackageRequest.php
+2 -2
View File
@@ -26,7 +26,7 @@ class StorePackageRequest extends FormRequest
case 'POST': {
return [
'name' => 'required|max:100|unique:packages',
'result' => 'required',
'note' => 'nullable',
'items' => 'required',
];
break;
@@ -37,7 +37,7 @@ class StorePackageRequest extends FormRequest
return [
'name' => 'required|max:100|unique:packages,id,'.$Package->id,
'unique_id' => 'required|max:100|unique:packages,id,'.$Package->id,
'result' => 'required',
'note' => 'nullable',
'items' => 'required',
];
break;