change pack to label

app/Http/Controllers/LabelController.php

@@ -3,14 +3,15 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Http\Requests\StorePackRequest;
-use App\Pack;
+use App\Http\Requests\StoreLabelRequest;
+use App\Label;
+use App\Package;
 
-class PackController extends Controller
+class LabelController extends Controller
 {
     public function index(Request $request)
     {
-        $Packs = Pack::when($request->has('name') && $request->name != '', function($query) use($request){
+        $Labels = Label::when($request->has('name') && $request->name != '', function($query) use($request){
             $query->where('name', 'LIKE', '%'.$request->name.'%');
         })
         ->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -31,20 +32,20 @@ class PackController extends Controller
             });
         })
         ->with('user', 'user.medical_center')->paginate(10);
-        return \MessageResponse::data($Packs);
+        return \MessageResponse::data($Labels);
     }
     public function create()
     {
 
     }
-    public function show(Pack $Pack)
+    public function show(Label $Label)
     {
-        $Pack->load('user', 'packages', 'user.medical_center');
-        return \MessageResponse::data($Pack);
+        $Label->load('user', 'packages', 'user.medical_center');
+        return \MessageResponse::data($Label);
     }
-    public function store(StorePackRequest $request)
+    public function store(StoreLabelRequest $request)
     {
-        $PackData = [
+        $LabelData = [
           'name' => $request->name,
           'sterile_date' => $request->sterile_date,
           'expire_date' => $request->expire_date,
@@ -55,44 +56,48 @@ class PackController extends Controller
           'note' => $request->note,
           'user_id' => auth('api')->user()->id,
         ];
-        $PackObj = Pack::create($PackData);
-        $PackObj->packages()->attach($request->packages);
+        $LabelObj = Label::create($LabelData);
+        Package::find($request->package_id)->update(['label_id' => $Label->id]);
         return \MessageResponse::success(trans('messages.success'));
     }
-    public function edit(Pack $Pack)
+    public function edit(Label $Label)
     {
-        $Packages = $Pack->packages->pluck('id')->toArray();
-        unset($Pack->packages);
-        $Pack->packages = $Packages;
-        return \MessageResponse::data($Pack);
+        $Label->load('package');
+        dd($Label);
+        // $Packages = $Label->packages->pluck('id')->toArray();
+        // unset($Label->packages);
+        // $Label->package_id = $Label->package->id;
+        return \MessageResponse::data($Label);
     }
 
-    public function update(StorePackRequest $request, Pack $Pack)
+    public function update(Request $request, Label $Label)
     {
-        $Pack->update($request->except(['packages']));
-        $Pack->packages()->sync($request->packages);
+        $Label->update($request->except(['package_id']));
+        Package::find($request->package_id)->update(['label_id' => $Label->id]);
+        // $Label->package()->save($request->package_id);
+        // $Label->packages()->sync($request->packages);
         return \MessageResponse::success(trans('messages.success'));
     }
-    public function destroy(Pack $Pack)
+    public function destroy(Label $Label)
     {
-        if (auth('api')->user()->cant('delete', $Pack)) {
+        if (auth('api')->user()->cant('delete', $Label)) {
             return \MessageResponse::error(trans('messages.access_denied'));
         }
-        if(count($Pack->packages))
+        if(count($Label->packages))
         {
-            $Pack->packages()->detach();
+            $Label->packages()->detach();
         }
-        if(count($Pack->cycles))
+        if(count($Label->cycles))
         {
-            $Pack->cycles()->detach();
+            $Label->cycles()->detach();
         }
-        $Pack->delete();
+        $Label->delete();
         return \MessageResponse::success(trans('messages.success'));
     }
-    public function getPacks()
+    public function getLabels()
     {
-        $Packs = Pack::with('user')->get();
-        return \MessageResponse::data($Packs);
+        $Labels = Label::with('user')->get();
+        return \MessageResponse::data($Labels);
     }
 
 }

app/Http/Controllers/PackageController.php

@@ -39,20 +39,73 @@ class PackageController extends Controller
           'verified' => 'NotVerified',
         ];
         $PackageObj = Package::create($PackageData);
+        $Items = [];
+        $count = 1;
+        foreach ($request->items as $key => $item) {
+            if (array_key_exists($item['id'], $Items)) {
+                $preCount = $Items[$item['id']];
+                $Items[$item['id']] =  $preCount + 1;
+            }
+            else {
+                $Items[$item['id']] = $count;
+            }
+        }
+        foreach ($Items as $Item => $Count) {
+             $Package->items()->attach(array($Item), ['count' => $Count]);
+        }
         $PackageObj->items()->attach($request->items);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function edit(Package $Package)
     {
-        $Items = $Package->items->pluck('id')->toArray();
+        $Items = [];
+        $Package->load('items');
+        // dd($Package);
+        foreach ($Package->items as $item) {
+            for ($i=0; $i < $item->pivot->count ; $i++) {
+                $Items[] =  (object) array('id' => $item->id, 'name' => $item->name);
+            }
+        }
         unset($Package->items);
         $Package->items = $Items;
         return \MessageResponse::data($Package);
     }
     public function update(StorePackageRequest $request, Package $Package)
     {
+        // dd($request->items);
         $Package->update($request->except(['items']));
-        $Package->items()->sync($request->items);
+        $Items = [];
+        $count = 1;
+        foreach ($request->items as $key => $item) {
+            // dump(in_array($item['id'], array_column($Items, 'id')));
+            // if (in_array($item['id'], array_column($Items, 'id'))) {
+            //     $index = array_search($item['id'], array_column($Items));
+            //     dump(array_search($item['id'], $Items));
+            //     $Items[$index]['count'] += 1;
+            //     // dump($Items);
+            // }
+            // else {
+            //     $Item1 = ['id' => $item['id'], 'count' => $count];
+            //     $Items[] = $Item1;
+            // }
+
+            if (array_key_exists($item['id'], $Items)) {
+                $preCount = $Items[$item['id']];
+                $Items[$item['id']] =  $preCount + 1;
+            }
+            else {
+                $Items[$item['id']] = $count;
+            }
+        }
+        // dd($Items);
+        $Package->items()->detach();
+        // foreach ($Items as $Item) {
+        //      $Package->items()->attach(array($Item['id']), ['count' => $Item['count']]);
+        // }
+        foreach ($Items as $Item => $Count) {
+             $Package->items()->attach(array($Item), ['count' => $Count]);
+        }
+        // $Package->items()->sync($request->items);
         return \MessageResponse::success(trans('messages.success'));
     }
     public function destroy(Package $Package)

app/Http/Controllers/TestResultController.php

@@ -41,12 +41,10 @@ class TestResultController extends Controller
         }
 
         $TestResult = TestResult::with('test_type', 'user', 'user.medical_center')
-        ->when($request->has('verified'), function ($query) use ($request)
-        {
+        ->when($request->has('verified'), function ($query) use ($request){
             return $query->where('verified', $request->verified);
         })
-        ->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]);