diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index a4ecd513..abc06a68 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -10,7 +10,13 @@ class ItemController extends Controller { public function index(Request $request) { - $Items = Item::with('user')->paginate(10); + $Items = Item::with('user') + ->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); return \MessageResponse::data($Items); } @@ -20,11 +26,11 @@ class ItemController extends Controller } public function show(Item $Item) { + $Item->load('user'); return \MessageResponse::data($Item); } public function store(StoreItemRequest $request) { - // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10); $ItemData = [ 'name' => $request->name, diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php index 83c08ef9..f8e8705a 100644 --- a/app/Http/Controllers/TestTypeController.php +++ b/app/Http/Controllers/TestTypeController.php @@ -9,6 +9,7 @@ use App\Input; use App\Option; use App\Http\Requests\StoreTestTypeRequest; use \Milon\Barcode\DNS1D; +use \Milon\Barcode\DNS2D; class TestTypeController extends Controller { @@ -46,7 +47,7 @@ class TestTypeController extends Controller } $Number = $TestType->unique_code; $Barcode = DNS1D::getBarcodePNGUri($Number, "C128"); - $QRCode = \DNS2D::getBarcodePNGUri($Number, "QRCODE"); + $QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE"); $TestType->update(['bar_code' => $Barcode]); return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]); } diff --git a/app/Http/Requests/StoreTestResultRequest.php b/app/Http/Requests/StoreTestResultRequest.php index 33dd3f55..44d92da3 100644 --- a/app/Http/Requests/StoreTestResultRequest.php +++ b/app/Http/Requests/StoreTestResultRequest.php @@ -25,7 +25,7 @@ class StoreTestResultRequest extends FormRequest switch ($this->method()) { case 'POST': { return [ - // 'device_id' => 'requisred', + 'device_id' => 'requisred', 'cycle_number' => 'required', 'test_type_id' => 'required|numeric|exists:test_types,id', 'result' => 'required', @@ -36,7 +36,7 @@ class StoreTestResultRequest extends FormRequest case 'PATCH': { // $TestResult = $this->route('TestResult'); return [ - // 'device_id' => 'required', + 'device_id' => 'required', 'cycle_number' => 'required', 'test_type_id' => 'required|numeric|exists:test_types,id', 'result' => 'required', diff --git a/config/barcode.php b/config/barcode.php new file mode 100644 index 00000000..5afecee3 --- /dev/null +++ b/config/barcode.php @@ -0,0 +1,6 @@ + public_path("Barcodes/"), + 'store_path_qr' => public_path("QRCodes/"), +];