Merge branch 'master' of http://git.swisslink.com.my/SwissLink/sipadu_mbip

app/Http/Controllers/Api/CompoundResourceController.php

     public function index(Request $request)
     {
 
-        $per_page = '';
-        $kpd = '';
+        // $per_page = '';
+        // $kpd = '';
 
-        $modul = 'All';
-        $status = 'All';
-        $jenis = 'Pelbagai_JPB';
-        if(!empty($request->department)){
-            $department = ["5df721c5cde7fd741433c6b2","5d957899f3da686c08192026","5d9d4a699b802d5a31031a8a","5d9d4db1aa95fa07f7245e28","5d9d5955eb4f92300927f188","5d9e965fec0023467756a02a","5d9eba38e4be2267877896a8"];
-        }else {
-            $department = [];
-        }
-        $start_date = '2020-07-18';
-        $end_date = '2020-08-14';
+        // $modul = 'All';
+        // $status = 'All';
+        // $jenis = 'Pelbagai_JPB';
+        // if(!empty($request->department)){
+        //     $department = ["5df721c5cde7fd741433c6b2","5d957899f3da686c08192026","5d9d4a699b802d5a31031a8a","5d9d4db1aa95fa07f7245e28","5d9d5955eb4f92300927f188","5d9e965fec0023467756a02a","5d9eba38e4be2267877896a8"];
+        // }else {
+        //     $department = [];
+        // }
+        // $start_date = '2020-07-18';
+        // $end_date = '2020-08-14';
 
-        $enforcer = 'All';
-        $faulty = 'All';
+        // $enforcer = 'All';
+        // $faulty = 'All';
 
-        $plate_no = strtolower('');
-        $company_no = strtolower('');
-        $nric = '';
-        $license = '';
-        $namaP = '';
-        $company_name = '';
+        // $plate_no = strtolower('');
+        // $company_no = strtolower('');
+        // $nric = '';
+        // $license = '';
+        // $namaP = '';
+        // $company_name = '';
 
         /////////////////////////////////////////////////////////////////////////////////        
 
-        // $per_page = $request->per_page;
-        // $kpd = $request->kpd;
+        $per_page = $request->per_page;
+        $kpd = $request->kpd;
 
-        // $modul = $request->modul;
-        // $status = $request->status;
-        // $jenis = $request->type;
-        // if(!empty($request->department)){
-        //     $department = json_decode($request->department);
-        // }else {
-        //     $department = [];
-        // }
-        // $start_date = $request->start_date;
-        // $end_date = $request->end_date;
-
-        // $enforcer = $request->enforcer;
-        // $faulty = $request->faulty;
-
-        // $plate_no = strtolower($request->plate_no);
-        // $company_no = strtolower($request->company_no);
-        // $nric = $request->nric;
-        // $license = $request->license;
-        // $namaP = $request->nameP;
-        // $company_name = $request->company_name;
+        $modul = $request->modul;
+        $status = $request->status;
+        $jenis = $request->type;
+        if(!empty($request->department)){
+            $department = json_decode($request->department);
+        }else {
+            $department = [];
+        }
+        $start_date = $request->start_date;
+        $end_date = $request->end_date;
+
+        $enforcer = $request->enforcer;
+        $faulty = $request->faulty;
+
+        $plate_no = strtolower($request->plate_no);
+        $company_no = strtolower($request->company_no);
+        $nric = $request->nric;
+        $license = $request->license;
+        $namaP = $request->nameP;
+        $company_name = $request->company_name;
 
         $nested_data = array();