From 959bbc0b2cde9375da6041662d64e075cab3be9e Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sun, 17 Apr 2022 10:33:54 +0800
Subject: [PATCH 1/5] update structure 1033

---
 app/Http/Controllers/MarhunController.php                       | 1 +
 app/Http/Controllers/SimulasiController.php                     | 2 +-
 .../migrations/2021_12_13_053311_create_cawangans_table.php     | 1 +
 .../migrations/2021_12_14_041545_create_simulasis_table.php     | 2 +-
 database/migrations/2021_12_14_041557_create_lelongs_table.php  | 2 +-
 resources/views/simulasi/showsimulasi.blade.php                 | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 7daf548b..b94b0c9c 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -514,6 +514,7 @@ class MarhunController extends Controller
     public function terimaperubahan(Request $request)
     {
         //update mutu marhun - gadaimarhun
+        // dd($request->all());
         $user =  Auth::user();
 
         $currentdate = Carbon::now();
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 83250fde..6aa495e6 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -319,7 +319,7 @@ class SimulasiController extends Controller
         foreach($cawangansim as $cawsim)
         {
             $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first();
-            $databid = SimulasiBid::where('simulasi_id','=',$simulasi_id)->get();
+            $databid = SimulasiBid::where('caw_id','=',$cawsim->caw_id)->where('simulasi_id','=',$simulasi_id)->get();
             
             $packet = 0;
             $berat = 0;
diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php
index 0e58b8c6..e0fb2e7f 100644
--- a/database/migrations/2021_12_13_053311_create_cawangans_table.php
+++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php
@@ -30,6 +30,7 @@ class CreateCawangansTable extends Migration
             $table->string('nofaks')->nullable(); 
             $table->string('lokasi')->nullable(); 
             $table->string('pkb_jmc')->nullable(); 
+            $table->string('para2')->nullable();
             $table->timestamps();
         });
 
diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php
index dc3f202e..507b2546 100644
--- a/database/migrations/2021_12_14_041545_create_simulasis_table.php
+++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php
@@ -64,7 +64,7 @@ class CreateSimulasisTable extends Migration
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
             $table->decimal('pinjaman', $precision = 9, $scale = 2);
             $table->decimal('bakiupah', $precision = 7, $scale = 2);
-            $table->decimal('cajlain', $precision = 7, $scale = 2);
+            $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
             $table->decimal('cajlelong', $precision = 7, $scale = 2);
             $table->decimal('baki', $precision = 9, $scale = 2);
             $table->decimal('berat', $precision = 7, $scale = 2);
diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php
index 146f6470..3900d97d 100644
--- a/database/migrations/2021_12_14_041557_create_lelongs_table.php
+++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php
@@ -67,7 +67,7 @@ class CreateLelongsTable extends Migration
             $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
             $table->decimal('pinjaman', $precision = 9, $scale = 2);
             $table->decimal('bakiupah', $precision = 7, $scale = 2);
-            $table->decimal('cajlain', $precision = 7, $scale = 2);
+            $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
             $table->decimal('cajlelong', $precision = 7, $scale = 2);
             $table->decimal('baki', $precision = 9, $scale = 2);
             $table->decimal('berat', $precision = 7, $scale = 2);
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 2809c818..c2d5683b 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -340,7 +340,7 @@
             "orderable": false
             }
         ],
-        order: [[1, 'asc']],
+        order: [[0, 'asc']],
         // "ordering": false,
         "searching":false,
         "info": false,

From 618392f4312f48c9e1233806af85a9c36f8240ab Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sun, 17 Apr 2022 13:08:25 +0800
Subject: [PATCH 2/5] update 0108

---
 database/seeders/KaratSeeder.php              | 20 +++++++++----------
 database/seeders/RolesSeeder.php              |  2 ++
 .../views/lelong/senaraimarhun.blade.php      |  2 +-
 resources/views/pdf/marhundetails.blade.php   | 17 ----------------
 .../views/simulasi/senaraimarhunlel.blade.php |  2 +-
 .../views/simulasi/senaraisimulasi.blade.php  |  2 +-
 6 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/database/seeders/KaratSeeder.php b/database/seeders/KaratSeeder.php
index ce150d70..92cf0b09 100644
--- a/database/seeders/KaratSeeder.php
+++ b/database/seeders/KaratSeeder.php
@@ -17,19 +17,19 @@ class KaratSeeder extends Seeder
         JenisKarat::create([
             'karat' => '24.0Kgb',
             'keterangan' => '999.00 Gold Bar',
-            'dariharga916' => 35
+            'dariharga916' => 12.86
         ]);
 
         JenisKarat::create([
             'karat' => '24.0K',
             'keterangan' => '999.00',
-            'dariharga916' => 30
+            'dariharga916' => 11.02
         ]);
 
         JenisKarat::create([
             'karat' => '23.0K',
             'keterangan' => '950.00',
-            'dariharga916' => 3
+            'dariharga916' => 1.10
         ]);
 
         JenisKarat::create([
@@ -41,43 +41,43 @@ class KaratSeeder extends Seeder
         JenisKarat::create([
             'karat' => '21.0K',
             'keterangan' => '900.00',
-            'dariharga916' => -25
+            'dariharga916' => -9.20
         ]);
 
         JenisKarat::create([
             'karat' => '20.0K',
             'keterangan' => '835.00',
-            'dariharga916' => -60
+            'dariharga916' => -22.06
         ]);
 
         JenisKarat::create([
             'karat' => '18.0Kp',
             'keterangan' => '750.00 putih',
-            'dariharga916' => -125
+            'dariharga916' => -45.96
         ]);
 
         JenisKarat::create([
             'karat' => '18.0K',
             'keterangan' => '750.00',
-            'dariharga916' => -125
+            'dariharga916' => -45.96
         ]);
 
         JenisKarat::create([
             'karat' => '14.0Kp',
             'keterangan' => '585.00 putih',
-            'dariharga916' => -252
+            'dariharga916' => -92.65
         ]);
 
         JenisKarat::create([
             'karat' => '14.0K',
             'keterangan' => '585.00',
-            'dariharga916' => -252
+            'dariharga916' => -92.65
         ]);
 
         JenisKarat::create([
             'karat' => '9.0K',
             'keterangan' => '375.00',
-            'dariharga916' => -380
+            'dariharga916' => -139.71
         ]);
 
         
diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php
index cc004140..09d9ee98 100644
--- a/database/seeders/RolesSeeder.php
+++ b/database/seeders/RolesSeeder.php
@@ -115,6 +115,7 @@ class RolesSeeder extends Seeder
             'name' => 'notistamatkontrak',
             'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
         ]);
+        
 
         //account
         Permission::create([
@@ -168,6 +169,7 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('pengesahanpembida');
         $role6->givePermissionTo('pengesahan');
         $role6->givePermissionTo('notistamatkontrak');
+        $role6->givePermissionTo('kemaskinihargaasas');
 
         $role7 = Role::create(['name' => 'account']);
         $role7->givePermissionTo('pengesahanbayaran');
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 2354b4b1..7188949c 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -141,7 +141,7 @@
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 25,
+            "pageLength": 100000000,
             dom: 'Bfrtip',
             // buttons: [
             //     // 'copy', 'excel', 'pdf'
diff --git a/resources/views/pdf/marhundetails.blade.php b/resources/views/pdf/marhundetails.blade.php
index c39ca0c6..eb98d394 100644
--- a/resources/views/pdf/marhundetails.blade.php
+++ b/resources/views/pdf/marhundetails.blade.php
@@ -154,20 +154,3 @@ tr:nth-child(even) {
                       
                     
 </tbody>
-
-@foreach ($laporanpembida as $laporan)
-<tr>
-    <td>{{ $loop->iteration }} </td>
-    <td>{{ $laporan['norujukan'] }}</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['nilaimarhun'] }}<br>
-    @endforeach</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['nama_bidder'] }}<br>
-    @endforeach</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['hargabida'] }}<br>
-    @endforeach</td>  
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['masa_bidaan'] }}<br>
-    @endforeach</td>   
\ No newline at end of file
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index 11d0c7f6..f9d92378 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -141,7 +141,7 @@
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 25,
+            "pageLength": 10000000,
             dom: 'Bfrtip',
             // buttons: [
             //     // 'copy', 'excel', 'pdf'
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 766e38a4..034d2a2f 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -17,7 +17,7 @@
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
                             <th>Tarikh Lelong</th>
-                            <th>Harga Emas Asas</th>
+                            <th>Cawangan</th>
                             <th>JBG</th>
                             <th>Caj Lelong</th>
                             <th class="text-center">Action</th>

From 60bb9e1422b27837b7de736cd3a253910721e810 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Sun, 17 Apr 2022 14:03:18 +0800
Subject: [PATCH 3/5] update error

---
 resources/views/pdf/marhundetails.blade.php | 22 ++-------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/resources/views/pdf/marhundetails.blade.php b/resources/views/pdf/marhundetails.blade.php
index c39ca0c6..e98d48ba 100644
--- a/resources/views/pdf/marhundetails.blade.php
+++ b/resources/views/pdf/marhundetails.blade.php
@@ -148,26 +148,8 @@ tr:nth-child(even) {
                         </tr>                                         
       @endforeach
                       </table> 
-
-
-               
-                      
+              
+                                
                     
 </tbody>
 
-@foreach ($laporanpembida as $laporan)
-<tr>
-    <td>{{ $loop->iteration }} </td>
-    <td>{{ $laporan['norujukan'] }}</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['nilaimarhun'] }}<br>
-    @endforeach</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['nama_bidder'] }}<br>
-    @endforeach</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['hargabida'] }}<br>
-    @endforeach</td>  
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['masa_bidaan'] }}<br>
-    @endforeach</td>   
\ No newline at end of file

From edd631a748fe0de4a9915f1cc3221266a9469115 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Sun, 17 Apr 2022 14:16:07 +0800
Subject: [PATCH 4/5] barang lelong details

---
 app/Http/Controllers/LelongController.php  | 4 ++++
 app/Http/Controllers/MarhunController.php  | 3 ++-
 resources/views/includes/sidebar.blade.php | 5 +++++
 routes/web.php                             | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index b4bf37ac..4ddcd66e 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -900,6 +900,10 @@ class LelongController extends Controller
 
     }
 
+    public function lapbrglelongdetailsindex (Request $request){
+        // dd('hiio');
+    }
+
     public function lapbidaanpembidaindex (Request $request){
 
 
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index ae7ff913..966404d7 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -338,7 +338,8 @@ class MarhunController extends Controller
         
     public function exportmarhundetails($lelong_id)
     {
-        $lelongs= LelongBid::where('lelong_id','=',$lelong_id)->get()->toArray();
+        $lelongs= LelongBid::where('lelong_id','=',$lelong_id)
+        ->get()->toArray();
 
         $arraycaw= [];
 
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index e229caa0..c2fc6fb1 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -157,6 +157,11 @@
             <a href="{{url('lelong/lapbrglelongindex')}}">Barang Lelong</a>
           </li>
         </ul>
+        <ul class="list-unstyled collapse {{ (request()->is('lelong/*')) ? 'show' : '' }}" id="laporanSubmenu" >
+          <li class="{{ (request()->is('lelong/lapbrglelongdetailsindex/*') || request()->is('lelong/lapbrglelongdetailsindex') ) ? 'active' : '' }}">
+            <a href="{{url('lelong/lapbrglelongdetailsindex')}}">Barang Lelong Details</a>
+          </li>
+        </ul>
         <ul class="list-unstyled collapse {{ (request()->is('lelong/*')) ? 'show' : '' }}" id="laporanSubmenu" >
           <li class="{{ (request()->is('lelong/lapbidaanpembidaindex/*') || request()->is('lelong/lapbidaanpembidaindex') ) ? 'active' : '' }}">
             <a href="{{url('lelong/lapbidaanpembidaindex')}}">Nama Pembida</a>
diff --git a/routes/web.php b/routes/web.php
index ece6b341..5b5d0fed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -109,6 +109,8 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']);
     Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']);    
 
+    Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']);
+
     Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']);
     Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']);
     Route::post('/pdfsenarailapbidaan',['as' =>'lelong.pdfsenarailapbidaan','uses'=>'LelongController@pdfsenarailapbidaan']);

From abd557bb9119fc6f514fa7120a84ea2f33cd0af5 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Mon, 18 Apr 2022 14:45:56 +0800
Subject: [PATCH 5/5] update index simulasi,  lelong by caw_name

---
 app/Http/Controllers/LelongController.php     | 81 +++++++++++++++----
 app/Http/Controllers/SimulasiController.php   | 23 +++++-
 ...21_12_13_053311_create_cawangans_table.php |  2 +-
 ..._27_052051_add_para2_to_cawangan_table.php |  4 +-
 .../views/lelong/laporanlelong.blade.php      | 26 +++---
 .../views/lelong/senaraibrglelong.blade.php   | 16 ++--
 .../views/lelong/senarailelong.blade.php      | 58 +++++++------
 .../views/simulasi/senaraisimulasi.blade.php  | 34 ++++----
 8 files changed, 167 insertions(+), 77 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 4ddcd66e..59d46330 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -51,16 +51,34 @@ class LelongController extends Controller
      */
     public function index()
     {
-        $lelong = Lelong::all();
+        // $lelong = Lelong::all();
         
-        foreach($lelong as $lel)
+        // foreach($lelong as $lel)
+        // {
+        //     $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
+        //     ->where('lelong_id', $lel['id'])
+        //     ->get()->toArray();
+        // }
+        $arrayinfo = [];
+
+        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
+
+        foreach($lelong as $info)
         {
-            $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
-            ->where('lelong_id', $lel['id'])
-            ->get()->toArray();
+
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$info['lelong_id'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
+
         }
 
-        return view('lelong.senarailelong',compact('lelong', 'caw_lelong'));
+        return view('lelong.senarailelong',compact('lelong', 'arrayinfo'));
     }
 
     public function show($id)
@@ -810,22 +828,49 @@ class LelongController extends Controller
 
     public function lapbrglelongindex (Request $request){
 
-        // $user =  Auth::user();
-        
-        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-        // ->where('cawangan.caw_code','=',$user->kodcaw)
-        ->get();
+        $arraydetails = [];       
 
-        return view('lelong.laporanlelong',compact('lelongid'));
+        $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('lelong_id','tarikh_lelong')
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
+
+        foreach($laporanpembida as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])    
+            ->get()
+            ->toArray();
+            array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
+        }
+
+       return view('lelong.laporanlelong', compact('arraydetails'));
     }
 
     public function senaraibrglelong($lelong_id){
 
-        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+      
+
+        $arraydetails = [];
+        $arrayinfo = [];
+
+
+        $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
-        ->get();
+        ->select('lelong_id','tarikh_lelong')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+        foreach($lelongid as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+
 
         $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
         ->where('lelongbid.lelong_id', $lelong_id)
@@ -853,7 +898,7 @@ class LelongController extends Controller
 
   
 
-        return view('lelong.senaraibrglelong',compact('lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman'));
+        return view('lelong.senaraibrglelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman'));
 
     }
 
@@ -911,6 +956,7 @@ class LelongController extends Controller
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->get();
+        
 
         return view('lelong.laporanbidaanindex',compact('lelongid'));
     }
@@ -925,6 +971,7 @@ class LelongController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
         ->get();
+        
 
         $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->select('lelongbid_id','norujukan','hargaasas')
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 6aa495e6..81ad2daf 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -277,9 +277,28 @@ class SimulasiController extends Controller
 
     public function senaraisimulasi()
     {   
-        $simulasi = Simulasi::all();
+        // $simulasi = Simulasi::all();
 
-        return view('simulasi.senaraisimulasi',compact('simulasi'));
+        $arrayinfo = [];
+
+        $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
+        ->select('simulasi_id','tarikh_lelong')
+        ->groupBy('simulasi_id')
+        ->get()
+        ->toArray();
+
+        foreach($simulasi as $info)
+        {
+            $detailsinfo = CawanganSimulasi::join('cawangan','cawangan_simulasi.caw_id','=','cawangan.id')
+            ->where('simulasi_id',$info['simulasi_id'])
+            ->get()
+            ->toArray();
+
+            array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]);
+
+        }
+
+        return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo'));
     }
 
     public function show($id)
diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php
index e0fb2e7f..08b9e31f 100644
--- a/database/migrations/2021_12_13_053311_create_cawangans_table.php
+++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php
@@ -30,7 +30,7 @@ class CreateCawangansTable extends Migration
             $table->string('nofaks')->nullable(); 
             $table->string('lokasi')->nullable(); 
             $table->string('pkb_jmc')->nullable(); 
-            $table->string('para2')->nullable();
+            // $table->string('para2')->nullable();
             $table->timestamps();
         });
 
diff --git a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php
index d42b42af..d788ae2a 100644
--- a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php
+++ b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php
@@ -14,7 +14,7 @@ class AddPara2ToCawanganTable extends Migration
     public function up()
     {
         Schema::table('cawangan', function (Blueprint $table) {
-            $table->string('para2'); 
+            $table->string('para2')->nullable(); 
         });
     }
 
@@ -26,7 +26,7 @@ class AddPara2ToCawanganTable extends Migration
     public function down()
     {
         Schema::table('cawangan', function (Blueprint $table) {
-            $table->dropColumn('para2');
+            $table->dropColumn('para2') ;
         });
     }
 }
diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php
index 317eca76..8b6e4705 100644
--- a/resources/views/lelong/laporanlelong.blade.php
+++ b/resources/views/lelong/laporanlelong.blade.php
@@ -16,25 +16,31 @@
                 <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
+                            <th>No</th>
                             <th>Lelong ID</th>
-                            <th>Cawangan</th>
                             <th>Tarikh Lelong</th>
+                            <th>Cawangan</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
                         
-                        @foreach ($lelongid as $bid)
+                        @foreach ($arraydetails as $laporan)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
-                            <td>{{ $bid->lelong_id}}</td>
-                            <td>{{ $bid->caw_name}}</td>
-                            <td>{{ $bid->tarikh_lelong }}</td>
-                            <td class="text-center">
-                            <a  href="{{ route('lelong.senaraibrglelong',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong" ><i class="far fa-edit"></i></a>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $laporan['laporan']['lelong_id']}}</td>
+                            <td>{{ $laporan['laporan']['tarikh_lelong']}}</td>
+                            <td>
+                                @foreach($laporan['details'] as $details)
+                                    <span class="m-2">{{ $details['caw_name']}}</span><br>
+                                @endforeach
                             </td>
-                        </tr>
+                            
+                            <td class="text-center">
+                                <a  href="{{ route('lelong.senaraibrglelong',$laporan['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong" ><i class="far fa-edit"></i></a>
+                                </td>
+                        </tr>  
+        
                         @endforeach
                     </tbody>
                     
diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php
index 313ec2ec..5199206f 100644
--- a/resources/views/lelong/senaraibrglelong.blade.php
+++ b/resources/views/lelong/senaraibrglelong.blade.php
@@ -4,12 +4,18 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
-            @foreach ($lelongid as $info)  
+        @foreach ($arrayinfo as $laporan)
+           
             <span class="pt-3" style="margin-left:1%;"><b>Laporan Barang Lelong </b></span>
-            <span class="pt-3" style="margin-left:1%;">Lelong ID: {{ $lelong_id}}</span>
-            <span class="pt-3" style="margin-left:1%;">Cawangan: {{ $info->caw_name}}</span>
-            <span class="pt-3" style="margin-left:1%;">Tarikh Lelong: {{ $info->tarikh_lelong}}</span><br>
+            <span class="pt-3" style="margin-left:1%;">Lelong ID: {{ $laporan['laporan']['lelong_id']}}</span>
+            <span class="pt-3" style="margin-left:1%;">Tarikh Lelong: {{ $laporan['laporan']['tarikh_lelong']}}</span>
+            @foreach($laporan['details'] as $details)
+            <span class="pt-3" style="margin-left:1%;">Cawangan: {{ $details['caw_name']}}</span>
             @endforeach
+            <br>
+        @endforeach
+
+          
 
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
@@ -85,7 +91,7 @@
    
                     "info": false,
                     "lengthChange": false,
-                    "pageLength": 10,
+                    "pageLength": 99999999999,
                     dom: 'Bfrtip',
                     buttons: [
                        
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index d002cc9e..4ec82c05 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -15,9 +15,10 @@
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
-                            <th>Cawangan</th>
+                            <th>No</th>
+                            <th>Lelong ID</th>
                             <th>Tarikh Lelong</th>
+                            <th>Cawangan</th>
                             <th>Masa Tamat Lelong</th>
                             <th>Harga Emas Asas</th>
                             <th>JBG</th>
@@ -27,41 +28,50 @@
                     </thead>
                     <tbody>
                         
-                        @foreach ($lelong as $lel)
+                        @foreach ($arrayinfo as $lel)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
-                            <td>{{ $caw_lelong[0]['caw_name'] }}</td>
-                            <td>{{ $lel->tarikh_lelong }}</td>
-                            <td>{{ $lel->masatamat_lelong }}</td>
-                            <td>{{ $lel->harga_emas_asas }}</td>
-                            <td>{{ $lel->jbg }}</td>
-                            <td>{{ $lel->cajlelong }}</td>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['info']['lelong_id'] }}</td>
+                            <td>{{ $lel['info']['tarikh_lelong']}}</td>
+                            <td>
+                                @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </td>
+                            <td>{{$lel['info']['masatamat_lelong']}}</td>
+                            <td>{{$lel['info']['harga_emas_asas']}}</td>
+                            <td>{{$lel['info']['jbg']}}</td>
+                            <td>{{$lel['info']['cajlelong']}}</td>                     
+                            
                             <td class="text-center">
                             @hasrole('jurulelong')
                                 
-                                @if($lel->sts_lelong == 0)
-                                    <a  href="{{ route('lelong.refresh',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
-                                    <a class="startlelong" href="{{ route('lelong.start',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a>
-                                    <a  href="{{ route('lelong.show',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
-                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
-                                @elseif ($lel->sts_lelong == 2)
-                                    <a  href="{{ route('lelong.janapemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
-                                @elseif ($lel->sts_lelong == 3)
-                                    <a  href="{{ route('lelong.senaraipemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <a  href="{{ route('lelong.refresh',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
+                                    <a class="startlelong" href="{{ route('lelong.start',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a>
+                                    <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
+                                @elseif ($lel['info']['sts_lelong'] == 2)
+                                    <a  href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
+                                @elseif ($lel['info']['sts_lelong'] == 3)
+                                    <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
                                 @else
-                                    <a class="stoplelong" href="{{ route('lelong.stop',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
+                                    <a class="stoplelong" href="{{ route('lelong.stop',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
                                 @endif
                             @endhasrole
                             @hasrole('operasi')
                                 
-                                @if($lel->sts_lelong == 0)
-                                    <a  href="{{ route('lelong.show',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
-                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
                                 @endif
                             @endhasrole
                             </td>
                         </tr>
                         @endforeach
+
+
+
                     </tbody>
                 </table>
             </form>
@@ -108,7 +118,7 @@
         // "ordering": false,
         "info": false,
         "lengthChange": false,
-        "pageLength": 15,
+        "pageLength": 99999999,
         dom: 'Bfrtip',
         buttons: [
             // 'copy', 'excel', 'pdf'
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 034d2a2f..3a388d9f 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -15,30 +15,32 @@
                 <table class="table table-striped  table-xl text-center" id="simulasi" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
+                            <th>No</th>
+                            <th>Lelong ID</th>
                             <th>Tarikh Lelong</th>
-                            <th>Cawangan</th>
-                            <th>JBG</th>
-                            <th>Caj Lelong</th>
+                            <th>Cawangan</th>                   
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
                         
-                        @foreach ($simulasi as $sim)
+                        @foreach ($arrayinfo as $info)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $sim->id }}"></td>
-                            <td>{{ $sim->tarikh_lelong }}</td>
-                            <td>{{ $sim->harga_emas_asas }}</td>
-                            <td>{{ $sim->jbg }}</td>
-                            <td>{{ $sim->cajlelong }}</td>
-                            <td class="text-center">
-                            <a  href="{{ route('analisa.show',$sim->id) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                            {{-- <a  href="{{ route('sistem.showConn',$data->id) }}"><i class="far fa-eye"></i></a> --}}
-                            <a class="confirmdel" href="{{ route('analisa.delete',$sim->id) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
-                                
-                                
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{$info['info']['simulasi_id']}}</td>
+                            <td>{{$info['info']['tarikh_lelong']}}</td>
+                            <td>
+                            @foreach($info['detailsinfo'] as $info2)
+                            <span class="m-2">{{$info2['caw_name']}}</span><br>
+                            @endforeach
                             </td>
+                            <td class="text-center">
+                                <a  href="{{ route('analisa.show',$info['info']['simulasi_id']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
+                                <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
+                                    
+                                    
+                                </td>
+
                         </tr>
                         @endforeach
                     </tbody>