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

update cycle

Browse Source
This commit is contained in:
Fayyazi
2019-09-17 12:01:30 +04:30
parent a14ee80603
commit 2a83f7931b
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Cycle.php
+2 -2
View File
@@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Model;
class Cycle extends 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() public function user()
{ {
return $this->belongsTo('App\User'); return $this->belongsTo('App\User');
} }
public function packes() public function packs()
{ {
return $this->belongsToMany('App\Pack', 'cycle_pack'); return $this->belongsToMany('App\Pack', 'cycle_pack');
} }
app/Http/Controllers/CycleController.php
+17 -10
View File
@@ -10,11 +10,17 @@ class CycleController extends Controller
{ {
public function index(Request $request) 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.'%'); $query->where('name', 'LIKE', '%'.$request->name.'%');
}) })
->when($request->has('sterilizer_id') && $request->sterilizer_id, function($query) use($request){ ->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
$query->where('date', $request->sterilizer_id); $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); ->with('user')->paginate(10);
return \MessageResponse::data($Cycles); return \MessageResponse::data($Cycles);
@@ -25,7 +31,7 @@ class CycleController extends Controller
} }
public function show(Cycle $Cycle) public function show(Cycle $Cycle)
{ {
$Cycle->load('user', 'packes'); $Cycle->load('user', 'packs');
return \MessageResponse::data($Cycle); return \MessageResponse::data($Cycle);
} }
public function store(StoreCycleRequest $request) public function store(StoreCycleRequest $request)
@@ -34,24 +40,25 @@ class CycleController extends Controller
'name' => $request->name, 'name' => $request->name,
'date' => $request->date, 'date' => $request->date,
'sterilizer_id' => $request->sterilizer_id, 'sterilizer_id' => $request->sterilizer_id,
'cycle_number' => $request->cycle_number,
'note' => $request->note, 'note' => $request->note,
'user_id' => auth('api')->user()->id, 'user_id' => auth('api')->user()->id,
'verified' => 'NotVerified', 'verified' => 'NotVerified',
]; ];
$CycleObj = Cycle::create($CycleData); $CycleObj = Cycle::create($CycleData);
$CycleObj->packes()->attach($request->packes); $CycleObj->packs()->attach($request->packs);
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
} }
public function edit(Cycle $Cycle) public function edit(Cycle $Cycle)
{ {
$Cycle->load('user', 'packes'); $Cycle->load('user', 'packs');
return \MessageResponse::data($Cycle); return \MessageResponse::data($Cycle);
} }
public function update(StoreCycleRequest $request, Cycle $Cycle) public function update(StoreCycleRequest $request, Cycle $Cycle)
{ {
$Cycle->update($request->except(['packes'])); $Cycle->update($request->except(['packs']));
$Cycle->packes()->sync($request->packes); $Cycle->packs()->sync($request->packs);
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
} }
public function destroy(Cycle $Cycle) public function destroy(Cycle $Cycle)
@@ -59,9 +66,9 @@ class CycleController extends Controller
if (auth('api')->user()->cant('delete', $Cycle)) { if (auth('api')->user()->cant('delete', $Cycle)) {
return \MessageResponse::error(trans('messages.access_denied')); return \MessageResponse::error(trans('messages.access_denied'));
} }
if(count($Cycle->packes)) if(count($Cycle->packs))
{ {
$Cycle->packes()->detach(); $Cycle->packs()->detach();
} }
$Cycle->delete(); $Cycle->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
app/Http/Controllers/PackController.php
+2 -7
View File
@@ -16,9 +16,6 @@ class PackController extends Controller
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){ ->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
$query->where('sterilizer_id', $request->sterilizer_id); $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){ ->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){
$query->where('cycle_number', $request->cycle_number); $query->where('cycle_number', $request->cycle_number);
}) })
@@ -33,7 +30,7 @@ class PackController 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', 'user.medical_center')->paginate(10);
return \MessageResponse::data($Packs); return \MessageResponse::data($Packs);
} }
public function create() public function create()
@@ -42,15 +39,13 @@ class PackController extends Controller
} }
public function show(Pack $Pack) public function show(Pack $Pack)
{ {
$Pack->load('user', 'packages'); $Pack->load('user', 'packages', 'user.medical_center');
return \MessageResponse::data($Pack); return \MessageResponse::data($Pack);
} }
public function store(StorePackRequest $request) public function store(StorePackRequest $request)
{ {
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackData = [ $PackData = [
'name' => $request->name, 'name' => $request->name,
'unique_id' => $UniqueID,
'sterile_date' => $request->sterile_date, 'sterile_date' => $request->sterile_date,
'expire_date' => $request->expire_date, 'expire_date' => $request->expire_date,
'sterilizer_id' => $request->sterilizer_id, 'sterilizer_id' => $request->sterilizer_id,
app/Http/Requests/StoreCycleRequest.php
+4 -2
View File
@@ -28,8 +28,9 @@ class StoreCycleRequest extends FormRequest
'name' => 'required|max:100|unique:cycles', 'name' => 'required|max:100|unique:cycles',
'date' => 'required', 'date' => 'required',
'sterilizer_id' => 'required', 'sterilizer_id' => 'required',
'cycle_number' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'packes' => 'required', 'packs' => 'required',
]; ];
break; break;
} }
@@ -40,8 +41,9 @@ class StoreCycleRequest extends FormRequest
'name' => 'required|max:100|unique:cycles,id,'.$Cycle->id, 'name' => 'required|max:100|unique:cycles,id,'.$Cycle->id,
'date' => 'required', 'date' => 'required',
'sterilizer_id' => 'required', 'sterilizer_id' => 'required',
'cycle_number' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'packes' => 'required', 'packs' => 'required',
]; ];
break; break;
database/2019_08_19_105247_create_cycles_table.php
+1
View File
@@ -18,6 +18,7 @@ class CreateCyclesTable extends Migration
$table->string('name'); $table->string('name');
$table->date('date'); $table->date('date');
$table->string('sterilizer_id'); $table->string('sterilizer_id');
$table->string('cycle_number');
$table->text('note')->nullable(); $table->text('note')->nullable();
$table->enum('verified',['Verified', 'NotVerified']); $table->enum('verified',['Verified', 'NotVerified']);
$table->unsignedBigInteger('user_id'); $table->unsignedBigInteger('user_id');