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

add ItemFilter

Browse Source
This commit is contained in:
Fayyazi
2019-07-18 18:42:06 +04:30
parent be80b356d1
commit afc55ad16a
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+8 -2
View File
@@ -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,
app/Http/Controllers/TestTypeController.php
+2 -1
View File
@@ -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]);
}
app/Http/Requests/StoreTestResultRequest.php
+2 -2
View File
@@ -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',
config/barcode.php
+6
View File
@@ -0,0 +1,6 @@
<?php
return [
'store_path' => public_path("Barcodes/"),
'store_path_qr' => public_path("QRCodes/"),
];