mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-13 23:01:07 +03:30
add ItemFilter
This commit is contained in:
@@ -10,7 +10,13 @@ class ItemController extends Controller
|
|||||||
{
|
{
|
||||||
public function index(Request $request)
|
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);
|
return \MessageResponse::data($Items);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,11 +26,11 @@ class ItemController extends Controller
|
|||||||
}
|
}
|
||||||
public function show(Item $Item)
|
public function show(Item $Item)
|
||||||
{
|
{
|
||||||
|
$Item->load('user');
|
||||||
return \MessageResponse::data($Item);
|
return \MessageResponse::data($Item);
|
||||||
}
|
}
|
||||||
public function store(StoreItemRequest $request)
|
public function store(StoreItemRequest $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
|
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
|
||||||
$ItemData = [
|
$ItemData = [
|
||||||
'name' => $request->name,
|
'name' => $request->name,
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ use App\Input;
|
|||||||
use App\Option;
|
use App\Option;
|
||||||
use App\Http\Requests\StoreTestTypeRequest;
|
use App\Http\Requests\StoreTestTypeRequest;
|
||||||
use \Milon\Barcode\DNS1D;
|
use \Milon\Barcode\DNS1D;
|
||||||
|
use \Milon\Barcode\DNS2D;
|
||||||
|
|
||||||
class TestTypeController extends Controller
|
class TestTypeController extends Controller
|
||||||
{
|
{
|
||||||
@@ -46,7 +47,7 @@ class TestTypeController extends Controller
|
|||||||
}
|
}
|
||||||
$Number = $TestType->unique_code;
|
$Number = $TestType->unique_code;
|
||||||
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
|
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
|
||||||
$QRCode = \DNS2D::getBarcodePNGUri($Number, "QRCODE");
|
$QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE");
|
||||||
$TestType->update(['bar_code' => $Barcode]);
|
$TestType->update(['bar_code' => $Barcode]);
|
||||||
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
|
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class StoreTestResultRequest extends FormRequest
|
|||||||
switch ($this->method()) {
|
switch ($this->method()) {
|
||||||
case 'POST': {
|
case 'POST': {
|
||||||
return [
|
return [
|
||||||
// 'device_id' => 'requisred',
|
'device_id' => 'requisred',
|
||||||
'cycle_number' => 'required',
|
'cycle_number' => 'required',
|
||||||
'test_type_id' => 'required|numeric|exists:test_types,id',
|
'test_type_id' => 'required|numeric|exists:test_types,id',
|
||||||
'result' => 'required',
|
'result' => 'required',
|
||||||
@@ -36,7 +36,7 @@ class StoreTestResultRequest extends FormRequest
|
|||||||
case 'PATCH': {
|
case 'PATCH': {
|
||||||
// $TestResult = $this->route('TestResult');
|
// $TestResult = $this->route('TestResult');
|
||||||
return [
|
return [
|
||||||
// 'device_id' => 'required',
|
'device_id' => 'required',
|
||||||
'cycle_number' => 'required',
|
'cycle_number' => 'required',
|
||||||
'test_type_id' => 'required|numeric|exists:test_types,id',
|
'test_type_id' => 'required|numeric|exists:test_types,id',
|
||||||
'result' => 'required',
|
'result' => 'required',
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return [
|
||||||
|
'store_path' => public_path("Barcodes/"),
|
||||||
|
'store_path_qr' => public_path("QRCodes/"),
|
||||||
|
];
|
||||||
Reference in New Issue
Block a user