diff --git a/app/Http/Controllers/BarCodeController.php b/app/Http/Controllers/BarCodeController.php
index 1575cf5f..bcfe9781 100644
--- a/app/Http/Controllers/BarCodeController.php
+++ b/app/Http/Controllers/BarCodeController.php
@@ -9,9 +9,13 @@ class BarCodeController extends Controller
 {
     public function generateBarcode($Number)
     {
-        // $Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
-        $Barcode = DNS1D::getBarcodePNG($Number, "C128");
-        $QRCode  = DNS2D::getBarcodePNG($Number, "QRCODE");
-        return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode]);
+        if($Number != "undefined")
+        {
+            // $Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
+            $Barcode = DNS1D::getBarcodePNG($Number, "C128");
+            $QRCode  = DNS2D::getBarcodePNG($Number, "QRCODE");
+            return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode]);
+        }
+        
     }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 04463c14..6bc9eb47 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -19,6 +19,7 @@ class ItemController extends Controller
         })->paginate(10);
         return \MessageResponse::data($Items);
     }
+
     public function create()
     {
 
@@ -30,14 +31,14 @@ class ItemController extends Controller
     }
     public function store(StoreItemRequest $request)
     {
-        // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
         $ItemData = [
           'name' => $request->name,
+          'result' => $request->result,
           'description' => $request->description,
           'user_id' => auth('api')->user()->id,
         ];
         $ItemObj = Item::create($ItemData);
-        $ItemObj->packages()->attach($request->package_id);
+
         return \MessageResponse::success(trans('messages.success'));
     }
     public function edit(Item $Item)
@@ -46,8 +47,8 @@ class ItemController extends Controller
     }
     public function update(StoreItemRequest $request, Item $Item)
     {
+        // dd($request->all());
         $Item->update($request->all());
-        $ItemObj->packages()->sync($request->package_ids);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function destroy(Item $Item)
@@ -55,8 +56,17 @@ class ItemController extends Controller
         if (!auth('api')->user()->can('delete', $Item)) {
             return \MessageResponse::error(trans('messages.access_denied'));
         }
+        if(count($Item->packages))
+        {
+            $Item->packages()->detach();
+        }
         $Item->delete();
         return \MessageResponse::success(trans('messages.success'));
     }
 
+    public function getItems(){
+        $Items = Item::with('user')->get();
+        return \MessageResponse::data($Items);
+    }
+
 }
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index 3baf4a84..40c7123a 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -28,6 +28,7 @@ class PackageController extends Controller
     }
     public function show(Package $Package)
     {
+        $Package->load('user', 'items');
         return \MessageResponse::data($Package);
     }
     public function store(StorePackageRequest $request)
@@ -41,16 +42,19 @@ class PackageController extends Controller
           'user_id' => auth('api')->user()->id,
           'verified' => 'NotVerified',
         ];
-        Package::create($PackageData);
+        $PackageObj = Package::create($PackageData);
+        $PackageObj->items()->attach($request->items);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function edit(Package $Package)
     {
+        $Package->load('user', 'items');
         return \MessageResponse::data($Package);
     }
     public function update(StorePackageRequest $request, Package $Package)
     {
-        $Package->update($request->all());
+        $Package->update($request->except(['items']));
+        $Package->items()->sync($request->items);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function destroy(Package $Package)
@@ -58,6 +62,10 @@ class PackageController extends Controller
         if (!auth('api')->user()->can('delete', $Package)) {
             return \MessageResponse::error(trans('messages.access_denied'));
         }
+        if(count($Package->items))
+        {
+            $Package->items()->detach();
+        }
         $Package->delete();
         return \MessageResponse::success(trans('messages.success'));
     }
diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php
index 20b82f4d..02211d50 100644
--- a/app/Http/Controllers/TestResultController.php
+++ b/app/Http/Controllers/TestResultController.php
@@ -79,7 +79,7 @@ class TestResultController extends Controller
 
     public function store(StoreTestResultRequest $request)
     {
-
+        // dd($request->result);
         try {
             $return_value = \DB::transaction(function () use ($request) {
 
@@ -88,7 +88,7 @@ class TestResultController extends Controller
                     // 'autoclave_id' => $request->autoclave_id,
                     'cycle_number' => $request->cycle_number,
                     'device_id' => $request->device_id,
-                    'device_label' => $request->device_label,
+                    // 'device_label' => $request->device_label,
                     'test_type_id' => $request->test_type_id,
                     'result' => $request->result,
                     'verified' => 'NotVerified',
@@ -102,15 +102,15 @@ class TestResultController extends Controller
                  foreach ($Inputs as $Input) {
                      if ($Input['type'] != 'Form') {
                          $Value = $TestResultInfo[$Input->name.'_'.$Input->id];
-                         if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
+                         if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') {
 
-                           // foreach ($Value as $Option) {
-                           //    $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option]);
-                           // }
                            foreach ($Input->options as $Option) {//--2
-                             if(in_array($Option->id,$Value)){
-                               $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
-                             }
+                               if(is_array($Value) && in_array($Option->id,$Value)){
+                                   $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
+                               }
+                               if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
+                                   $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
+                               }
                            }
 
                          } else {
@@ -120,14 +120,15 @@ class TestResultController extends Controller
                          foreach ($Input->children as $InputChild) {
                              $Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id];
 
-                             if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
-                               // foreach ($Value as $Option) {
-                               //    $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option]);
-                               // }
+                             if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') {
+
                                foreach ($InputChild->options as $Option) {//--2
-                                 if(in_array($Option->id,$Value)){
+                                 if(is_array($Value) && in_array($Option->id,$Value)){
                                    $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
                                  }
+                                 if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
+                                    $InputValueObj = InputValue::create(['test_result_id' => $TestResultObj->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
+                                 }
                                }
                              }
                              else {
@@ -139,32 +140,16 @@ class TestResultController extends Controller
                      }
                  }
                  ///////////////////////////////////////////////////////////////////////////Inputs
-                 ///////////////////////////////////////////////////////////////////////////Image
-
-                 // if ($request->img != null) {
-                 //
-                 //    $Image = $request->img;
-                 //    $InterventionImage = Image::make($Image);
-                 //    $Mime = explode('/', $InterventionImage->mime());
-                 //
-                 //    $ImageName = time().'.'.$Mime[1];
-                 //    $Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName;
-                 //
-                 //    Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id);
-                 //    $InterventionImage->save(public_path($Path));
-                 //
-                 //    $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]);
-                 //    $Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
-                 // }
-                 //-------------------------------------------------imgs
+                 ///////////////////////////////////////////////////////////////////////////Images
                  if ($request->imgs != null) {
 
-                     foreach ($request->imgs as $img) {
+                     foreach ($request->imgs as $key => $img) {
+                         // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
                          $Image = $img;
                          $InterventionImage = Image::make($Image);
                          $Mime = explode('/', $InterventionImage->mime());
 
-                         $ImageName = time().'.'.$Mime[1];
+                         $ImageName = time().$key.'.'.$Mime[1];
                          $Path = 'uploads'.'/TestResults'.'/'.$TestResultObj->id .'/'.$ImageName;
 
                          Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResultObj->id);
@@ -174,7 +159,7 @@ class TestResultController extends Controller
                          $Uploadable = Uploadable::create(['uploadable_id' => $TestResultObj->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
                      }
                  }
-                 ///////////////////////////////////////////////////////////////////////////Image
+                 ///////////////////////////////////////////////////////////////////////////Images
 
             });
         } catch (\Exception $e) {
@@ -193,7 +178,7 @@ class TestResultController extends Controller
 
           if ($input->parent_id != null && $input->parent['type'] == 'Form') {
               //----------------------------------------------------------------------FormType
-              if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
+              if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
                   $input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get();
                   $options = [];
                   foreach ($input_options as $input_option) {
@@ -213,7 +198,7 @@ class TestResultController extends Controller
           }
           else {
               //-----------------------------------------------------------------------Anothertype
-              if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
+              if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
                   $input_options = InputValue::with('option')->where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get();
                   $options = [];
                   foreach ($input_options as $input_option) {
@@ -231,8 +216,12 @@ class TestResultController extends Controller
           }
         }
 
+        $ImagesPath = [];
         if (count($TestResult->TitleImage)) {
-            $TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
+            foreach ($TestResult->TitleImage as $Key => $TitleImage) {
+                $ImagesPath[] = $TitleImage->path;
+            }
+            $TestResult['imagesPath'] = $ImagesPath;
         }
         return \MessageResponse::data($TestResult);
     }
@@ -241,16 +230,25 @@ class TestResultController extends Controller
     {
         foreach ($TestResult->input_values as $key => $value) {
           $input = $value->input;
-          if ($input->type == 'Checkbox' || $input->type == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
+          if ($input->type == 'Checkbox' || $input->type == 'Select' || $input['type'] == 'Radiobutton') {
               $input_options = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $input->id)->get()->pluck('option_id')->toArray();
-              $TestResult[$input->name.'_'.$input->id] = $input_options;
+              if ($input['type'] == 'Radiobutton') {
+                  $TestResult[$input->name.'_'.$input->id] = $input_options[0];
+              }
+              else {
+                  $TestResult[$input->name.'_'.$input->id] = $input_options;
+              }
           }
           else {
               $TestResult[$input->name.'_'.$input->id] = $value->value;
           }
         }
+        $ImagesPath = [];
         if (count($TestResult->TitleImage)) {
-            $TestResult['imagePath'] = $TestResult->TitleImage[0]->path;
+            foreach ($TestResult->TitleImage as $Key => $TitleImage) {
+                $ImagesPath[] = $TitleImage->path;
+            }
+            $TestResult['imagesPath'] = $ImagesPath;
         }
         return \MessageResponse::data($TestResult);
     }
@@ -269,7 +267,7 @@ class TestResultController extends Controller
             // 'autoclave_id' => $request->autoclave_id,
             'cycle_number' => $request->cycle_number,
             'device_id' => $request->device_id,
-            'device_label' => $request->device_label,
+            // 'device_label' => $request->device_label,
             'test_type_id' => $request->test_type_id,
             'result' => $request->result,
             'verified' => 'NotVerified',
@@ -282,19 +280,17 @@ class TestResultController extends Controller
          foreach ($Inputs as $Input) {
              if ($Input['type'] != 'Form') {
                  $Value = $TestResultInfo[$Input->name.'_'.$Input->id];
-
-                 if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
+                 if ($Input['type'] == 'Checkbox' || $Input['type'] == 'Select' || $Input['type'] == 'Radiobutton') {
 
                      $InputOptions = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $Input->id)->get()->each->delete();
 
-                     // $option_array = $Input->options->pluck('id')->toArray();
-                     // foreach ($Value as $Option) {//--1
-                     //    $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option]);
-                     // }
                      foreach ($Input->options as $Option) {//--2
-                       if(in_array($Option->id,$Value)){
+                       if(is_array($Value) && in_array($Option->id,$Value)){
                          $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
                        }
+                       if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
+                          $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $Input->id, 'option_id' => $Option->id]);
+                       }
                      }
                  }
                  else {
@@ -306,16 +302,16 @@ class TestResultController extends Controller
 
                      $Value = $TestResultInfo[$InputChild->name.'_'.$InputChild->id];
 
-                      if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $Input['type'] == 'Radiobutton' || $Input['type'] == 'Range') {
+                      if ($InputChild['type'] == 'Checkbox' || $InputChild['type'] == 'Select' || $InputChild['type'] == 'Radiobutton') {
                           $InputOptions = InputValue::where('test_result_id', $TestResult->id)->where('input_id', $InputChild->id)->get()->each->delete();
 
-                          // foreach ($Value as $Option) {
-                          //    $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option]);
-                          // }
                           foreach ($InputChild->options as $Option) {//--2
-                            if(in_array($Option->id,$Value)){
+                            if(is_array($Value) && in_array($Option->id,$Value)){
                               $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
                             }
+                            if ($Input['type'] == 'Radiobutton' && $Option->id == $Value) {
+                               $InputValueObj = InputValue::create(['test_result_id' => $TestResult->id, 'input_id' => $InputChild->id, 'option_id' => $Option->id]);
+                            }
                           }
                      }
                      else {
@@ -324,42 +320,38 @@ class TestResultController extends Controller
                  }
              }
          }
-         /////////////////////////////////////////////////////////////////////Image
-         $image = '';
-         if (count($TestResult->TitleImage))
-                $image = $TestResult->TitleImage[0];
-
-            if ($request->img != null) {
-
-                $Image = $request->img;
-                $InterventionImage = Image::make($Image);
-                $Mime = explode('/', $InterventionImage->mime());
-
-                $ImageName = time().'.'.$Mime[1];
-                $Path = 'uploads'.'/TestResults'.'/'.$TestResult->id .'/'.$ImageName;
-
-                Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResult->id);
-                $InterventionImage->save(public_path($Path));
-
-
-                if ($image !== ''){
+         /////////////////////////////////////////////////////////////////////Images
+            $images = '';
+            if (count($TestResult->TitleImage))
+            {
+                $images = $TestResult->TitleImage;
+                foreach ($images as $key => $image) {
                     Storage::disk('public')->delete(static::storage_path($image->path));
                     Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $TestResult->id)->where('uploadable_type', get_class($TestResult))->delete();
-
-                    //--------------------------------------------------------
-                    $GalleryObj = Gallery::where('id',  $image->id)->update(['path' => $Path]);
-                    $Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => get_class($TestResult), 'gallery_id' => $image->id, 'image_role' => 'TitleImage']);
-                    //--------------------------------------------------------
-
-                }
-                else {
-                    //--------------------------------------------------------
-                    $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]);
-                    $Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
-                    //--------------------------------------------------------
+                    Gallery::where('id',  $image->id)->delete();
                 }
             }
-            //////////////////////////////////////////////////////////////////Image
+
+            if ($request->imgs != null) {
+               foreach ($request->imgs as $key => $img) {//
+
+                   $Image = $img;
+                   $InterventionImage = Image::make($Image);
+                   $Mime = explode('/', $InterventionImage->mime());
+
+                   $ImageName = time().$key.'.'.$Mime[1];
+                   $Path = 'uploads'.'/TestResults'.'/'.$TestResult->id .'/'.$ImageName;
+
+                   Storage::disk('public')->makeDirectory('TestResults'.'/'.$TestResult->id);
+                   $InterventionImage->save(public_path($Path));
+
+                  //--------------------------------------------------------
+                  $GalleryObj = Gallery::create(['user_id' => auth('api')->user()->id, 'path' => $Path]);
+                  $Uploadable = Uploadable::create(['uploadable_id' => $TestResult->id, 'uploadable_type' => 'App\TestResult', 'gallery_id' => $GalleryObj->id, 'image_role' => 'TitleImage']);
+                  //--------------------------------------------------------
+
+               }//
+            }
 
          return \MessageResponse::success(null,trans('messages.update'));
     }
@@ -369,6 +361,16 @@ class TestResultController extends Controller
         if (!auth('api')->user()->can('delete', $TestResult)) {
           return \MessageResponse::error(trans('messages.access_denied'));
         }
+        if (count($TestResult->input_values)) {
+            InputValue::where('test_result_id', $TestResult->id)->get()->each->delete();
+        }
+        if (count($TestResult->TitleImage)){
+            foreach ($TestResult->TitleImage as $image) {
+                Storage::disk('public')->delete(static::storage_path($image->path));
+                Uploadable::where('gallery_id', $image->id)->where('uploadable_id', $TestResult->id)->where('uploadable_type', get_class($TestResult))->delete();
+                Gallery::where('id',  $image->id)->delete();
+            }
+        }
         $TestResult->delete();
         return \MessageResponse::success(null, trans('messages.success'));
     }
diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php
index 6acda85d..8ae6494a 100644
--- a/app/Http/Controllers/TestTypeController.php
+++ b/app/Http/Controllers/TestTypeController.php
@@ -105,6 +105,7 @@ class TestTypeController extends Controller
                 $TestType = [
                     'name' => $request['name'],
                     'unique_code' => $request['unique_code'],
+                    'device_label' => $request['device_label'],
                     'user_id' => auth('api')->user()->id
                 ];
 
@@ -206,6 +207,7 @@ class TestTypeController extends Controller
             'id' => $TestType->id,
             'name' => $TestType->name,
             'unique_code' => $TestType->unique_code,
+            'device_label' => $TestType->device_label,
             'info' => $Info,
         ];
         return \MessageResponse::data($TestTypeInfo);
@@ -321,6 +323,7 @@ class TestTypeController extends Controller
         $TestTypeData = [
             'name' => $request['name'],
             'unique_code' => $request['unique_code'],
+            'device_label' => $request['device_label'],
         ];
         $TestType->update($TestTypeData);
         $TestTypeInfo = $request['info'];
diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php
index c865334e..ce2e8fdc 100644
--- a/app/Http/Requests/StoreItemRequest.php
+++ b/app/Http/Requests/StoreItemRequest.php
@@ -26,7 +26,8 @@ class StoreItemRequest extends FormRequest
             case 'POST': {
                 return [
                     'name' => 'required|max:100|unique:Items',
-                    'description' => 'required',
+                    'result' => 'required',
+                    // 'description' => 'required',
                 ];
                 break;
             }
@@ -35,7 +36,8 @@ class StoreItemRequest extends FormRequest
                 $Item =  $this->route('Item');
                 return [
                     'name' => 'required|max:100|unique:Items,id,'.$Item->id,
-                    'description' => 'required',
+                    'result' => 'required',
+                    // 'description' => 'required',
                 ];
                 break;
 
diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php
index 71f1908c..3cd165c0 100644
--- a/app/Http/Requests/StorePackageRequest.php
+++ b/app/Http/Requests/StorePackageRequest.php
@@ -27,6 +27,7 @@ class StorePackageRequest extends FormRequest
                 return [
                     'name' => 'required|max:100|unique:packages',
                     'result' => 'required',
+                    'items' => 'required',
                 ];
                 break;
             }
@@ -37,6 +38,7 @@ class StorePackageRequest extends FormRequest
                     'name' => 'required|max:100|unique:packages,id,'.$Package->id,
                     'unique_id' => 'required|max:100|unique:packages,id,'.$Package->id,
                     'result' => 'required',
+                    'items' => 'required',
                 ];
                 break;
 
diff --git a/app/Http/Requests/StoreTestResultRequest.php b/app/Http/Requests/StoreTestResultRequest.php
index 411d0dea..96bf386a 100644
--- a/app/Http/Requests/StoreTestResultRequest.php
+++ b/app/Http/Requests/StoreTestResultRequest.php
@@ -25,14 +25,7 @@ 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',
@@ -43,14 +36,7 @@ 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/app/Http/Requests/StoreTestTypeRequest.php b/app/Http/Requests/StoreTestTypeRequest.php
index 077be206..e81cef3c 100644
--- a/app/Http/Requests/StoreTestTypeRequest.php
+++ b/app/Http/Requests/StoreTestTypeRequest.php
@@ -27,6 +27,7 @@ class StoreTestTypeRequest extends FormRequest
                 return [
                     'name' => 'required|max:100|unique:test_types',
                     'unique_code' => 'required|max:100|unique:test_types',
+                    'device_label' => 'required',
                     'info.*.name'=>'required',
                     'info.*.type'=>'required',
                     'info.*.size'=>'nullable',
@@ -40,6 +41,7 @@ class StoreTestTypeRequest extends FormRequest
                 return [
                     'name' => 'required|max:100|unique:test_types,id,'.$TestType->id,
                     'unique_code' => 'required|max:100|unique:test_types,id,'.$TestType->id,
+                    'device_label' => 'required',
                     'info.*.name'=>'required',
                     'info.*.type'=>'required',
                     'info.*.size'=>'nullable',
diff --git a/app/Item.php b/app/Item.php
index 9a100a5c..2871330e 100644
--- a/app/Item.php
+++ b/app/Item.php
@@ -6,24 +6,13 @@ use Illuminate\Database\Eloquent\Model;
 
 class Item extends Model
 {
-    public $fillable = [];
+    public $fillable = ['name', 'result', 'description', 'user_id'];
     public function packages()
     {
         return $this->belongsToMany('App\Package', 'item_package');
     }
+    public function user()
+    {
+        return $this->belongsTo('App\User');
+    }
 }
-// Schema::create('role_user', function (Blueprint $table) {
-//
-//     $table->integer('user_id')->unsigned();
-//
-//     $table->integer('role_id')->unsigned();
-//
-//     $table->foreign('user_id')->references('id')->on('users')
-//
-//         ->onDelete('cascade');
-//
-//     $table->foreign('role_id')->references('id')->on('roles')
-//
-//         ->onDelete('cascade');
-//
-// });
diff --git a/app/TestResult.php b/app/TestResult.php
index 95ffd385..d4c89e81 100644
--- a/app/TestResult.php
+++ b/app/TestResult.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class TestResult extends Model
 {
-    public $fillable = ['result','verified','autoclave_id','test_type_id','user_id','device_id', 'device_label', 'cycle_number'];
+    public $fillable = ['result','verified','autoclave_id','test_type_id','user_id','device_id', 'cycle_number'];
     public function test_type()
     {
         return $this->belongsTo('App\TestType');
diff --git a/app/TestType.php b/app/TestType.php
index 56b24645..daa50ad8 100644
--- a/app/TestType.php
+++ b/app/TestType.php
@@ -9,7 +9,7 @@ class TestType extends Model
 {
     use SoftDeletes;
 
-    public $fillable = ['name','unique_code','user_id','bar_code'];
+    public $fillable = ['name', 'unique_code', 'user_id', 'bar_code', 'device_label'];
     // protected $softDelete = true;
 
     public function user()
diff --git a/app/User.php b/app/User.php
index 7c7bcc82..7c6f54a9 100644
--- a/app/User.php
+++ b/app/User.php
@@ -69,4 +69,8 @@ class User extends Authenticatable
    {
        return $this->hasMany('App\Package');
    }
+   public function items()
+   {
+       return $this->hasMany('App\Item');
+   }
 }
diff --git a/git b/git
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue
index 15db6bca..4b2ac03c 100644
--- a/resources/js/vue/views/TestResult/AddEdit.vue
+++ b/resources/js/vue/views/TestResult/AddEdit.vue
@@ -46,8 +46,8 @@
                     <v-flex xs12 sm4 md4>
                         <v-text-field
                             name="autoclave"
-                            v-model="formData.device_id"
-                            :label="device_label"
+                            v-model="form.device_id"
+                            :label="form.device_label"
                             color="black"
                             class="pa-2"
                         ></v-text-field>
@@ -249,7 +249,6 @@ export default {
     data: () => ({
         testTypeNames: [],
         searchInput: "",
-        device_label: "WasherID OR AutoclaveID",
         form: [],
         filter: {
             test_result_id: "",
@@ -283,7 +282,6 @@ export default {
             const result = await ApiService.post(urls.getInputs, this.filter);
             if (result && result.status == 200) {
                 this.form = result.data.data.inputs;
-                this.device_label = result.data.data.testType.device_label;
                 this.formData.test_type_id = result.data.data.testType.id;
                 for (const key in result.data.data.inputs) {
                     if (result.data.data.inputs.hasOwnProperty(key)) {
diff --git a/routes/api.php b/routes/api.php
index c7d6b1ba..3d0c6d63 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -47,7 +47,9 @@ Route::middleware('auth:api')->group(function () {
 
     Route::resource('Items', 'ItemController');
     Route::resource('Packages', 'PackageController');
+    Route::resource('Items', 'ItemController');
     Route::resource('Messages', 'MessageController');
     Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages');
     Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage');
+    Route::get('/GetItems', 'ItemController@getItems');
 });