fix promlems

app/Http/Controllers/BarCodeController.php

@@ -11,10 +11,8 @@ class BarCodeController extends Controller
     {
         public function generateBarcode( $Number , $Type = null )
         {
-        if($Number != "undefined")
-        {
+            if ( $Number != "undefined" ) {
                 $URL = 'https://www.cssd-doc.com/Show/' . $Type . '/' . $Number;
-
                 $Barcode = DNS1DFacade::getBarcodePNG( $Number , "C128" );
                 $QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
                 $ShowLink = 'Show/' . $Type . '/' . $Number;
@@ -25,20 +23,20 @@ class BarCodeController extends Controller
                 return \MessageResponse::data( [ 'Barcode' => 'data:image/png;base64,' . $Barcode , 'QRCode' => 'data:image/png;base64,' . $QRCode , 'ShowLink' => $ShowLink ] );
             }
         }
+
         public function generateQRcode( TestResult $TestResult )
         {
-        if($TestResult)
-        {
+            if ( $TestResult ) {
                 $URL = 'https://www.cssd-doc.com/ShowTestResult/' . $TestResult->id;
                 $QRCode = DNS2DFacade::getBarcodePNG( $URL , "QRCODE" );
                 return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
             }
 
         }
+
         public function generatePackageBarcode( $Number )
         {
-        if($Number != "undefined")
-        {
+            if ( $Number != "undefined" ) {
                 // $Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128");
                 // $QRCode  = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE");
                 $Barcode = DNS1DFacade::getBarcodePNG( $Number , "C128" );
@@ -47,6 +45,7 @@ class BarCodeController extends Controller
                 return \MessageResponse::data( [ 'Barcode' => $Barcode , 'QRCode' => $QRCode , 'ShowLink' => 'Show/Package/' . $Package->id ] );
             }
         }
+
         public function generatePackageQRCode( Package $Package )
         {
             $URL = 'https://www.cssd-doc.com/Show/Package/' . $Package->id;

app/Http/Controllers/ItemController.php

@@ -2,10 +2,12 @@
 
     namespace App\Http\Controllers;
 
+    use App\Media;
     use Illuminate\Http\Request;
     use App\Http\Requests\StoreItemRequest;
     use App\Item;
     use App\User;
+    use Illuminate\Support\Facades\Storage;
 
     class ItemController extends Controller
     {
@@ -27,6 +29,9 @@ class ItemController extends Controller
                 ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
                     $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
                 } )
+                ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
+                    $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
+                } )
                 ->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
                     $query->where( 'size' , $request->size );
                 } )
@@ -55,6 +60,7 @@ class ItemController extends Controller
         {
 
         }
+
         public function show( Item $Item )
         {
             $Item->load( [ 'user' => function ( $query ) {
@@ -63,8 +69,18 @@ class ItemController extends Controller
                 'user.medical_center' => function ( $query ) {
                     $query->select( 'id' , 'name' );
                 } ] );
+
+            $FilesPath = [];
+            if ( count( $Item->files ) ) {
+                foreach ( $Item->files as $Key => $File ) {
+                    $FilesPath[] = $File->path;
+                }
+                $Item[ 'filesPath' ] = $FilesPath;
+            }
+
             return \MessageResponse::data( $Item );
         }
+
         public function store( StoreItemRequest $request )
         {
             $ItemData = [
@@ -73,35 +89,63 @@ class ItemController extends Controller
                 'unique_id' => $request->unique_id ,
                 'specific' => $request->specific ,
                 'note' => $request->note ,
+                'udi' => $request->udi ,
                 'user_id' => auth( 'api' )->user()->id ,
             ];
             $ItemObj = Item::create( $ItemData );
 
+            ///////////////////////////////////////////////////////////////////////////Images
+            $Images = Media::whereNull( 'model_id' )->where( 'batch_id' , $request->file_batch_id )->get();
+            if ( $Images ) {
+                foreach ( $Images as $Image ) {
+                    $NewPath = 'media' . '/Items' . '/' . $ItemObj->id . '/' . $Image->file_name;
+                    Storage::disk( 'public' )->makeDirectory( 'Items' . '/' . $ItemObj->id );
+                    if ( \File::exists( public_path( $Image->path ) ) ) {
+                        \File::move( public_path( $Image->path ) , public_path( $NewPath ) );
+                    }
+                    $Image->model_id = $ItemObj->id;
+                    $Image->path = $NewPath;
+                    $Image->save();
+                }
+            }
+            ///////////////////////////////////////////////////////////////////////////Images
+
             return \MessageResponse::success( trans( 'messages.success' ) );
         }
+
         public function edit( Item $Item )
         {
+            if ( count( $Item->files ) ) {
+                foreach ( $Item->files as $Key => $file ) {
+                    $FilesPath[] = $file;
+                }
+                $Item[ 'filesPath' ] = $FilesPath;
+            } else {
+                $Item[ 'filesPath' ] = [];
+            }
             return \MessageResponse::data( $Item );
         }
+
         public function update( StoreItemRequest $request , Item $Item )
         {
             $Item->update( $request->all() );
             return \MessageResponse::success( trans( 'messages.success' ) );
         }
+
         public function destroy( Item $Item )
         {
             if ( ! auth( 'api' )->user()->can( 'delete' , $Item ) ) {
                 return \MessageResponse::error( trans( 'messages.access_denied' ) );
             }
-        if(count($Item->packages))
-        {
+            if ( count( $Item->packages ) ) {
                 $Item->packages()->detach();
             }
             $Item->delete();
             return \MessageResponse::success( trans( 'messages.success' ) );
         }
 
-    public function getItems(){
+        public function getItems()
+        {
 
             $user = auth( 'api' )->user();
 
@@ -137,4 +181,14 @@ class ItemController extends Controller
                 } ] );
             return \MessageResponse::data( $Item );
         }
+
+        public function changeStatus( Item $Item )
+        {
+            if ( auth( 'api' )->user()->cant( 'changeStatus' , Item::class ) ) {
+                return \MessageResponse::error( trans( 'messages.access_denied' ) );
+            }
+            $Item->status = ! $Item->status;
+            $Item->save();
+            return \MessageResponse::data( $Item );
+        }
     }

app/Http/Controllers/PackageController.php

@@ -28,6 +28,9 @@ class PackageController extends Controller
                 ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
                     $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
                 } )
+                ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
+                    $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
+                } )
                 ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
                     $query->where( 'id' , $request->package_id );
                 } )
@@ -50,6 +53,7 @@ class PackageController extends Controller
         {
 
         }
+
         public function show( Package $Package )
         {
             $Package->load( [ 'user' => function ( $query ) {
@@ -61,6 +65,7 @@ class PackageController extends Controller
                 'items' ] );
             return \MessageResponse::data( $Package );
         }
+
         public function store( StorePackageRequest $request )
         {
             // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
@@ -68,6 +73,7 @@ class PackageController extends Controller
                 'name' => $request->name ,
                 'unique_id' => $request->unique_id ,
                 'note' => $request->note ,
+                'udi' => $request->udi ,
                 'user_id' => auth( 'api' )->user()->id ,
                 'verified' => 'NotVerified' ,
             ];
@@ -78,8 +84,7 @@ class PackageController extends Controller
                 if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
                     $preCount = $Items[ $item[ 'id' ] ];
                     $Items[ $item[ 'id' ] ] = $preCount + 1;
-            }
-            else {
+                } else {
                     $Items[ $item[ 'id' ] ] = $count;
                 }
             }
@@ -89,6 +94,7 @@ class PackageController extends Controller
             }
             return \MessageResponse::success( trans( 'messages.success' ) );
         }
+
         public function edit( Package $Package )
         {
             $Items = [];
@@ -102,6 +108,7 @@ class PackageController extends Controller
             $Package->items = $Items;
             return \MessageResponse::data( $Package );
         }
+
         public function update( StorePackageRequest $request , Package $Package )
         {
             $Package->update( $request->except( [ 'items' ] ) );
@@ -111,8 +118,7 @@ class PackageController extends Controller
                 if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
                     $preCount = $Items[ $item[ 'id' ] ];
                     $Items[ $item[ 'id' ] ] = $preCount + 1;
-            }
-            else {
+                } else {
                     $Items[ $item[ 'id' ] ] = $count;
                 }
             }
@@ -125,22 +131,22 @@ class PackageController extends Controller
 
             return \MessageResponse::success( trans( 'messages.success' ) );
         }
+
         public function destroy( Package $Package )
         {
             if ( auth( 'api' )->user()->cant( 'delete' , $Package ) ) {
                 return \MessageResponse::error( trans( 'messages.access_denied' ) );
             }
-        if(count($Package->items))
-        {
+            if ( count( $Package->items ) ) {
                 $Package->items()->detach();
             }
-        if(count($Package->labels))
-        {
+            if ( count( $Package->labels ) ) {
                 $Package->labels()->delete();
             }
             $Package->delete();
             return \MessageResponse::success( trans( 'messages.success' ) );
         }
+
         public function verifyPackage( Package $Package )
         {
             if ( auth( 'api' )->user()->cant( 'verifyPackage' , $Package ) ) {
@@ -178,6 +184,7 @@ class PackageController extends Controller
             return \MessageResponse::data( $Packages );
 
         }
+
         public function showPackage( Package $Package )
         {
             $Package->load( [ 'user' => function ( $query ) {

app/Http/Controllers/TestResultController.php

@@ -2,37 +2,18 @@
 
     namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
     use App\Http\Requests\StoreTestResultRequest;
-use App\TestResult;
-use App\InputValue;
     use App\Input;
-use App\MedicalCenter;
-use App\TestType;
-use App\Gallery;
-use App\Uploadable;
+    use App\InputValue;
     use App\Media;
-use Intervention\Image\ImageManagerStatic as Image;
-use Intervention\Image\ImageManager;
+    use App\MedicalCenter;
+    use App\TestResult;
+    use App\TestType;
+    use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Storage;
 
     class TestResultController extends Controller
     {
-    private function filterByInputs($inputArray){
-        $searchArray = ['Patient ID' => 1111, 'Autoclave ID' => 2222];
-
-        $TestResults = TestResult::query();
-
-        foreach ($inputArray as $key => $value) {
-            $TestResults .= $TestResults->whereHas('input_values', function($query) use($value, $key){
-                $query->whereHas('input', function($query) use($key){
-                    $query->where('name', $key);
-                })->where('value', $value);
-            });
-        }
-        return $query;
-    }
 
         public function index( Request $request )
         {
@@ -40,8 +21,7 @@ class TestResultController extends Controller
 
             if ( $user->hasRole( 'Supervisor|User' ) ) {
                 $medical_center_id = $user->medical_center_id;
-        }
-        elseif($request->has('medicalCenter_id') && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
+            } elseif ( $request->has( 'medicalCenter_id' ) && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
                 $medical_center_id = $request->medicalCenter_id;
             } else {
                 $medical_center_id = null;
@@ -49,16 +29,14 @@ class TestResultController extends Controller
 
             if ( $user->hasRole( 'User' ) ) {
                 $user_name = $user->name;
-        }
-        elseif($request->has('user_name') && $request->user_name) {
+            } elseif ( $request->has( 'user_name' ) && $request->user_name ) {
                 $user_name = $request->user_name;
-        }
-        else {
+            } else {
                 $user_name = null;
             }
 
             $TestResult = TestResult::when( $request->has( 'verified' ) , function ( $query ) use ( $request ) {
-            return $query->where('verified', $request->verified);
+                return $query->where( 'verified' , $request->verified )->orWhere('verified' , "None" );
             } )
                 ->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
                     $from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
@@ -68,21 +46,31 @@ class TestResultController extends Controller
                 ->when( $request->has( 'testType_id' ) && $request->testType_id , function ( $query ) use ( $request ) {
                     $query->where( 'test_type_id' , $request->testType_id );
                 } )
-        ->when($request->has('device_id') && $request->device_id, function($query) use($request){
-            $device_label = $request->device_label ? $request->device_label : '';
-            if ($device_label && $device_label != 'undefined'){
-                $query->whereHas('input_values', function($query) use($request, $device_label){
-                    $query->whereHas('input', function($query) use($request, $device_label){
-                        $query->where('name', $device_label);
+                ->when( ($request->has( 'device_id' ) && $request->device_id) && ($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") , function ( $query ) use ( $request ) {
+                    if ( $request->device_label != 'undefined' ) {
+                        $query->whereHas( 'input_values' , function ( $query ) use ( $request  ) {
+                            $query->whereHas( 'input' , function ( $query ) use ( $request ) {
+                                $query->where( 'name' , $request->device_label );
                             } )->where( 'value' , $request->device_id );
                         } );
-            }
-            else{
+                    } else {
                         $query->where( function ( $query ) use ( $request ) {
                             $query->where( 'id' , $request->device_id );
                         } );
                     }
                 } )
+                ->when( ($request->has( 'device_id' ) && $request->device_id) && !($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") , function ( $query ) use ( $request ) {
+                    $query->where( function ( $query ) use ( $request ) {
+                        $query->where( 'id' , $request->device_id );
+                    } );
+                } )
+                ->when( ($request->has( 'device_label' ) && $request->device_label && $request->device_label != "undefined") && !($request->has( 'device_id' ) && $request->device_id), function ( $query ) use ( $request ) {
+                    $query->whereHas( 'input_values' , function ( $query ) use ( $request ) {
+                        $query->whereHas( 'input' , function ( $query ) use ( $request ) {
+                            $query->where( 'name' , $request->device_label );
+                        } );
+                    } );
+                } )
                 ->when( $user_name , function ( $query ) use ( $user_name ) {
                     $query->whereHas( 'user' , function ( $query ) use ( $user_name ) {
                         $query->where( 'name' , 'LIKE' , '%' . $user_name . '%' );
@@ -162,8 +150,7 @@ class TestResultController extends Controller
                                             $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
                                         }
                                     }
-                             }
-                             else {
+                                } else {
                                     $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResultObj->id , 'input_id' => $InputChild->id , 'value' => $Value ] );
                                 }
 
@@ -215,15 +202,13 @@ class TestResultController extends Controller
 
                         $children[ $input->parent->name ] = $input_values;
                         $TestResult[ 'children' ] = $children;
-              }
-              else {
+                    } else {
 
                         $children[ $input->parent->name ][ $input->name ] = $value->value;
                         $TestResult[ 'children' ] = $children;
                     }
                     //-----------------------------------------------------------------------FormType
-          }
-          else {
+                } else {
                     //-----------------------------------------------------------------------Anothertype
                     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();
@@ -234,8 +219,7 @@ class TestResultController extends Controller
 
                         $values[ $input->name ] = $options;
                         $TestResult[ 'options' ] = $values;
-              }
-              else {
+                    } else {
                         $inputs[ $input->name ] = $value->value;
                         $TestResult[ 'inputs' ] = $inputs;
                     }
@@ -262,12 +246,10 @@ class TestResultController extends Controller
                     $input_options = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $input->id )->get()->pluck( 'option_id' )->toArray();
                     if ( $input[ 'type' ] == 'Radiobutton' ) {
                         $TestResult[ $input->name . '_' . $input->id ] = $input_options[ 0 ];
-              }
-              else {
+                    } else {
                         $TestResult[ $input->name . '_' . $input->id ] = $input_options;
                     }
-          }
-          else {
+                } else {
                     $TestResult[ $input->name . '_' . $input->id ] = $value->value;
                 }
             }
@@ -279,8 +261,7 @@ class TestResultController extends Controller
                     $FilesPath[] = $file;
                 }
                 $TestResult[ 'filesPath' ] = $FilesPath;
-        }
-        else {
+            } else {
                 $TestResult[ 'filesPath' ] = [];
             }
 
@@ -324,12 +305,10 @@ class TestResultController extends Controller
                                 $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $Input->id , 'option_id' => $Option->id ] );
                             }
                         }
-                 }
-                 else {
+                    } else {
                         $InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $Input[ 'id' ] )->update( [ 'value' => $Value ] );
                     }
-             }
-             else {
+                } else {
                     foreach ( $Input->children as $InputChild ) {
 
                         $Value = $TestResultInfo[ $InputChild->name . '_' . $InputChild->id ];
@@ -345,8 +324,7 @@ class TestResultController extends Controller
                                     $InputValueObj = InputValue::create( [ 'test_result_id' => $TestResult->id , 'input_id' => $InputChild->id , 'option_id' => $Option->id ] );
                                 }
                             }
-                     }
-                     else {
+                        } else {
                             $InputValueObj = InputValue::where( 'test_result_id' , $TestResult->id )->where( 'input_id' , $InputChild[ 'id' ] )->update( [ 'value' => $Value ] );
                         }
                     }
@@ -389,8 +367,7 @@ class TestResultController extends Controller
         public function listFilterItems()
         {
             $user = auth( 'api' )->user();
-        $MedicalCenter = MedicalCenter::when(!$user->hasRole('Admin'), function ($query) use ($user)
-        {
+            $MedicalCenter = MedicalCenter::when( ! $user->hasRole( 'Admin' ) , function ( $query ) use ( $user ) {
                 $query->where( 'id' , $user->medical_center_id );
             } )->select( 'name' , 'id' )->get()->toArray();
 
@@ -419,32 +396,26 @@ class TestResultController extends Controller
 
 
             $TestResults = TestResult::
-        when($userId, function ($query) use ($userId)
-        {
+            when( $userId , function ( $query ) use ( $userId ) {
                 $query->where( 'user_id' , $userId );
             } )
-        ->when($medicalCenterId, function ($query) use ($medicalCenterId)
-        {
+                ->when( $medicalCenterId , function ( $query ) use ( $medicalCenterId ) {
                     $query->whereHas( 'user' , function ( $query ) use ( $medicalCenterId ) {
                         $query->where( 'medical_center_id' , $medicalCenterId );
                     } );
                 } )
-        ->when($request->has('testTypeId') && $request->testTypeId, function ($query) use ($request)
-        {
+                ->when( $request->has( 'testTypeId' ) && $request->testTypeId , function ( $query ) use ( $request ) {
                     $query->where( 'test_type_id' , $request->testTypeId );
                 } )
-        ->when($request->has('result') && $request->result, function ($query) use ($request)
-        {
+                ->when( $request->has( 'result' ) && $request->result , function ( $query ) use ( $request ) {
                     $query->where( 'result' , $request->result );
                 } )
-        ->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request)
-        {
+                ->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
                     $from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
                     $upTo = ( $request->upToPicker ) ? date( $request->upToPicker . ' 23:59:59' ) : date( 'Y-m-d' . ' 23:59:59' );
                     return $query->whereBetween( 'created_at' , [ $from , $upTo ] );
                 } )
-        ->when($request->has('verify')  && $request->verify, function ($query) use ($request)
-        {
+                ->when( $request->has( 'verify' ) && $request->verify , function ( $query ) use ( $request ) {
                     $query->where( 'verified' , $request->verify );
                 } )->select( 'result' )->get()->groupBy( 'result' );
             $AcceptCount = ( isset( $TestResults[ 'Accept' ] ) ) ? $TestResults[ 'Accept' ]->count() : 0;
@@ -454,7 +425,6 @@ class TestResultController extends Controller
             return \MessageResponse::data( [ 'labels' => [ 'Number Of Accepted Test Results' , 'Number Of Rejected Test Results' ] , 'data' => [ $AcceptCount , $RejectCount ] ] );
         }
 
-    //--------------------------------------------------------------------------Show
         public function showTestResult( $id )
         {
             $TestResult = TestResult::with( 'input_values' , 'user.medical_center' , 'test_type' )->select( 'result' , 'verified' , 'device_id' , 'user_id' , 'id' , 'test_type_id' , 'created_at' )->findOrFail( $id );
@@ -474,15 +444,13 @@ class TestResultController extends Controller
 
                         $children[ $input->parent->name ] = $input_values;
                         $TestResult[ 'children' ] = $children;
-              }
-              else {
+                    } else {
 
                         $children[ $input->parent->name ][ $input->name ] = $value->value;
                         $TestResult[ 'children' ] = $children;
                     }
                     //-----------------------------------------------------------------------FormType
-          }
-          else {
+                } else {
                     //-----------------------------------------------------------------------Anothertype
                     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();
@@ -493,8 +461,7 @@ class TestResultController extends Controller
 
                         $values[ $input->name ] = $options;
                         $TestResult[ 'options' ] = $values;
-              }
-              else {
+                    } else {
                         $inputs[ $input->name ] = $value->value;
                         $TestResult[ 'inputs' ] = $inputs;
                     }
@@ -513,4 +480,5 @@ class TestResultController extends Controller
             $TestResult[ 'device_label' ] = $TestResult->test_type->device_label;
             return \MessageResponse::data( $TestResult );
         }
+
     }

app/Http/Controllers/TestTypeController.php

@@ -115,7 +115,6 @@ class TestTypeController extends Controller
 
     public function store(StoreTestTypeRequest $request)
     {
-      // dd($request->all());
         try {
             $return_value = \DB::transaction(function () use ($request) {
 
@@ -294,7 +293,6 @@ class TestTypeController extends Controller
     {
         //**********************************
         $InputObject = Input::findOrFail($InputObj['id']);//$InputObj['id'] OR $Input['id']???????
-        // dd($InputObject);
         $DeletedChildIDs = $InputObject->children->pluck('id')->toArray();
         //**********************************
 
@@ -388,6 +386,7 @@ class TestTypeController extends Controller
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
+
     public function getInputs(Request $request)
     {
         if (auth('api')->user()->can('getInputs')) {
@@ -437,11 +436,5 @@ class TestTypeController extends Controller
         $TestType->delete();
         return \MessageResponse::success(trans('messages.success'));
     }
-    // public function allArchivedTestTypes()
-    // {
-    //     $testTypes = TestType::where('deleted_at','<>', null)->get();
-    //     dd($testTypes);
-    //     return \MessageResponse::data($testTypes);
-    // }
 
 }

app/Http/Controllers/UserController.php

@@ -1,19 +1,13 @@
 <?php
 
-
-
 namespace App\Http\Controllers;
 
-
-
 use Illuminate\Http\Request;
-
 use App\Http\Requests\StoreUserRequest;
 use App\MedicalCenter;
 use App\User;
 use App\Message;
 
-
 class UserController extends Controller
 {
 
@@ -159,6 +153,7 @@ class UserController extends Controller
         $user->load('medical_center');
         return \MessageResponse::data([ 'user' => $user, 'roles' => auth('api')->user()->getRoleNames() ]);
     }
+
     public function getMessages()
     {
         $User = auth('api')->user();
@@ -169,6 +164,7 @@ class UserController extends Controller
 
         return \MessageResponse::data(['ReceivedMessages' => $ReceivedMessages, 'SentMessages' => $SentMessages]);
     }
+
     public function searchUser(Request $request)
     {
         // if (auth('api')->user()->cant('searchUser', User::class)) {
@@ -196,5 +192,4 @@ class UserController extends Controller
         return \MessageResponse::data($users);
     }
 
-
 }

app/Http/Requests/StoreItemRequest.php

@@ -30,6 +30,7 @@ class StoreItemRequest extends FormRequest
                     'size' => 'required',
                     'specific' => 'required',
                     'note' => 'nullable',
+                    'udi' => 'required|max:100|unique:items',
                 ];
                 break;
             }
@@ -42,9 +43,9 @@ class StoreItemRequest extends FormRequest
                     'size' => 'required',
                     'specific' => 'required',
                     'note' => 'nullable',
+                    'udi' => 'required|max:100|unique:items,udi,'.$Item->id,
                 ];
                 break;
-
             }
             default:
                 break;

app/Http/Requests/StorePackageRequest.php

@@ -29,6 +29,7 @@ class StorePackageRequest extends FormRequest
                     'unique_id' => 'nullable|max:250|unique:packages',
                     'note' => 'nullable',
                     'items' => 'required',
+                    'udi' => 'required|max:100|unique:packages',
                 ];
                 break;
             }
@@ -40,6 +41,7 @@ class StorePackageRequest extends FormRequest
                     'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
                     'note' => 'nullable',
                     'items' => 'required',
+                    'udi' => 'required|max:100|unique:packages',
                 ];
                 break;
 

app/Item.php

@@ -6,13 +6,20 @@ use Illuminate\Database\Eloquent\Model;
 
     class Item extends Model
     {
-    public $fillable = ['name', 'size', 'unique_id', 'specific', 'note', 'user_id'];
+        public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' ];
+
         public function packages()
         {
             return $this->belongsToMany( 'App\Package' , 'item_package' )->withPivot( 'count' );
         }
+
         public function user()
         {
             return $this->belongsTo( 'App\User' );
         }
+
+        public function files()
+        {
+            return $this->morphMany( 'App\Media' , 'model' );
+        }
     }

app/Package.php

@@ -6,19 +6,18 @@ use Illuminate\Database\Eloquent\Model;
 
     class Package extends Model
     {
-    public $fillable = ['name', 'unique_id', 'user_id', 'note', 'verified'];
+        public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'udi' ];
+
         public function user()
         {
             return $this->belongsTo( 'App\User' );
         }
+
         public function items()
         {
             return $this->belongsToMany( 'App\Item' , 'item_package' )->withPivot( 'count' );
         }
-    // public function packs()
-    // {
-    //     return $this->belongsToMany('App\Pack', 'pack_package');
-    // }
+
         public function labels()
         {
             return $this->hasMany( 'App\Label' );

app/Policies/ItemPolicy.php

@@ -31,4 +31,9 @@ class ItemPolicy
             return true;
     }
 
+    public function changeStatus(User $User)
+    {
+        if($User->hasRole('Admin|Supervisor'))
+            return true;
+    }
 }