From be8e969ec3769c8a2669dbcda1b8a20319fbac55 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Tue, 1 Nov 2022 11:14:22 +0800
Subject: [PATCH] update error report

---
 .../Controllers/ReportCawanganController.php  | 16 ++++++------
 app/Http/Controllers/ReportController.php     | 26 +++++++++++++++----
 database/seeders/RolesSeeder.php              |  2 ++
 resources/views/laporan/bdbrglelong.blade.php |  2 +-
 .../views/pdf/cetakbdbrglelong.blade.php      |  9 ++++++-
 .../views/pdf/laporannamapembidacaw.blade.php |  6 ++++-
 6 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php
index a1ff5d7b..846a66f2 100644
--- a/app/Http/Controllers/ReportCawanganController.php
+++ b/app/Http/Controllers/ReportCawanganController.php
@@ -77,10 +77,11 @@ class ReportCawanganController extends Controller
         $caw = Cawangan::where('caw_code','=',$user->kodcaw)
         ->first(); 
         
-        $brglelongcaw = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        $brglelongcaw = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->where('gadai.kodcaw','=',$user['kodcaw'])
+        ->where('lelongbid.kodcaw','=',$user['kodcaw'])
         ->get()->toArray();  
+        // dd($brglelongcaw);
 
         $keuntungan=0;
         $total_hargaasas = 0;
@@ -234,7 +235,7 @@ class ReportCawanganController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
         ->where('cawangan.caw_code','=',$user['kodcaw'])
-        ->select('lelong_id','tarikh_lelong','fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->groupBy('lelong_id')
         ->get();
 
@@ -311,7 +312,7 @@ class ReportCawanganController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user['kodcaw'])
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
-        ->select('lelong_id','tarikh_lelong','fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->groupBy('lelong_id')
         ->get();
 
@@ -391,7 +392,7 @@ class ReportCawanganController extends Controller
         ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->groupBy('lelong_id')
         ->get();
-        dd($info);
+        // dd($info);
 
         foreach($info as $laporancaw)
         {
@@ -403,9 +404,8 @@ class ReportCawanganController extends Controller
             array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]);
         }
 
-        $brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
-        ->where('gadai.kodcaw','=',$user['kodcaw'])
+        $brglelpembida = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->where('lelongbid.kodcaw','=',$user['kodcaw'])
         ->where('lelongbid.lelong_id','=',$lelong_id)
         ->where('lelongbidder.status_bidder','=','1')
         ->get()->toArray();    
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index be69618c..01367392 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -123,6 +123,8 @@ class ReportController extends Controller
         foreach($datasimulasi as $index=>$totharga){
 
             $total_hargaasas = $total_hargaasas + $totharga['hargaasas'];
+            $total_berat = $total_berat + $totharga['berat'];    
+
         }
 
 
@@ -137,10 +139,7 @@ class ReportController extends Controller
             ->where('nokp','=',$upah['nokp'])
             ->get();
        
-            foreach($listsag as $index=>$listing){
-
-                $total_berat = $total_berat + $listing['berat'];    
-            }
+         
         }
         $marhuns[$index1]['listsag'] = $listsag;
 
@@ -972,6 +971,8 @@ class ReportController extends Controller
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
         $arraydetails = [];
+        $total_berat = 0;
+        $total_hargaasas = 0;
         
         $cawangan_id = $request->caw;
 
@@ -994,10 +995,25 @@ class ReportController extends Controller
         ->join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw')
         ->where([['tarikh_lelong','>=',$request->datemula],['tarikh_lelong','<=',$request->datehingga]])
+        ->select('norujukan','marhun','berat','hargaasas','cawangan_lelong.lelong_id','lelongbid.id','cawangan.caw_code')
         ->get()->toArray();
 
 
-        return view('pdf.cetakbdbrglelong',compact('cawangan'));
+        foreach($cawangan as $index1=>$brglelong){
+            
+            $data = LelongBid::where('id','=',$brglelong['id'])
+            ->where('kodcaw','=',$brglelong['caw_code'])
+            ->get();
+            $total_berat = $total_berat + ($data->sum('berat'));
+            $total_hargaasas = $total_hargaasas + ($data->sum('hargaasas'));
+            
+            
+        }
+        // dd($total_berat);
+
+
+
+        return view('pdf.cetakbdbrglelong',compact('cawangan','total_berat','total_hargaasas'));
     }
 
 
diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php
index 47e48d9e..acec51bc 100644
--- a/database/seeders/RolesSeeder.php
+++ b/database/seeders/RolesSeeder.php
@@ -182,6 +182,8 @@ class RolesSeeder extends Seeder
         $role4->givePermissionTo('pengesahanbayarancash');
         $role4->givePermissionTo('serahan');
         $role4->givePermissionTo('tangguhlelong');
+        $role4->givePermissionTo('report');
+
 
         $role5 = Role::create(['name' => 'jurulelong']);
         $role5->givePermissionTo('pendaftaranbatch');
diff --git a/resources/views/laporan/bdbrglelong.blade.php b/resources/views/laporan/bdbrglelong.blade.php
index a905c0e8..9d9c7d5a 100644
--- a/resources/views/laporan/bdbrglelong.blade.php
+++ b/resources/views/laporan/bdbrglelong.blade.php
@@ -97,7 +97,7 @@
                                             <span class="input-group-text" id="basic-addon1">Cawangan</span>
                                         </div> 
                                       <select class="custom-select" name="caw" id="caw">
-                                        <option value="">Please select</option>
+                                        <option value="">Pilih Cawangan</option>
                                         @foreach ($caw as $item)
                                         <option value="{{$item->id}}">{{$item->caw_name}}</option>
                                         @endforeach
diff --git a/resources/views/pdf/cetakbdbrglelong.blade.php b/resources/views/pdf/cetakbdbrglelong.blade.php
index 4c8d2b48..e9840f1c 100644
--- a/resources/views/pdf/cetakbdbrglelong.blade.php
+++ b/resources/views/pdf/cetakbdbrglelong.blade.php
@@ -130,7 +130,14 @@ tr:nth-child(even) {
                             <td>{{ $item['berat'] }}</td>  
                             <td>{{ $item['hargaasas'] }}</td>    
                         </tr>
-                        @endforeach</td>        
+                        @endforeach
+                        
+                        <tr>
+                          <td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
+                          <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
+                          <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
+                          <td></td>
+                        </tr>                
             
                       </table>  
 
diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php
index cfd2428f..50b0bef8 100644
--- a/resources/views/pdf/laporannamapembidacaw.blade.php
+++ b/resources/views/pdf/laporannamapembidacaw.blade.php
@@ -142,7 +142,11 @@ tr:nth-child(even) {
                             </td>
                             <td>
                                 @foreach($laporan['details'] as $details)
-                                    <span class="m-2">{{ $details['masa_bidaan']}}</span><br>
+                                    <span class="m-2"> @php
+                                      $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $details['masa_bidaan'] );
+                                      $t_lelong =  $myDateTime->format('d-m-Y h:i:s');
+                                      echo($t_lelong);
+                                  @endphp</span><br>
                                 @endforeach
                             </td>
                         </tr>