Merge remote-tracking branch 'origin/feature/senior-officer' into staging

app/Helpers/Lpj.php

@@ -373,13 +373,14 @@ function checkRegionUserName($userId)
     }
 }
 
-function getNomorLaporan($permohonanId, $documentId)
+function getNomorLaporan($permohonanId, $documentId, $type = 'nomor_laporan')
 {
+
     $laporan = Laporan::where([
         'permohonan_id' => $permohonanId,
         'dokumen_jaminan_id' => $documentId,
     ])->first();
-    return $laporan->nomor_laporan ?? null;
+    return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at;
 }
 
 function getCustomField($param)

resources/views/penilai/components/foto-lampiran.blade.php

@@ -116,7 +116,7 @@
         'foto_sentuh_tanahku' => 'Sentuh Tanahku',
         'foto_gistaru' => 'Gistaru',
         'foto_bhumi' => 'Bhumi',
-        'foto_argis_region' => 'Region',
+        'foto_argis_region' => 'Blad Tata Ruang',
         'foto_tempat' => 'Tempat',
     ];
 
@@ -139,8 +139,8 @@
 @if ($adaFoto)
     <div class="card">
         <div class="card-header bg-agi-50" id="basic_settings">
-            <h3 class="card-title">
+            <h3 class="card-title uppercase">
-                Peta, dan tata ruang, blad
+                GS, Tata Ruang dan Peta
             </h3>
         </div>
         <div class="card-body">

resources/views/penilai/show.blade.php

@@ -168,7 +168,7 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                                {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</p>
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -177,7 +177,12 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+
+                                @php
+                                    $tglLaporan = getNomorLaporan($permohonan->id, $dokumen->id, 'tanggal_laporan');
+                                @endphp
+
+                                {{ isset($tglLaporan) ? formatTanggalIndonesia($tglLaporan) : '-' }}</p>
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -220,7 +225,7 @@
                     <div class="flex  gap-5">
                         <a class="btn btn-primary"
                             href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}">
-                            Lampiran Foto dan Dokument
+                            Lampiran Foto dan Dokumen
                         </a>
                         @if (strtolower($permohonan->tujuanPenilaian->name) != 'rap')
                             <a class="btn btn-primary" data-modal-toggle="#modal_2">

resources/views/surveyor/components/data-pembanding.blade.php

@@ -702,8 +702,8 @@
                                     console.log(
                                         'Current route matches');
                                 } else {
-                                    window.location.href =
+                                    // window.location.href =
-                                        "{{ route('surveyor.show', ['id' => $permohonan->id]) }}";
+                                    //     "{{ route('surveyor.show', ['id' => $permohonan->id]) }}";
                                 }
                             }
 
@@ -743,6 +743,75 @@
                     input.value = formatCurrency(input.value);
                 }
             });
+
+
+            // hide the "Lihat Objek Penilaian" toggle
+            const tableContainer = document.querySelector('.scrollable-x-auto');
+            const toggleContainer = document.createElement('div');
+            toggleContainer.className = 'flex items-center gap-4 mb-4 p-3 bg-gray-50 rounded';
+
+            const objekToggle = createCustomSwitch('Lihat Objek Penilaian', false, function(checked) {
+                toggleColumn(1, checked);
+            });
+
+            toggleContainer.appendChild(objekToggle);
+
+            tableContainer.parentNode.insertBefore(toggleContainer, tableContainer);
+
+            function createCustomSwitch(label, initialState, onChangeCallback) {
+                const container = document.createElement('div');
+
+                const switchLabel = document.createElement('label');
+                switchLabel.className = 'switch';
+
+                const input = document.createElement('input');
+                input.name = "check";
+                input.type = "checkbox";
+                input.value = "1";
+                input.checked = initialState;
+
+                const span = document.createElement('span');
+                span.className = 'switch-label';
+                span.textContent = label;
+
+                switchLabel.appendChild(input);
+                switchLabel.appendChild(span);
+                container.appendChild(switchLabel);
+
+
+                input.addEventListener('change', function() {
+                    onChangeCallback(this.checked);
+                });
+
+                return container;
+            }
+
+            function toggleColumn(columnIndex, show) {
+                const table = document.getElementById('dataTable');
+                const rows = table.querySelectorAll('tr');
+
+                rows.forEach(row => {
+
+                    const cells = row.querySelectorAll('td, th');
+                    if (cells.length === 1 && cells[0].hasAttribute('colspan')) {
+                        return;
+                    }
+
+
+                    if (cells[columnIndex]) {
+                        cells[columnIndex].style.display = show ? '' : 'none';
+                    }
+                });
+
+
+                const headerRow = table.querySelector('thead tr');
+                const headerCells = headerRow.querySelectorAll('th');
+                if (headerCells[columnIndex]) {
+                    headerCells[columnIndex].style.display = show ? '' : 'none';
+                }
+            }
+
+            toggleColumn(1, false);
         });
     </script>
 @endpush

resources/views/surveyor/components/denah.blade.php

@@ -351,8 +351,8 @@
                             confirmButtonText: 'OK'
                         }).then((response) => {
                             if (response.isConfirmed) {
-                                window.location.href =
+                                // window.location.href =
-                                    '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
+                                //     '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
                             }
                         });
                     } else {

resources/views/surveyor/components/print-out/bangunan.blade.php

@@ -39,7 +39,7 @@
                         <td>
                             <label>
                                 <input type="radio" name="luas_bangunan_radio" value="tidak sesuai" {{ $cekLuasBangunan == 'tidak sesuai' ? 'checked' : '' }}>
-                                Tidak Sesuai {{ $luasBangunanTidakSesuai ? '- '. $luasBangunanTidakSesuai . ' m²' : '' }}
+                                Tidak Sesuai {{ $luasBangunanTidakSesuai ? '- '. $luasBangunanTidakSesuai . ' m² (luas fisik)' : '' }}
                             </label>
                         </td>
                     </tr>

resources/views/surveyor/components/print-out/informasi.blade.php

@@ -60,7 +60,7 @@
                 'foto_gistaru' => 'Gistaru',
                 'foto_bhumi' => 'Bhumi',
                 'foto_argis_region' => 'Blad Tata Ruang ',
-                'foto_tempat' => 'Tempat',
+                'foto_tempat' => 'Peta Lokasi',
             ];
             // Memindahkan foto_tempat ke depan jika ada
             if (($key = array_search('upload_gs', $fotoTypes)) !== false) {

resources/views/surveyor/components/print-out/lingkungan.blade.php

@@ -296,8 +296,8 @@
         <td class="checkbox-item">
             <label class="checkbox-label">
                 <input type="checkbox"
-                    {{ isset($forminspeksi['lingkungan']['fasilitas_dekat_object']) && in_array($item->name, $forminspeksi['lingkungan']['fasilitas_dekat_object']) ? 'checked' : '' }}>
+                    {{ isset($forminspeksi['lingkungan']['fasilitas_dekat_object']) && $forminspeksi['lingkungan']['fasilitas_dekat_object_input'][$item->name] ? 'checked' : '' }}>
-                {{ $item->name }}
+               {{ $item->name}}  {{isset($forminspeksi['lingkungan']['fasilitas_dekat_object_input'][$item->name]) ? '('. $forminspeksi['lingkungan']['fasilitas_dekat_object_input'][$item->name] .')' : ''}}
             </label>
         </td>
         @endforeach

resources/views/surveyor/components/print-out/main.blade.php

@@ -150,6 +150,7 @@
         }
 
     }
+
     </style>
 
 </head>
@@ -207,6 +208,10 @@
         </table>
     </header>
 
+    <div style="text-align: center; text-transform: uppercase; font-weight: bold;">
+        <h1 style="font-size: 14px;">
+            FORM INSPEKSI {{ $data ?? '' }}
+        </h1></div>
     <div style="border: 1px solid #000;">
         <table
             style="width: 100%; border-top: none; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
@@ -239,12 +244,14 @@
                         </tr>
 
                         <tr>
-                            <td style="width: 25%; padding: 2px;">Debitur/Perwakilan</td>
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Debitur/Perwakilan</td>
-                            <td style="width: 1%;  padding: 2px;">:</td>
+                            <td style="width: 1%;  padding: 2px; vertical-align: top;">:</td>
                             <td style="vertical-align: top;  padding: 2px;">
                                 @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan']))
                                     @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item)
+                                    <p style="margin: 0; padding:0;">
                                         {{ $item }}
+                                    </p>
                                     @endforeach
                                 @endif
                             </td>
@@ -607,7 +614,7 @@
 
 
     <footer id="footer">
-        Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
+        {{-- Cabang : {{ $permohonan->debiture->branch->name ?? '' }} --}}
     </footer>
     <script type="text/php">
         if (isset($pdf)) {