From e8ff13ce6a54104259e939fdd53360eedd5a1d90 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Mon, 4 Nov 2024 16:53:16 +0700
Subject: [PATCH] Fix data retrieval and error handling in ProsesPenawaran

Enhanced data fetching to include 'permohonan' and 'debiture' relations. Improved error messaging and validations in multiple methods, ensuring more robust data processing. Removed unnecessary whitespace for code clarity.
---
 .../Controllers/ProsesPenawaranController.php | 56 +++++++++----------
 .../views/prosespenawaran/index.blade.php     |  7 ++-
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php
index a37669b..18929fb 100644
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -75,7 +75,7 @@ class ProsesPenawaranController extends Controller
 
         // Get the data for the current page
         //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-        $data = $query->with(['tujuanPenilaianKJPP'])->get();
+        $data = $query->with(['tujuanPenilaianKJPP','permohonan','permohonan.debiture'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
@@ -110,13 +110,13 @@ class ProsesPenawaranController extends Controller
             $id = $request->id;
             $penawaran = PenawaranTender::find($id);
             $penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)
-                                ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id') 
+                                ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id')
                                 ->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
                                 ->where('detail_penawaran.status','=',1)
                                 ->get();
-            
+
             if ($penawaran) {
-                
+
                 $i=0;
                 foreach($penawrandetails as $obj)
                 {
@@ -156,11 +156,11 @@ class ProsesPenawaranController extends Controller
         $dataPenawaranDetail = array();
         if (request()->ajax()) {
             $validator = ProsesPenawaranController::rulesEditnya($request, $id);
-            
+
             if ($validator['fails']) {
                 $data['message'] = $validator['errors'];
                 $data['status'] = 'error';
-            } 
+            }
             else
             {
                 try {
@@ -174,9 +174,9 @@ class ProsesPenawaranController extends Controller
                     {
                         $file_tmp = $request->file('dokumen_persetujuan');
                         $folderPath = 'uploads/penawaran/';
-                        if ($file_tmp->isValid()) 
+                        if ($file_tmp->isValid())
                         {
-                            $myFile=$file_tmp->getClientOriginalName(); // nama file with extension 
+                            $myFile=$file_tmp->getClientOriginalName(); // nama file with extension
                             $file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
 
                             $extension = $file_tmp->getClientOriginalExtension();
@@ -205,16 +205,16 @@ class ProsesPenawaranController extends Controller
                     {
                         $data['status'] = 'error';
                         $data['message'] ['check_file'] = array("Silahkan upload file");
-                        
+
                     }
-                    
+
                 } catch (Exception $e) {
-            
+
                     $data['status'] = 'error';
                     $data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.');
                 }
             }
-            
+
         } else {
             $data['status'] = 'error';
             $data['message'] ['message_ajax'] = array("no ajax request");
@@ -257,12 +257,12 @@ class ProsesPenawaranController extends Controller
          $dataPenawaran = array();
          $penawaran = PenawaranTender::find($id);
          $checkActiveDateRange = checkActiveDateRangePenawaran($id);
-         
+
          // cek masa aktif penawaran
          if($checkActiveDateRange)
          {
-             
-             $checkKelengkapanDetailKJPP = checkKelengkapanDetailKJPP($id);     
+
+             $checkKelengkapanDetailKJPP = checkKelengkapanDetailKJPP($id);
              if($checkKelengkapanDetailKJPP)
              {
                  DB::beginTransaction();
@@ -271,43 +271,43 @@ class ProsesPenawaranController extends Controller
                          'updated_by' => Auth::id(),
                          'updated_at' => now()
                      ];
-                     
+
                      $dataPermohonan = ['status' => 'persetujuan-penawaran',
                          'updated_by' => Auth::id(),
                          'updated_at' => now()
                      ];
-                     
+
                      $permohonan = Permohonan::where('nomor_registrasi','=', $penawaran->nomor_registrasi)->first();
-                     
-                     $penawaran->update($dataPenawaran);    
-                     $permohonan->update($dataPermohonan);    
-                     
+
+                     $penawaran->update($dataPenawaran);
+                     $permohonan->update($dataPermohonan);
+
                      DB::commit();
- 
+
                      $data['message'] ['message_success'] = array('Sukses melakukan Proses Penawaran');
                      $data['status'] = 'success';
- 
+
                  } catch (Exception $e) {
                      DB::rollBack();
                      // dd($e);
                      $data['message'] ['message_error_try_catch'] = array("Gagal melakukan Proses Penawaran");
                      $data['status'] = 'error';
                  }
- 
+
              }
              else
              {
                  $data['message'] ['cek_kelengkapan_data'] = array("Silahkan lengkapi data KJPP");
                  $data['status'] = 'error';
              }
-             
+
          }
          else
          {
              $data['message'] ['active_date_range'] = array("Penawaran sudah di tutup");
              $data['status'] = 'error';
          }
- 
+
          return response()->json($data);
     }
 
@@ -326,12 +326,12 @@ class ProsesPenawaranController extends Controller
                 'updated_at' => now()
             ];
 
-            $detailpenawaran->update($dataDetailPenawaran);    
+            $detailpenawaran->update($dataDetailPenawaran);
 
             $data['status'] = 'success';
             $data['message'] ['message_success'] = array('Sukses delete Penawaran KJPP '.$request->kjppName);
         } catch (Exception $e) {
-            
+
             $data['status'] = 'error';
             $data['message'] ['message_error_try_catch'] = array("Gagal delete Penawaran KJPP ".$request->kjppName);
         }
diff --git a/resources/views/prosespenawaran/index.blade.php b/resources/views/prosespenawaran/index.blade.php
index dd9d260..88ca76f 100644
--- a/resources/views/prosespenawaran/index.blade.php
+++ b/resources/views/prosespenawaran/index.blade.php
@@ -135,8 +135,13 @@
                 debiture: {
                     title: 'Nama Debitur',
                     render: (item, data) => {
-                        return `${data.debiture.name}`
+                        if(data.permohonan) {
+                            return `${data.permohonan.debiture.name}`;
+                        }
+                        return "-";
                     }
+
+
                 },
                 start_date: {
                     title: 'Tanggal Penawaran',