From bd2c7dbb27e2f0ebe50551f0f3e5c202aae317ba Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sat, 18 Jun 2022 21:59:00 +0800
Subject: [PATCH] update tangguh lelong list display

---
 app/Http/Controllers/MarhunController.php        |  4 ++--
 app/Http/Controllers/TangguhLelongController.php | 11 ++++++-----
 app/Models/LogUser.php                           |  1 +
 .../pengesahan/senaraitangguhlelong.blade.php    |  9 ---------
 .../views/tangguhlelong/listtangguh.blade.php    | 16 ++++++----------
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 8bbb102a..da3feadc 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -897,10 +897,10 @@ class MarhunController extends Controller
             ->first();
             
             $tangguhlelong[$index1]['details'] = $tanguhlel;
-            $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
+            // $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
         }
         
-        return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_code', 'getkodcaw'));
+        return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_code'));
     }
     
     public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index c2150f7c..099f062a 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -379,6 +379,7 @@ class TangguhLelongController extends Controller
 
                // dd($id);
                $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
+               ->where('tangguhlelong.lelong_id', $lelong_id)
                ->where('tangguhlelong.norujukan', 'like', "%$caw_code%")
                ->whereNotNull('tangguhlelong.tarikhtangguh')
                ->select('tangguhlelong.id as tangguhlelong_id',
@@ -397,21 +398,21 @@ class TangguhLelongController extends Controller
                )
                ->get();
                //dd($tangguhlelong);
-               
                foreach($tangguhlelong as $index1=>$tanguhlel)
                {
+               
                    $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
                    ->where('lelong_id', $lelong_id)
                    ->where('kodcaw', $caw_code)
                    ->select('cawangan.caw_name','cawangan.caw_code')
                    ->first();
-                   
+                  
                    $tangguhlelong[$index1]['details'] = $tanguhlel;
-                   $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
+                   //$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
         
                }
-
-               return view('tangguhlelong.listtangguh',compact('tangguhlelong','lelong_id', 'caw_code', 'getkodcaw'));
+                // dd($tangguhlelong);
+               return view('tangguhlelong.listtangguh',compact('tangguhlelong','lelong_id', 'caw_code'));
 
 
     }
diff --git a/app/Models/LogUser.php b/app/Models/LogUser.php
index 02929efe..025e19a5 100644
--- a/app/Models/LogUser.php
+++ b/app/Models/LogUser.php
@@ -17,6 +17,7 @@ class LogUser extends Model
         'date',
         'username',
         'nama_user',
+        'norujukan',
         'nota'
     ];
 
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index bda0d881..2124586d 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -11,15 +11,6 @@
                 </div>
             @endif
 
-            <div class="container">
-                <div class="row mb-2">
-                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
-                        <p> <b>Tarikh Lelong : </b> {{ $tangguhlelong[0]['tarikh_lelong'] }}</p>
-                        <p> <b>Nama Cawangan : </b>{{ $getkodcaw->caw_name }}</p>
-                        <p> <b>JBG : </b>{{ $tangguhlelong[0]['jbg'] }}</p>
-                    </div>
-                </div>
-            </div>
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
diff --git a/resources/views/tangguhlelong/listtangguh.blade.php b/resources/views/tangguhlelong/listtangguh.blade.php
index d802806f..620977ea 100644
--- a/resources/views/tangguhlelong/listtangguh.blade.php
+++ b/resources/views/tangguhlelong/listtangguh.blade.php
@@ -11,15 +11,7 @@
                 </div>
             @endif
 
-            <div class="container">
-                <div class="row mb-2">
-                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
-                        <p> <b>Tarikh Lelong : </b> {{ $tangguhlelong[0]['tarikh_lelong'] }}</p>
-                        <p> <b>Nama Cawangan : </b>{{ $getkodcaw->caw_name }}</p>
-                        <p> <b>JBG : </b>{{ $tangguhlelong[0]['jbg'] }}</p>
-                    </div>
-                </div>
-            </div>
+        
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
@@ -33,8 +25,11 @@
                         </tr>
                     </thead>
                     <tbody>
-                       
                         @foreach ($tangguhlelong as $tangguhlel)
+                        @if(empty($tangguhlel))
+                        <tr>
+                        </tr>
+                        @else
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $tangguhlel->tarikhtangguh }}</td>
@@ -44,6 +39,7 @@
                             <a  href="{{ route('pengesahan.lelbidmarhun', [ $lelong_id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
+                        @endif
                         @endforeach
                     </tbody>
                 </table>