From edbb0187dce06c4d707dd2e793ee8e048f1e9a4c Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Tue, 21 Jun 2022 22:49:46 +0800
Subject: [PATCH] laporan by caw OPERASI

---
 app/Http/Controllers/ReportController.php     | 53 +++++++++++++++----
 .../views/lelong/brgleldetails.blade.php      |  9 ++--
 .../lelong/lapbrglelpembidaindex.blade.php    |  7 +--
 .../views/lelong/laplelongindex.blade.php     |  7 +--
 .../views/lelong/laporanbidaanindex.blade.php |  9 ++--
 .../views/lelong/laporanlelong.blade.php      |  8 +--
 resources/views/pdf/pdflaplelong.blade.php    |  2 +-
 routes/web.php                                | 10 ++--
 8 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 998d05ad..0cb8e24d 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -58,7 +58,8 @@ class ReportController extends Controller
 
         $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','fasa')
-        ->groupBy('lelong_id')
+        ->distinct()
+        ->orderBy('lelong_id')        
         ->get()
         ->toArray();
 
@@ -66,6 +67,8 @@ class ReportController extends Controller
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])    
+            ->distinct()
+            ->orderBy('lelong_id')
             ->get()
             ->toArray();
             array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
@@ -74,7 +77,7 @@ class ReportController extends Controller
        return view('lelong.laporanlelong', compact('arraydetails'));
     }
 
-    public function senaraibrglelong($lelong_id){
+    public function senaraibrglelong($lelong_id,  $kodcaw){
      
 
         $arraydetails = [];
@@ -82,7 +85,9 @@ class ReportController extends Controller
 
 
         $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
+        ->where('cawangan.caw_code', $kodcaw)
         ->select('lelong_id','tarikh_lelong','fasa')
         ->groupBy('lelong_id')
         ->get()->toArray();
@@ -91,6 +96,7 @@ class ReportController extends Controller
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])
+            ->where('cawangan.caw_code', $kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
@@ -99,6 +105,7 @@ class ReportController extends Controller
 
         $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
         ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbid.kodcaw', $kodcaw)
         ->get()->toArray();  
 
         $keuntungan=0;
@@ -126,16 +133,18 @@ class ReportController extends Controller
         
         $brgdetails= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','fasa')
-        ->groupBy('lelong_id')
+        ->distinct()
+        ->orderBy('lelong_id')
         ->get()
         ->toArray();
 
-        // dd($brgdetails);
 
         foreach($brgdetails as $brg)
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id', $brg['lelong_id'])
+            ->distinct()
+            ->orderBy('lelong_id')
             ->get()
             ->toArray();
             array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
@@ -144,9 +153,10 @@ class ReportController extends Controller
         return view('lelong.brgleldetails', compact('arraydetails'));
     }
 
-    public function senaraibrglelongdetails ($lelong_id){
+    public function senaraibrglelongdetails ($lelong_id, $kodcaw){
 
         $lelongs= LelongBid::where('lelong_id','=',$lelong_id)
+        ->where('lelongbid.kodcaw',$kodcaw)
         ->get()->toArray();
 
         $arraycaw= [];
@@ -167,6 +177,8 @@ class ReportController extends Controller
 
 
         $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('cawangan.caw_code',$kodcaw)
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
         ->select('lelong_id','tarikh_lelong','fasa')
         ->groupBy('lelong_id')
@@ -176,6 +188,7 @@ class ReportController extends Controller
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])
+            ->where('cawangan.caw_code',$kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
@@ -218,7 +231,8 @@ class ReportController extends Controller
 
         $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','fasa')
-        ->groupBy('lelong_id')
+        ->distinct()
+        ->orderBy('lelong_id')   
         ->get()
         ->toArray();
 
@@ -226,6 +240,8 @@ class ReportController extends Controller
             
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])
+            ->distinct()
+            ->orderBy('lelong_id')   
             ->get()
             ->toArray();
             array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
@@ -237,7 +253,7 @@ class ReportController extends Controller
     }
 
 
-    public function senarailapbidaan ($lelong_id){
+    public function senarailapbidaan ($lelong_id, $kodcaw){
 
     
         $arraydetails = [];
@@ -246,6 +262,7 @@ class ReportController extends Controller
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
+        ->where('cawangan.caw_code',$kodcaw)
         ->select('lelong_id','tarikh_lelong','fasa')
         ->groupBy('lelong_id')
         ->get();
@@ -254,6 +271,7 @@ class ReportController extends Controller
         {
             $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporancaw['lelong_id'])
+            ->where('cawangan.caw_code',$kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]);
@@ -262,6 +280,7 @@ class ReportController extends Controller
 
         $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->select('lelongbid_id','norujukan','hargaasas')
+        ->where('lelongbid.kodcaw',$kodcaw)
         ->where('lelongbid.lelong_id','=',$lelong_id)
         ->groupBy('lelongbid_id')
         ->get()
@@ -295,7 +314,8 @@ class ReportController extends Controller
         
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->select('lelong_id','tarikh_lelong','fasa')
-        ->groupBy('lelong_id')
+        ->distinct()
+        ->orderBy('lelong_id')
         ->get()
         ->toArray();
 
@@ -303,6 +323,8 @@ class ReportController extends Controller
 
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])
+            ->distinct()
+            ->orderBy('lelong_id')
             ->get()
             ->toArray();
             array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
@@ -313,7 +335,7 @@ class ReportController extends Controller
 
     }
 
-    Public function laplelong ($lelong_id){
+    Public function laplelong ($lelong_id, $kodcaw){
 
         $total_nmarhun = 0;
         $total_pembiayaan = 0;
@@ -326,6 +348,7 @@ class ReportController extends Controller
 
         $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('cawangan.caw_code',$kodcaw)
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
         ->select('lelong_id','tarikh_lelong','fasa')
         ->groupBy('lelong_id')
@@ -334,6 +357,7 @@ class ReportController extends Controller
         foreach($info as $laporancaw)
         {
             $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('cawangan.caw_code',$kodcaw)
             ->where('lelong_id',$laporancaw['lelong_id'])
             ->get()
             ->toArray();
@@ -343,6 +367,7 @@ class ReportController extends Controller
         $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->where('lelongbid.lelong_id','=',$lelong_id)        
         ->where('lelongbidder.status_bidder','=','1')
+        ->where('lelongbid.kodcaw',$kodcaw)
         ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
         'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
         ->get()->toArray();
@@ -377,7 +402,8 @@ class ReportController extends Controller
         
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->select('lelong_id','tarikh_lelong','fasa')
-        ->groupBy('lelong_id')
+        ->distinct()
+        ->orderBy('lelong_id')       
         ->get()
         ->toArray();
 
@@ -385,6 +411,8 @@ class ReportController extends Controller
 
             $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])
+            ->distinct()
+            ->orderBy('lelong_id')
             ->get()
             ->toArray();
             array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]);
@@ -394,7 +422,7 @@ class ReportController extends Controller
         
     }
 
-    Public function lapbrglelpembida ($lelong_id){
+    Public function lapbrglelpembida ($lelong_id, $kodcaw){
 
         $total_berat = 0;
         $total_hargaasas = 0;
@@ -404,6 +432,7 @@ class ReportController extends Controller
 
         $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('cawangan.caw_code',$kodcaw)
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
         ->select('lelong_id','tarikh_lelong','fasa')
         ->groupBy('lelong_id')
@@ -412,6 +441,7 @@ class ReportController extends Controller
         foreach($info as $laporancaw)
         {
             $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('cawangan.caw_code',$kodcaw)
             ->where('lelong_id',$laporancaw['lelong_id'])
             ->get()
             ->toArray();
@@ -420,6 +450,7 @@ class ReportController extends Controller
 
         $brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
         ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->where('lelongbid.kodcaw',$kodcaw)
         ->where('lelongbid.lelong_id','=',$lelong_id)
         ->where('lelongbidder.status_bidder','=','1')
         ->get()->toArray();    
diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php
index 09ab905d..91b26cb3 100644
--- a/resources/views/lelong/brgleldetails.blade.php
+++ b/resources/views/lelong/brgleldetails.blade.php
@@ -21,7 +21,7 @@
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
-                            <th class="text-center">Muat Turun</th>
+                            {{-- <th class="text-center">Muat Turun</th> --}}
                         </tr>
                     </thead>
                     <tbody>
@@ -36,15 +36,16 @@
                                 echo($t_lelong);
                             @endphp</td>
                             <td>{{ $laporan['brg']['fasa']}}</td>
-                            <td>
+                            <td align="left">
                                 @foreach($laporan['detailsbrg'] as $details)
+                                <a href=" {{ route('report.senaraibrglelongdetails', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
                                     <span class="m-2">{{ $details['caw_name']}}</span><br>
                                 @endforeach
                             </td>
-                            
+{{--                             
                             <td class="text-center">
                                 <a  href="{{ route('report.senaraibrglelongdetails',$laporan['brg']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Details" ><i class="fas fa-download"></i></a>
-                                </td>
+                                </td> --}}
                         </tr>  
         
                         @endforeach
diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php
index d0da4697..e8dd8f1a 100644
--- a/resources/views/lelong/lapbrglelpembidaindex.blade.php
+++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php
@@ -20,7 +20,7 @@
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
-                            <th class="text-center">Muat Turun</th>
+                            {{-- <th class="text-center">Muat Turun</th> --}}
                         </tr>
                     </thead>
                     <tbody>
@@ -37,13 +37,14 @@
                             <td>{{ $info['laporan']['fasa'] }}</td>
                             <td>
                             @foreach($info['details'] as $details)
+                            <a href=" {{ route('report.lapbrglelpembida', ['lelong_id'=>$info['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
                             <span class="m-2"> {{ $details['caw_name']}}</span><br>
                             @endforeach
                             </td>
 
-                            <td class="text-center">
+                            {{-- <td class="text-center">
                             <a  href="{{ route('report.lapbrglelpembida',$info['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="fas fa-download"></i></a>
-                            </td>
+                            </td> --}}
                         </tr>
                         @endforeach
                     </tbody>
diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php
index e4fa8424..61304403 100644
--- a/resources/views/lelong/laplelongindex.blade.php
+++ b/resources/views/lelong/laplelongindex.blade.php
@@ -20,7 +20,7 @@
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
-                            <th class="text-center">Muat Turun</th>
+                            {{-- <th class="text-center">Muat Turun</th> --}}
                         </tr>
                     </thead>
                     <tbody>
@@ -37,13 +37,14 @@
                             <td>{{ $bid['laporan']['fasa'] }}</td>
                             <td>
                             @foreach($bid['details'] as $details)
+                            <a href=" {{ route('report.laplelong', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
                             <span class="m-2"> {{ $details['caw_name']}}</span><br>
                             @endforeach
 
                             </td>
-                            <td class="text-center">
+                            {{-- <td class="text-center">
                             <a  href="{{ route('report.laplelong',$bid['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong Keseluruhan" ><i class="fas fa-download"></i></a>
-                            </td>
+                            </td> --}}
 
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php
index 58293928..8efbd39e 100644
--- a/resources/views/lelong/laporanbidaanindex.blade.php
+++ b/resources/views/lelong/laporanbidaanindex.blade.php
@@ -21,7 +21,7 @@
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
-                            <th class="text-center">Tindakan</th>
+                            {{-- <th class="text-center">Tindakan</th> --}}
                         </tr>
                     </thead>
                     <tbody>
@@ -38,12 +38,15 @@
                             <td>{{ $bid['laporan']['fasa']}}</td>
                             <td>
                             @foreach($bid['details'] as $details)
+                            <a href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
+
                             <span class="m-2"> {{ $details['caw_name']}}</span><br>
+                            
                             @endforeach
                             </td>
-                            <td class="text-center">
+                            {{-- <td class="text-center">
                             <a  href="{{ route('report.senarailapbidaan',$bid['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Laporan Barang Lelong" ><i class="fas fa-download"></i></a>
-                            </td>
+                            </td> --}}
                         </tr>
                         @endforeach
                     </tbody>
diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php
index 9afa903a..5545cb2a 100644
--- a/resources/views/lelong/laporanlelong.blade.php
+++ b/resources/views/lelong/laporanlelong.blade.php
@@ -21,7 +21,7 @@
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
                             <th>Cawangan</th>
-                            <th class="text-center">Muat Turun</th>
+                            {{-- <th class="text-center">Muat Turun</th> --}}
                         </tr>
                     </thead>
                     <tbody>
@@ -38,13 +38,15 @@
                             <td>{{ $laporan['laporan']['fasa']}}</td>
                             <td>
                                 @foreach($laporan['details'] as $details)
+                                <a href=" {{ route('report.senaraibrglelong', ['lelong_id'=>$laporan['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
+
                                     <span class="m-2">{{ $details['caw_name']}}</span><br>
                                 @endforeach
                             </td>
                             
-                            <td class="text-center">
+                            {{-- <td class="text-center">
                                 <a  href="{{ route('report.senaraibrglelong',$laporan['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong" ><i class="fas fa-download"></i></a>
-                                </td>
+                                </td> --}}
                         </tr>  
         
                         @endforeach
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 0ceeccd6..9c445252 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -98,7 +98,7 @@ tr:nth-child(even) {
                               $t_lelong =  $myDateTime->format('d-m-Y');
                               echo($t_lelong);
                           @endphp</td>
-                          <td>ID Lelong:  {{$info->fasa}}</td>
+                          <td>Fasa:  {{$info->fasa}}</td>
 
                         @endforeach
                         @foreach ($arrayinfocaw as $laporancaw)
diff --git a/routes/web.php b/routes/web.php
index c35d04ab..662256ee 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -302,19 +302,17 @@ Route::get('/lapbrglelongindex',['as'=>'report.lapbrglelongindex','uses'=>'Repor
 Route::get('/senaraibrglelong/{lelong_id}/{kodcaw}',['as'=>'report.senaraibrglelong','uses'=>'ReportController@senaraibrglelong']);
 
 Route::get('/lapbrglelongdetailsindex',['as'=>'report.lapbrglelongdetailsindex','uses'=>'ReportController@lapbrglelongdetailsindex']);
-Route::get('/senaraibrglelongdetails/{lelong_id}/{caw_code}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']);
+Route::get('/senaraibrglelongdetails/{lelong_id}/{kodcaw}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']);
 
-Route::get('/lapbrglelongdetailsindex',['as'=>'report.lapbrglelongdetailsindex','uses'=>'ReportController@lapbrglelongdetailsindex']);
-Route::get('/senaraibrglelongdetails/{lelong_id}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']);
 
 Route::get('/lapbidaanpembidaindex', ['as'=>'report.lapbidaanpembidaindex','uses'=>'ReportController@lapbidaanpembidaindex']);
-Route::get('/senarailapbidaan/{lelong_id}',['as' =>'report.senarailapbidaan','uses'=>'ReportController@senarailapbidaan']);
+Route::get('/senarailapbidaan/{lelong_id}/{kodcaw}',['as' =>'report.senarailapbidaan','uses'=>'ReportController@senarailapbidaan']);
 
 Route::get('/laplelongindex',['as' =>'report.laplelongindex','uses'=>'ReportController@laplelongindex']);
-Route::get('/laplelong/{lelong_id}',['as' =>'report.laplelong','uses'=>'ReportController@laplelong']);
+Route::get('/laplelong/{lelong_id}/{kodcaw}',['as' =>'report.laplelong','uses'=>'ReportController@laplelong']);
 
 Route::get('/lapbrglelpembidaindex',['as'=>'report.lapbrglelpembidaindex','uses'=>'ReportController@lapbrglelpembidaindex']);
-Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'report.lapbrglelpembida','uses'=>'ReportController@lapbrglelpembida']);
+Route::get('/lapbrglelpembida/{lelong_id}/{kodcaw}',['as'=>'report.lapbrglelpembida','uses'=>'ReportController@lapbrglelpembida']);