update cssd

app/Cycle.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Cycle extends Model
 {
-    public $fillable = ['name', 'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified'];
+    public $fillable = ['name', 'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id'];
     public function user()
     {
         return $this->belongsTo('App\User');

app/Http/Controllers/BarCodeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use \Milon\Barcode\DNS1D;
 use \Milon\Barcode\DNS2D;
 use App\TestResult;
+use App\Package;
 
 class BarCodeController extends Controller
 {
@@ -17,7 +18,6 @@ class BarCodeController extends Controller
             $QRCode  = DNS2D::getBarcodePNG($Number, "QRCODE");
             return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode]);
         }
-
     }
     public function generateQRcode(TestResult $TestResult)
     {
@@ -29,4 +29,14 @@ class BarCodeController extends Controller
         }
 
     }
+    public function generatePackageBarcode($Number)
+    {
+        if($Number != "undefined")
+        {
+            $Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
+            $QRCode  = DNS2D::getBarcodePNGUri($Number, "QRCODE");
+            Package::where('unique_id', $Number)->update(['bar_code' => $Barcode, 'qr_code' => $QRCode]);
+            return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
+        }
+    }
 }

app/Http/Controllers/CycleController.php

@@ -36,8 +36,10 @@ class CycleController extends Controller
     }
     public function store(StoreCycleRequest $request)
     {
+        $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
         $CycleData = [
           'name' => $request->name,
+          'unique_id' => $UniqueID,
           'date' => $request->date,
           'sterilizer_id' => $request->sterilizer_id,
           'cycle_number' => $request->cycle_number,

app/Http/Controllers/ItemController.php

@@ -23,6 +23,7 @@ class ItemController extends Controller
         ->when($request->has('specific') && $request->specific != '', function($query) use($request){
             $query->where('specific', $request->specific);
         })
+        ->where('user_id', auth('api')->user()->id)
         ->paginate(10);
         return \MessageResponse::data($Items);
     }

app/Http/Controllers/TestTypeController.php

@@ -410,6 +410,9 @@ class TestTypeController extends Controller
         if (!auth('api')->user()->can('delete', $TestType)) {
             return \MessageResponse::error(trans('messages.access_denied'));
         }
+        $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
+        $TestType->unique_code = $TestType->unique_code.'--'.$UniqueID;
+        $TestType->save();
         $TestType->delete();
         return \MessageResponse::success(trans('messages.success'));
     }

app/Http/Requests/StoreTestTypeRequest.php

@@ -26,13 +26,20 @@ class StoreTestTypeRequest extends FormRequest
             case 'POST': {
                 return [
                     'name' => 'required|max:100|unique:test_types',
-                    'unique_code' => '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',
                     'info.*.parent_id'=>'nullable|numeric|exists:inputs,id',
                 ];
+                // $rules['unique_code'] = [
+                //     'required',
+                //     Rule::unique('test_types')->where(function ($query) use ($request) {
+                //         return $query->whereNotNull('deleted_at');
+                //     })
+                // ];
+                // return $rules;
                 break;
             }
             case 'PUT':