From 2a83f7931bc074737e9fb564e298c2627a122e21 Mon Sep 17 00:00:00 2001 From: Fayyazi Date: Tue, 17 Sep 2019 12:01:30 +0430 Subject: [PATCH] update cycle --- app/Cycle.php | 4 +-- app/Http/Controllers/CycleController.php | 27 ++++++++++++------- app/Http/Controllers/PackController.php | 9 ++----- app/Http/Requests/StoreCycleRequest.php | 6 +++-- .../2019_08_19_105247_create_cycles_table.php | 1 + 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/Cycle.php b/app/Cycle.php index 715a32e9..d0400556 100644 --- a/app/Cycle.php +++ b/app/Cycle.php @@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Model; class Cycle extends Model { - public $fillable = ['name', 'date', 'user_id', 'sterilizer_id', 'note', 'verified']; + public $fillable = ['name', 'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified']; public function user() { return $this->belongsTo('App\User'); } - public function packes() + public function packs() { return $this->belongsToMany('App\Pack', 'cycle_pack'); } diff --git a/app/Http/Controllers/CycleController.php b/app/Http/Controllers/CycleController.php index 77466a32..a4531bf3 100644 --- a/app/Http/Controllers/CycleController.php +++ b/app/Http/Controllers/CycleController.php @@ -10,11 +10,17 @@ class CycleController extends Controller { public function index(Request $request) { - $Cycles = Cycle::when($request->has('name') && $request->name, function($query) use($request){ + $Cycles = Cycle::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('date', $request->sterilizer_id); + ->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){ + $query->where('sterilizer_id', $request->sterilizer_id); + }) + ->when($request->has('date') && $request->date != '', function($query) use($request){ + $query->where('date', $request->date); + }) + ->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){ + $query->where('cycle_number', $request->cycle_number); }) ->with('user')->paginate(10); return \MessageResponse::data($Cycles); @@ -25,7 +31,7 @@ class CycleController extends Controller } public function show(Cycle $Cycle) { - $Cycle->load('user', 'packes'); + $Cycle->load('user', 'packs'); return \MessageResponse::data($Cycle); } public function store(StoreCycleRequest $request) @@ -34,24 +40,25 @@ class CycleController extends Controller 'name' => $request->name, 'date' => $request->date, 'sterilizer_id' => $request->sterilizer_id, + 'cycle_number' => $request->cycle_number, 'note' => $request->note, 'user_id' => auth('api')->user()->id, 'verified' => 'NotVerified', ]; $CycleObj = Cycle::create($CycleData); - $CycleObj->packes()->attach($request->packes); + $CycleObj->packs()->attach($request->packs); return \MessageResponse::success(trans('messages.success')); } public function edit(Cycle $Cycle) { - $Cycle->load('user', 'packes'); + $Cycle->load('user', 'packs'); return \MessageResponse::data($Cycle); } public function update(StoreCycleRequest $request, Cycle $Cycle) { - $Cycle->update($request->except(['packes'])); - $Cycle->packes()->sync($request->packes); + $Cycle->update($request->except(['packs'])); + $Cycle->packs()->sync($request->packs); return \MessageResponse::success(trans('messages.success')); } public function destroy(Cycle $Cycle) @@ -59,9 +66,9 @@ class CycleController extends Controller if (auth('api')->user()->cant('delete', $Cycle)) { return \MessageResponse::error(trans('messages.access_denied')); } - if(count($Cycle->packes)) + if(count($Cycle->packs)) { - $Cycle->packes()->detach(); + $Cycle->packs()->detach(); } $Cycle->delete(); return \MessageResponse::success(trans('messages.success')); diff --git a/app/Http/Controllers/PackController.php b/app/Http/Controllers/PackController.php index f7a840a5..452343cd 100644 --- a/app/Http/Controllers/PackController.php +++ b/app/Http/Controllers/PackController.php @@ -16,9 +16,6 @@ class PackController extends Controller ->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); }) @@ -33,7 +30,7 @@ class PackController extends Controller $query->where('medical_center_id', $request->medical_center_id); }); }) - ->with('user')->paginate(10); + ->with('user', 'user.medical_center')->paginate(10); return \MessageResponse::data($Packs); } public function create() @@ -42,15 +39,13 @@ class PackController extends Controller } public function show(Pack $Pack) { - $Pack->load('user', 'packages'); + $Pack->load('user', 'packages', 'user.medical_center'); 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, diff --git a/app/Http/Requests/StoreCycleRequest.php b/app/Http/Requests/StoreCycleRequest.php index 104ebbd1..109a79ca 100644 --- a/app/Http/Requests/StoreCycleRequest.php +++ b/app/Http/Requests/StoreCycleRequest.php @@ -28,8 +28,9 @@ class StoreCycleRequest extends FormRequest 'name' => 'required|max:100|unique:cycles', 'date' => 'required', 'sterilizer_id' => 'required', + 'cycle_number' => 'required', 'note' => 'nullable', - 'packes' => 'required', + 'packs' => 'required', ]; break; } @@ -40,8 +41,9 @@ class StoreCycleRequest extends FormRequest 'name' => 'required|max:100|unique:cycles,id,'.$Cycle->id, 'date' => 'required', 'sterilizer_id' => 'required', + 'cycle_number' => 'required', 'note' => 'nullable', - 'packes' => 'required', + 'packs' => 'required', ]; break; diff --git a/database/2019_08_19_105247_create_cycles_table.php b/database/2019_08_19_105247_create_cycles_table.php index 88a68f84..6951ceea 100644 --- a/database/2019_08_19_105247_create_cycles_table.php +++ b/database/2019_08_19_105247_create_cycles_table.php @@ -18,6 +18,7 @@ class CreateCyclesTable extends Migration $table->string('name'); $table->date('date'); $table->string('sterilizer_id'); + $table->string('cycle_number'); $table->text('note')->nullable(); $table->enum('verified',['Verified', 'NotVerified']); $table->unsignedBigInteger('user_id');