From b52abe77739586ea325a080b6f7b6ab231b09dae Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Sun, 29 Dec 2024 15:15:05 +0700
Subject: [PATCH 1/6] Perbaiki dan tambahkan fungsi data tambahan di resume

- Ganti penggunaan `forminspeksi` ke `resumeData` untuk konsistensi data.
- Tambahkan dukungan data tambahan dengan input baru untuk `sertifikat`, `luas_tanah`, `luas_bangunan`, dan `nilai`.
- Perbarui script JavaScript untuk menangani data tambahan dan meningkatkan logika pengolahan data JSON.
- Revisi label kesimpulan dari "SESUAI IMB" menjadi "Tambahan".
---
 .../views/penilai/components/resume.blade.php | 118 ++++++++++++++++--
 1 file changed, 106 insertions(+), 12 deletions(-)

diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php
index e040770..d4b0314 100644
--- a/resources/views/penilai/components/resume.blade.php
+++ b/resources/views/penilai/components/resume.blade.php
@@ -113,8 +113,8 @@
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">Faktor Negatif</label>
                         <div id="fakta-negatif-container" class="flex flex-wrap items-baseline w-full">
-                            @if (!empty($forminspeksi['fakta']['fakta_negatif']))
-                                @foreach ($forminspeksi['fakta']['fakta_negatif'] as $index => $negatif)
+                            @if (!empty($resumeData['fakta']['fakta_negatif']))
+                                @foreach ($resumeData['fakta']['fakta_negatif'] as $index => $negatif)
                                     <div class="fakta_negatif flex items-center gap-2 mt-2 textarea-group w-full">
                                         <textarea class="textarea mt-2" name="fakta_negatif[]" rows="3">{{ old("fakta_negatif.$index", $negatif) }}</textarea>
                                         <button class="btn btn-danger btn-sm remove-btn" type="button"
@@ -125,7 +125,7 @@
                                 @endforeach
                             @else
                                 <div class="fakta_negatif flex items-center gap-2 mt-2 textarea-group w-full">
-                                    <textarea class="textarea mt-2" name="fakta_negatif[]" rows="3">{{ old('fakta_negatif.0', $forminspeksi['fakta']['fakta_negatif'][0] ?? '') }}</textarea>
+                                    <textarea class="textarea mt-2" name="fakta_negatif[]" rows="3">{{ old('fakta_negatif.0', $resumeData['fakta']['fakta_negatif'][0] ?? '') }}</textarea>
                                     <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
                                         <i class="ki-outline ki-trash"></i>
                                     </button>
@@ -165,6 +165,23 @@
                                 </thead>
                                 </thead>
                                 <tbody>
+                                @if(!empty($resumeData['fisik']))
+                                    @foreach($resumeData['fisik'] as $item)
+                                    <tr>
+                                        <td class="text-center">
+                                            <input type="text" name="fisik_sertifikat[]" class="input number-format" value="{{ $item['sertifikat'] }}">
+                                        </td>
+                                        <td class="text-center">
+                                            <input type="text" name="fisik_luas_tanah[]" class="input number-format"  value="{{ $item['luas_tanah'] }}">
+                                        </td>
+                                        <td class="text-center"> <input type="text" name="fisik_luas_bangunan[]"  value="{{ $item['luas_bangunan'] }}"
+                                                class="input number-format"></td>
+                                        <td class="text-center">
+                                            <input type="text" name="fisik_nilai[]" class="input number-format"  value="{{ $item['nilai'] }}">
+                                        </td>
+                                    </tr>
+                                    @endforeach
+                                @else
                                     <tr>
                                         <td class="text-center">
                                             <input type="text" name="fisik_sertifikat[]" class="input number-format">
@@ -173,11 +190,12 @@
                                             <input type="text" name="fisik_luas_tanah[]" class="input number-format">
                                         </td>
                                         <td class="text-center"> <input type="text" name="fisik_luas_bangunan[]"
-                                                class="input number-format"></td>
+                                                                        class="input number-format"></td>
                                         <td class="text-center">
                                             <input type="text" name="fisik_nilai[]" class="input number-format">
                                         </td>
                                     </tr>
+                                @endif
                                 </tbody>
                             </table>
                         </div>
@@ -200,6 +218,25 @@
                                 </thead>
                                 </thead>
                                 <tbody>
+                                @if(!empty($resumeData['fisik']))
+                                    @foreach($resumeData['fisik'] as $item)
+                                    <tr>
+                                        <td class="text-center">
+                                            <input type="text" name="sesuai_sertifikat[]" class="input number-format" value="{{ $item['sertifikat'] }}">
+                                        </td>
+                                        <td class="text-center">
+                                            <input type="text" name="sesuai_luas_tanah[]" class="input number-format" value="{{ $item['luas_tanah'] }}">
+                                        </td>
+                                        <td class="text-center">
+                                            <input type="text" name="sesuai_luas_bangunan[]"
+                                                class="input number-format" value="{{ $item['luas_bangunan'] }}">
+                                        </td>
+                                        <td class="text-center">
+                                            <input type="text" name="sesuai_nilai[]" class="input number-format" value="{{ $item['nilai'] }}">
+                                        </td>
+                                    </tr>
+                                    @endforeach
+                                @else
                                     <tr>
                                         <td class="text-center">
                                             <input type="text" name="sesuai_sertifikat[]" class="input number-format">
@@ -209,17 +246,61 @@
                                         </td>
                                         <td class="text-center">
                                             <input type="text" name="sesuai_luas_bangunan[]"
-                                                class="input number-format">
+                                                   class="input number-format">
                                         </td>
                                         <td class="text-center">
                                             <input type="text" name="sesuai_nilai[]" class="input number-format">
                                         </td>
                                     </tr>
+                                @endif
                                 </tbody>
                             </table>
                         </div>
                     </div>
 
+                    @if(!empty($resumeData['tambahan']))
+                        <div class="gird gap-5">
+                            <label class="form-label max-w-56">3. Tambahan</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+
+                                <table
+                                    class="table table-auto table-border align-middle text-gray-700 font-medium text-sm mt-5">
+                                    <thead>
+                                    <tr>
+                                        <th class="text-center">Sertipikat</th>
+                                        <th class="text-center">Luas Tanah</th>
+                                        <th class="text-center">Luas Bangunan</th>
+                                        <th class="text-center">Nilai Pasar Wajar</th>
+
+                                    </tr>
+                                    </thead>
+                                    </thead>
+                                    <tbody>
+                                    @if(!empty($resumeData['tambahan']))
+                                        @foreach($resumeData['tambahan'] as $item)
+                                            <tr>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_sertifikat[]" class="input number-format" value="{{ $item['sertifikat'] }}">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_luas_tanah[]" class="input number-format" value="{{ $item['luas_tanah'] }}">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_luas_bangunan[]"
+                                                           class="input number-format" value="{{ $item['luas_bangunan'] }}">
+                                                </td>
+                                                <td class="text-center">
+                                                    <input type="text" name="tambahan_nilai[]" class="input number-format" value="{{ $item['nilai'] }}">
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    @endif
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    @endif
+
                     <div>
                         <button type="button" class="btn btn-primary btn-sm mt-5" onclick="tambahKesimpulanNilai()">
                             <i class="ki-outline ki-plus"></i>
@@ -250,15 +331,14 @@
 @endsection
 @include('lpj::surveyor.js.utils')
 <script type="text/javascript">
-console.log('LPJ Data:', @json($resumeData));
-    let counter = 1;
+    let counter = 3;
 
     function tambahKesimpulanNilai() {
         const kesimpulan = document.getElementById('kesimpulan');
 
         kesimpulan.innerHTML += `
         <div class="grid gap-5 w-full" id="kesimpulan-${counter}">
-            <label class="form-label kesimpulan max-w-56">${counter}. SESUAI IMB</label>
+            <label class="form-label kesimpulan max-w-56">${counter}. Tambahan</label>
             <div class="flex flex-wrap items-baseline w-full">
                 <div class="tabel-container w-full">
                     <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm mt-5">
@@ -274,19 +354,19 @@ console.log('LPJ Data:', @json($resumeData));
                         <tbody>
                             <tr>
                                 <td class="text-center">
-                                    <input type="text" name="sertipikat[]"
+                                    <input type="text" name="tambahan_sertifikat[]"
                                         class="input number-format">
                                 </td>
                                 <td class="text-center">
-                                    <input type="text" name="luas_tanah[]"
+                                    <input type="text" name="tambahan_luas_tanah[]"
                                         class="input number-format">
                                 </td>
                                 <td class="text-center">
-                                    <input type="text" name="luat_bangunan[]"
+                                    <input type="text" name="tambahan_luas_bangunan[]"
                                         class="input number-format">
                                 </td>
                                 <td class="text-center">
-                                    <input type="text" name="nilai_pasar_wajar[]"
+                                    <input type="text" name="tambahan_nilai[]"
                                         class="input number-format">
                                 </td>
                                 <td class="text-center">
@@ -397,6 +477,7 @@ console.log('LPJ Data:', @json($resumeData));
             },
             fisik: [],
             sesuai_imb: [],
+            tambahan:[],
             keterangan: ""
         };
 
@@ -436,6 +517,19 @@ console.log('LPJ Data:', @json($resumeData));
             }
         });
 
+        document.querySelectorAll('table tbody tr').forEach(row => {
+            const imbData = {
+                sertifikat: row.querySelector('input[name="tambahan_sertifikat[]"]')?.value || "",
+                luas_tanah: row.querySelector('input[name="tambahan_luas_tanah[]"]')?.value || "",
+                luas_bangunan: row.querySelector('input[name="tambahan_luas_bangunan[]"]')?.value || "",
+                nilai: row.querySelector('input[name="tambahan_nilai[]"]')?.value || ""
+            };
+            console.log(imbData);
+            if (imbData.sertifikat) {
+                jsonData.tambahan.push(imbData);
+            }
+        });
+
         // Ambil keterangan
         const keterangan = formElement.querySelector('textarea[name="keterangan"]')?.value || "";
         jsonData.keterangan = keterangan;

From 785f9bf1d95d53a8e7f2daac1d586f05fb31fea8 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Sun, 29 Dec 2024 20:32:53 +0700
Subject: [PATCH 2/6] Refactor struktur menu otorisasi

- Menggabungkan menu "Otorisator", "Otorisasi Tender", "Approval Pembayaran", dan "Authorization" menjadi satu entitas dengan sub-menu sesuai peran.
- Memperbarui akses peran pada setiap sub-menu untuk memastikan hak akses yang sesuai.
- Menghapus redundansi pada menu dan menyederhanakan struktur navigasi.
---
 module.json | 199 +++++++++++++++++++++++++---------------------------
 1 file changed, 95 insertions(+), 104 deletions(-)

diff --git a/module.json b/module.json
index f70ecd2..e00f784 100644
--- a/module.json
+++ b/module.json
@@ -13,6 +13,101 @@
     ],
     "menu": {
         "main": [
+            {
+                "title": "Otorisator",
+                "path": "otorisator",
+                "icon": "ki-filled ki-security-user text-lg text-info",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
+                    "senior-officer",
+                    "pemohon-eo",
+                    "admin",
+                    "EO Appraisal",
+                    "DD Appraisal"
+                ],
+                "sub": [
+                    {
+                        "title": "Permohonan",
+                        "path": "authorization",
+                        "icon": "ki-filled ki-security-user text-lg text-info",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": [
+                            "administrator",
+                            "pemohon-eo"
+                        ]
+                    },
+                    {
+                        "title": "Otorisasi Penawaran",
+                        "path": "otorisasitender.penawaran",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": [
+                            "administrator",
+                            "admin",
+                            "EO Appraisal",
+                            "DD Appraisal"
+                        ]
+                    },
+                    {
+                        "title": "Pembayaran",
+                        "path": "pembayaran.approval",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": [
+                            "administrator",
+                            "admin",
+                            "EO Appraisal",
+                            "DD Appraisal"
+                        ]
+                    },
+                    {
+                        "title": "Pelaporan",
+                        "path": "otorisator.pelaporan",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": [
+                            "administrator",
+                            "senior-officer",
+                            "EO Appraisal",
+                            "DD Appraisal"
+                        ]
+                    },
+                    {
+                        "title": "Pembatalan",
+                        "path": "otorisator.pembatalan",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": [
+                            "administrator",
+                            "senior-officer",
+                            "EO Appraisal",
+                            "DD Appraisal"
+                        ]
+                    },
+                    {
+                        "title": "SLA",
+                        "path": "otorisator.sla",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": [
+                            "administrator",
+                            "senior-officer",
+                            "EO Appraisal",
+                            "DD Appraisal"
+                        ]
+                    }
+                ]
+            },
             {
                 "title": "Permohonan",
                 "path": "permohonan",
@@ -110,35 +205,6 @@
                     }
                 ]
             },
-            {
-                "title": "Otorisasi Tender",
-                "path": "otorisasitender",
-                "icon": "ki-filled ki-brifecase-tick text-lg text-info",
-                "classes": "",
-                "attributes": [],
-                "permission": "",
-                "roles": [
-                    "administrator",
-                    "admin",
-                    "EO Appraisal",
-                    "DD Appraisal"
-                ],
-                "sub": [
-                    {
-                        "title": "Otorisasi Penawaran",
-                        "path": "otorisasitender.penawaran",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "admin",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    }
-                ]
-            },
             {
                 "title": "SPK",
                 "path": "spk",
@@ -175,18 +241,6 @@
                     "pemohon-ao"
                 ]
             },
-            {
-                "title": "Approval Pembayaran",
-                "path": "pembayaran.approval",
-                "icon": "ki-filled ki-ensure text-lg text-info",
-                "classes": "",
-                "attributes": [],
-                "permission": "",
-                "roles": [
-                    "administrator",
-                    "admin"
-                ]
-            },
             {
                 "title": "Data Debitur",
                 "path": "debitur",
@@ -200,18 +254,6 @@
                     "pemohon-eo"
                 ]
             },
-            {
-                "title": "Authorization",
-                "path": "authorization",
-                "icon": "ki-filled ki-security-user text-lg text-info",
-                "classes": "",
-                "attributes": [],
-                "permission": "",
-                "roles": [
-                    "administrator",
-                    "pemohon-eo"
-                ]
-            },
             {
                 "title": "Assignment",
                 "path": "penilaian",
@@ -236,57 +278,6 @@
                     "senior-officer"
                 ]
             },
-            {
-                "title": "Otorisator",
-                "path": "otorisator",
-                "icon": "ki-filled ki-security-user text-lg text-info",
-                "classes": "",
-                "attributes": [],
-                "permission": "",
-                "roles": [
-                    "administrator",
-                    "senior-officer",
-                    "EO Appraisal",
-                    "DD Appraisal"
-                ],
-                "sub": [
-                    {
-                        "title": "Pelaporan",
-                        "path": "otorisator.pelaporan",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "senior-officer",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    },
-                    {
-                        "title": "Pembatalan",
-                        "path": "otorisator.pembatalan",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "senior-officer"
-                        ]
-                    },
-                    {
-                        "title": "SLA",
-                        "path": "otorisator.sla",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "senior-officer"
-                        ]
-                    }
-                ]
-            },
             {
                 "title": "Surveyor",
                 "path": "surveyor",

From c02c0cacc42ec53288679d222a063aeef5cf9501 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Sun, 29 Dec 2024 20:41:22 +0700
Subject: [PATCH 3/6] Filter data permohonan berdasarkan cabang pengguna
 non-administrator

- Menambahkan pengecekan role pengguna menggunakan `Auth`.
- Membatasi data permohonan hanya untuk cabang yang sesuai dengan pengguna non-administrator.
- Menghindari akses data lintas cabang untuk meningkatkan keamanan dan relevansi data.
---
 app/Http/Controllers/PermohonanController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index 8774786..45ce083 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -23,6 +23,7 @@
     use Modules\Lpj\Models\StatusPermohonan;
     use Modules\Lpj\Models\TujuanPenilaian;
     use Modules\Lpj\Services\PermohonanHistoryService;
+    use Illuminate\Support\Facades\Auth;
 
     class PermohonanController extends Controller
     {
@@ -180,6 +181,11 @@
 
             // Retrieve data from the database
             $query = Permohonan::query();
+
+            if(!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->where('branch_id', Auth::user()->branch_id);
+            }
+
             $query = $query->orderBy('nomor_registrasi', 'desc');
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {

From 86ad165caa5d8cd9417c2d3442e0bd9918bf25b3 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Sun, 29 Dec 2024 21:13:46 +0700
Subject: [PATCH 4/6] Perbarui struktur menu di module.json

- Memindahkan item "otorisator" ke struktur menu terpisah.
- Mengubah ikon pada beberapa menu untuk konsistensi visual.
- Menambahkan atribut ikon pada menu "Otorisasi Penawaran", "Pembayaran", "Pelaporan", "Pembatalan", dan "SLA".
- Memastikan peran (roles) tetap konsisten pada semua item menu.
---
 module.json | 157 ++++++++++++++++++++++++----------------------------
 1 file changed, 73 insertions(+), 84 deletions(-)

diff --git a/module.json b/module.json
index e00f784..9f089e1 100644
--- a/module.json
+++ b/module.json
@@ -12,102 +12,91 @@
         "app/Helpers/Lpj.php"
     ],
     "menu": {
-        "main": [
+        "otorisator": [
             {
-                "title": "Otorisator",
-                "path": "otorisator",
+                "title": "Permohonan",
+                "path": "authorization",
                 "icon": "ki-filled ki-security-user text-lg text-info",
                 "classes": "",
                 "attributes": [],
                 "permission": "",
                 "roles": [
                     "administrator",
-                    "senior-officer",
-                    "pemohon-eo",
+                    "pemohon-eo"
+                ]
+            },
+            {
+                "title": "Otorisasi Penawaran",
+                "path": "otorisasitender.penawaran",
+                "icon": "ki-filled ki-brifecase-tick text-lg text-info",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
                     "admin",
                     "EO Appraisal",
                     "DD Appraisal"
-                ],
-                "sub": [
-                    {
-                        "title": "Permohonan",
-                        "path": "authorization",
-                        "icon": "ki-filled ki-security-user text-lg text-info",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "pemohon-eo"
-                        ]
-                    },
-                    {
-                        "title": "Otorisasi Penawaran",
-                        "path": "otorisasitender.penawaran",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "admin",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    },
-                    {
-                        "title": "Pembayaran",
-                        "path": "pembayaran.approval",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "admin",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    },
-                    {
-                        "title": "Pelaporan",
-                        "path": "otorisator.pelaporan",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "senior-officer",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    },
-                    {
-                        "title": "Pembatalan",
-                        "path": "otorisator.pembatalan",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "senior-officer",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    },
-                    {
-                        "title": "SLA",
-                        "path": "otorisator.sla",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": [
-                            "administrator",
-                            "senior-officer",
-                            "EO Appraisal",
-                            "DD Appraisal"
-                        ]
-                    }
                 ]
             },
+            {
+                "title": "Pembayaran",
+                "path": "pembayaran.approval",
+                "icon": "ki-filled ki-ensure text-lg text-info",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
+                    "admin",
+                    "EO Appraisal",
+                    "DD Appraisal"
+                ]
+            },
+            {
+                "title": "Pelaporan",
+                "path": "otorisator.pelaporan",
+                "icon": "ki-filled ki-filter-tablet text-lg text-info",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
+                    "senior-officer",
+                    "EO Appraisal",
+                    "DD Appraisal"
+                ]
+            },
+            {
+                "title": "Pembatalan",
+                "path": "otorisator.pembatalan",
+                "icon": "ki-filled ki-file-deleted text-lg text-info",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
+                    "senior-officer",
+                    "EO Appraisal",
+                    "DD Appraisal"
+                ]
+            },
+            {
+                "title": "SLA",
+                "path": "otorisator.sla",
+                "icon": "ki-filled ki-calendar-tick text-lg text-info",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
+                    "senior-officer",
+                    "EO Appraisal",
+                    "DD Appraisal"
+                ]
+            }
+        ],
+        "main": [
             {
                 "title": "Permohonan",
                 "path": "permohonan",

From 21d1b6cd56c0e9e1514067238b58b0b8f2eb2d58 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Sun, 29 Dec 2024 21:40:58 +0700
Subject: [PATCH 5/6] Perbaiki logika render data pada tabel NOC

- Tambahkan pengecekan kondisi untuk memastikan properti `penawaran.permohonan` ada sebelum diakses.
- Tambahkan default return berupa string kosong ('') jika kedua kondisi tidak terpenuhi.
- Meningkatkan keandalan dan mencegah potensi error pada render data.
---
 resources/views/noc/index.blade.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/resources/views/noc/index.blade.php b/resources/views/noc/index.blade.php
index 035552a..f0b0460 100644
--- a/resources/views/noc/index.blade.php
+++ b/resources/views/noc/index.blade.php
@@ -127,8 +127,10 @@
                             render: (item, data) => {
                                 if(data.permohonan) {
                                     return `${data.permohonan.nomor_registrasi}`;
+                                } else if(data.penawaran.permohonan) {
+                                    return `${data.penawaran.permohonan.nomor_registrasi}`;
                                 }
-                                return `${data.penawaran.permohonan.nomor_registrasi}`;
+                                return '';
                             },
                         },
                         nama_debitur: {
@@ -136,8 +138,11 @@
                             render: (item, data) => {
                                 if(data.permohonan) {
                                     return `${data.permohonan.debiture.name}`;
+                                } else if(data.penawaran.permohonan) {
+                                    return `${data.penawaran.permohonan.debiture.name}`;
                                 }
-                                return `${data.penawaran.permohonan.debiture.name}`;
+                                return '';
+
                             },
                         },
                         cabang: {
@@ -145,8 +150,10 @@
                             render: (item, data) => {
                                 if(data.permohonan) {
                                     return `${data.permohonan.branch.name}`;
+                                } else if(data.penawaran.permohonan) {
+                                    return `${data.penawaran.permohonan.branch.name}`;
                                 }
-                                return `${data.penawaran.permohonan.branch.name}`;
+                                return '';
                             },
                         },
                         tanggal_setor: {

From 637b894b49c5d872aadc3d3288dfead8ead1e976 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Sun, 29 Dec 2024 21:42:14 +0700
Subject: [PATCH 6/6] Perbaiki logika validasi data penawaran

- Mengubah kondisi pengecekan pada data penawaran di beberapa kolom.
- Memastikan data ditampilkan dengan benar meskipun permohonan tidak tersedia.
---
 resources/views/noc/index.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/noc/index.blade.php b/resources/views/noc/index.blade.php
index f0b0460..65269c7 100644
--- a/resources/views/noc/index.blade.php
+++ b/resources/views/noc/index.blade.php
@@ -127,7 +127,7 @@
                             render: (item, data) => {
                                 if(data.permohonan) {
                                     return `${data.permohonan.nomor_registrasi}`;
-                                } else if(data.penawaran.permohonan) {
+                                } else if(data.penawaran) {
                                     return `${data.penawaran.permohonan.nomor_registrasi}`;
                                 }
                                 return '';
@@ -138,7 +138,7 @@
                             render: (item, data) => {
                                 if(data.permohonan) {
                                     return `${data.permohonan.debiture.name}`;
-                                } else if(data.penawaran.permohonan) {
+                                } else if(data.penawaran) {
                                     return `${data.penawaran.permohonan.debiture.name}`;
                                 }
                                 return '';
@@ -150,7 +150,7 @@
                             render: (item, data) => {
                                 if(data.permohonan) {
                                     return `${data.permohonan.branch.name}`;
-                                } else if(data.penawaran.permohonan) {
+                                } else if(data.penawaran) {
                                     return `${data.penawaran.permohonan.branch.name}`;
                                 }
                                 return '';