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

update label show

Browse Source
This commit is contained in:
Fayyazi
2019-11-09 14:13:52 +03:30
parent 2306aca310
commit ac9eae8b5c
27 changed files with 867 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BarCodeController.php
+6
View File
@@ -39,4 +39,10 @@ class BarCodeController extends Controller
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
}
}
public function generatePackageQRCode(Package $Package)
{
$URL = 'https://www.cssd-doc.com/ShowPackage/'.$Package->id;
$QRCode = DNS2D::getBarcodePNG($URL, "QRCODE");
return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]);
}
}
app/Http/Controllers/LabelController.php
+1 -10
View File
@@ -28,10 +28,6 @@ class LabelController extends Controller
$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){
$query->where('sterilizer_id', $request->sterilizer_id);
})
@@ -41,9 +37,6 @@ class LabelController extends Controller
->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.'%');
})
->when($medical_center_id, function($query) use($request){
$query->whereHas('user', function($query) use($request){
$query->where('medical_center_id', $request->medical_center_id);
@@ -59,19 +52,17 @@ class LabelController extends Controller
public function show(Label $Label)
{
$Label->load('user', 'package', 'package.items', 'user.medical_center');
return \MessageResponse::data($Label);
}
public function store(StoreLabelRequest $request)
{
$LabelData = [
'name' => $request->name,
'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,
'package_id' => $request->package_id
];
app/Http/Requests/StoreCycleRequest.php
+2 -2
View File
@@ -30,7 +30,7 @@ class StoreCycleRequest extends FormRequest
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'note' => 'nullable',
'labels' => 'required',
'labels.*.id' => 'required|numeric|exists:labels,id',
];
break;
}
@@ -43,7 +43,7 @@ class StoreCycleRequest extends FormRequest
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'note' => 'nullable',
'labels' => 'required',
'labels.*.id' => 'required|numeric|exists:labels,id',
];
break;
app/Http/Requests/StoreLabelRequest.php
-6
View File
@@ -25,14 +25,11 @@ class StoreLabelRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
'name' => 'required|max:100|unique:labels',
'sterile_date' => 'required',
'expire_date' => 'required',
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'lot_number' => 'required',
'department' => 'required',
'note' => 'nullable',
'package_id' => 'required',
];
break;
@@ -41,14 +38,11 @@ class StoreLabelRequest extends FormRequest
case 'PATCH': {
$Label = $this->route('Label');
return [
'name' => 'required|max:100|unique:labels,id,'.$Label->id,
'sterile_date' => 'required',
'expire_date' => 'required',
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'lot_number' => 'required',
'department' => 'required',
'note' => 'nullable',
'package_id' => 'required',
];
break;