diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index f10dd97d..04463c14 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);
     }
     public function create()
@@ -19,6 +25,7 @@ class ItemController extends Controller
     }
     public function show(Item $Item)
     {
+        $Item->load('user');
         return \MessageResponse::data($Item);
     }
     public function store(StoreItemRequest $request)
diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php
index 84fc693c..6acda85d 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]);
     }
@@ -372,9 +373,9 @@ class TestTypeController extends Controller
             $testTypeId = TestResult::find($request->test_result_id);
         }
         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 {
-            $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) {
 
diff --git a/app/Http/Requests/StoreTestResultRequest.php b/app/Http/Requests/StoreTestResultRequest.php
index fd51871f..411d0dea 100644
--- a/app/Http/Requests/StoreTestResultRequest.php
+++ b/app/Http/Requests/StoreTestResultRequest.php
@@ -25,10 +25,14 @@ class StoreTestResultRequest extends FormRequest
         switch ($this->method()) {
             case 'POST': {
                 return [
+<<<<<<< HEAD
                     // 'user_id' => 'required',
                     // 'autoclave_id' => 'required',
                     'device_id' => 'required',
                     'device_label' => 'required',
+=======
+                    'device_id' => 'requisred',
+>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
                     'cycle_number' => 'required',
                     'test_type_id' => 'required|numeric|exists:test_types,id',
                     'result' => 'required',
@@ -39,10 +43,14 @@ class StoreTestResultRequest extends FormRequest
             case 'PATCH': {
                 // $TestResult =  $this->route('TestResult');
                 return [
+<<<<<<< HEAD
                     // 'user_id' => 'required',
                     // 'autoclave_id' => 'required',
                     'device_id' => 'required',
                     'device_label' => 'required',
+=======
+                    'device_id' => 'required',
+>>>>>>> 217b6c09ce951ac0d121943a26c39cd531946b74
                     '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 @@
+<?php
+
+return [
+    'store_path' => public_path("Barcodes/"),
+    'store_path_qr' => public_path("QRCodes/"),
+];