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

s"

Browse Source
This commit is contained in:
saeid
2019-07-18 19:06:08 +04:30
parent a178faeb66 217b6c09ce
commit a8d6df8dc1
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+8 -1
View File
@@ -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);
} }
public function create() public function create()
@@ -19,6 +25,7 @@ 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)
app/Http/Controllers/TestTypeController.php
+4 -3
View File
@@ -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]);
} }
@@ -372,9 +373,9 @@ class TestTypeController extends Controller
$testTypeId = TestResult::find($request->test_result_id); $testTypeId = TestResult::find($request->test_result_id);
} }
if (isset($testTypeId) && $testTypeId) { if (isset($testTypeId) && $testTypeId) {
$testType = TestType::select('id', 'name', 'unique_code')->find($testTypeId->test_type_id); $testType = TestType::select('id', 'name', 'unique_code', 'device_label')->find($testTypeId->test_type_id);
} else { } else {
$testType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->select('id', 'name', 'unique_code')->first(); $testType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->select('id', 'name', 'unique_code', 'device_label')->first();
} }
if (isset($testType) && $testType) { if (isset($testType) && $testType) {
app/Http/Requests/StoreTestResultRequest.php
+8
View File
@@ -25,10 +25,14 @@ class StoreTestResultRequest extends FormRequest
switch ($this->method()) { switch ($this->method()) {
case 'POST': { case 'POST': {
return [ return [
<<<<<<< HEAD
// 'user_id' => 'required', // 'user_id' => 'required',
// 'autoclave_id' => 'required', // 'autoclave_id' => 'required',
'device_id' => 'required', 'device_id' => 'required',
'device_label' => 'required', 'device_label' => 'required',
=======
'device_id' => 'requisred',
>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
'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',
@@ -39,10 +43,14 @@ class StoreTestResultRequest extends FormRequest
case 'PATCH': { case 'PATCH': {
// $TestResult = $this->route('TestResult'); // $TestResult = $this->route('TestResult');
return [ return [
<<<<<<< HEAD
// 'user_id' => 'required', // 'user_id' => 'required',
// 'autoclave_id' => 'required', // 'autoclave_id' => 'required',
'device_id' => 'required', 'device_id' => 'required',
'device_label' => 'required', 'device_label' => 'required',
=======
'device_id' => 'required',
>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
'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',
config/barcode.php
+6
View File
@@ -0,0 +1,6 @@
<?php
return [
'store_path' => public_path("Barcodes/"),
'store_path_qr' => public_path("QRCodes/"),
];