perbaikan upload foto dan print out rap, standard dan resume

app/Http/Controllers/PenilaiController.php

@@ -318,6 +318,7 @@ class PenilaiController extends Controller
         $provinces = Province::all();
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
         $noLpRAP =     $this->generateNoLaporan($permohonan, $documentId, 'rap');
+        $basicData =  $this->surveyorController->getCommonData();
         $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
         Penilai::updateOrCreate(
             [
@@ -340,7 +341,7 @@ class PenilaiController extends Controller
             $rap = json_decode($resume->rap, true);
         }
 
-        return view('lpj::penilai.components.rap-penilai', compact('permohonan', 'rap', 'provinces', 'forminspeksi', 'noLpRAP'));
+        return view('lpj::penilai.components.rap-penilai', compact('permohonan', 'rap', 'provinces', 'forminspeksi', 'noLpRAP','basicData'));
     }
 
 
@@ -374,7 +375,7 @@ class PenilaiController extends Controller
             });
         }
 
-        $query->whereRaw('LOWER(status) IN (?, ?, ?)', ['assign','done', 'proses-laporan']);
+        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?)', ['assign','done', 'proses-laporan', 'paparan', 'proses-paparan']);
 
         if (!Auth::user()->hasRole('administrator')) {
             $query->whereHas('penilaian.userPenilai', function ($q) {
@@ -905,6 +906,7 @@ class PenilaiController extends Controller
         try {
 
             if ($statusLpj) {
+                //   $pdf = view('lpj::' . $viewLaporan, compact(
                 $pdf = PDF::loadView('lpj::' . $viewLaporan, compact(
                     'permohonan',
                     'forminspeksi',
@@ -922,7 +924,7 @@ class PenilaiController extends Controller
                     'tanggalLaporan',
                     'rap'
                 ));
-
+    // return $pdf;
                 $pdf->setPaper('A4', 'portrait');
                 return  $pdf->stream();
             } else {

app/Http/Controllers/SurveyorController.php

@@ -277,7 +277,7 @@ class SurveyorController extends Controller
 
                         if ($request->hasFile('foto_denah') && isset($request->file('foto_denah')[$index])) {
                             $file = $request->file('foto_denah')[$index];
-                            $denahItem['foto_denah'] = $this->uploadFile($file, $request->nomor_registrasi);
+                            $denahItem['foto_denah'] = $this->uploadFile($file, 'foto_denah');
                         } elseif (isset($existingDenahs[$index]['foto_denah'])) {
                             $denahItem['foto_denah'] = $existingDenahs[$index]['foto_denah'];
                         }
@@ -382,7 +382,7 @@ class SurveyorController extends Controller
                     }
 
                     // Upload dan simpan file baru
-                    $formatFotojson[$file] = $this->uploadFile($request->file($file), $request->nomor_registrasi);
+                    $formatFotojson[$file] = $this->uploadFile($request->file($file), $file);
 
                 }
             }
@@ -455,7 +455,7 @@ class SurveyorController extends Controller
 
                 // Simpan file dengan nama asli
                 $path = $file->storeAs(
-                    'surveyor/' . $request->nomor_registrasi . '/foto_lantai_unit',
+                     'surveyor/lantai_unit',
                     $uniqueFileName . '/' . time() . '_' . $file->getClientOriginalName(),
                     'public'
                 );
@@ -493,12 +493,13 @@ class SurveyorController extends Controller
 
             foreach ($files as $index => $file) {
 
-                $fileExtension = $file->extension();
+                $timestamp = time();
-                $originalName = time() . '_' . $request->nomor_registrasi . '.' . $fileExtension;
+                $originalName = $file->getClientOriginalName();
+                $uniqueFileName = "{$timestamp}_{$originalName}";
 
 
                 // Simpan file
-                $path = $file->storeAs("surveyor/{$request->nomor_registrasi}", $originalName, 'public');
+                $path = $file->storeAs("surveyor/{$paramName}", $uniqueFileName, 'public');
 
                 $fotoData = [
                     'path' => $path,
@@ -656,7 +657,7 @@ class SurveyorController extends Controller
                 // Buat entri baru untuk file yang diunggah
                 $newPhotoEntry = [
                     $nameField => $newNames[$key],
-                    $photoField => $this->uploadFile($file, $request->nomor_registrasi),
+                    $photoField => $this->uploadFile($file, $photoField . '.' . $key),
                     $descriptionField => $newDescriptions[$key] ?? '',
                 ];
 
@@ -780,7 +781,7 @@ class SurveyorController extends Controller
                 // Create new photo entry
                 $newPhotoEntry = [
                     $nameField => $newNames[$key] ?? '', // Use new name if provided
-                    $photoField => $this->uploadFile($file, $request->nomor_registrasi)
+                    $photoField => $this->uploadFile($file, $photoField . '.' . $key)
                 ];
 
                 // Add description if field exists
@@ -2620,9 +2621,8 @@ class SurveyorController extends Controller
         if ($request->hasFile($fileKey)) {
             $file = $request->file($fileKey);
             if ($file->isValid()) {
-                $fileExtension = $file->extension();
+                $fileName = time() . '_' . $file->getClientOriginalName();
-                $fileName = time() . '_' . $request->nomor_registrasi . '.' . $fileExtension;
+                $path = $file->storeAs("public/surveyor/{$request->type}", $fileName);
-                $path = $file->storeAs("public/surveyor/{$request->nomor_registrasi}", $fileName);
 
                 if ($path === false) {
                     throw new Exception("Failed to store file for {$fileKey}");
@@ -3097,8 +3097,7 @@ class SurveyorController extends Controller
             throw new Exception("Invalid file upload for {$type}");
         }
 
-        $fileExtension = $file->extension();
+        $fileName = time() . '_' . $file->getClientOriginalName();
-        $fileName = time() . '_' . $type . '.' . $fileExtension;
         $path = $file->storeAs("public/surveyor/{$type}", $fileName);
 
         if ($path === false) {

resources/views/penilai/components/print-memo.blade.php

@@ -27,8 +27,8 @@
         }
 
         #header {
-            /* position: fixed; */
+            position: fixed;
-            /* top: -100px; */
+            top: -100px;
             /* Posisi header di luar konten */
             left: 0;
             right: 0;
@@ -221,33 +221,52 @@
             </tr>
 
             @if (@isset($dokumen))
-                @foreach ($dokumen->detail as $details)
+            @foreach ($dokumen->detail as $detail)
-                    <tr>
+                <tr>
-                        <td style="width: 20%; padding: 2px;">{{ $details->jenisLegalitasJaminan->name ?? '' }}</td>
+                    @if (isset($detail->dokumen_jaminan))
-                        <td style="width: 1%;  padding: 2px;">:</td>
+                        <td style=" padding: 2px;">
-                        <td style="width: 79%;  padding: 2px;">
+                            {{ $detail->name ?? '' }}
+                        </td>
+                        <td style=" padding: 2px;">:</td>
+                        <td style=" padding: 2px;">
                             @if (isset($detail->dokumen_jaminan))
                                 @php
+                                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
+                                        ? json_decode($detail->dokumen_jaminan)
+                                        : [$detail->dokumen_jaminan];
                                     $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
                                         ? json_decode($detail->dokumen_nomor)
                                         : ($detail->dokumen_nomor
                                             ? [$detail->dokumen_nomor]
                                             : []);
                                 @endphp
+
                                 @foreach ($dokumen_jaminan as $index => $dokumen)
                                     <div>
-                                        @if (!empty($dokumen_nomor))
+                                        @if (!empty($dokumen_nomor[$index]))
-                                            <span>
+                                            <span>{{ $dokumen_nomor[$index] }}</span>
-                                                {{ $dokumen_nomor[$index] }}</span>
                                         @endif
                                     </div>
-                                    <br>
                                 @endforeach
                             @endif
                         </td>
-                    </tr>
+                    @endif
-                @endforeach
+                </tr>
-            @endif
+
+                <tr>
+                    @if (isset($detail->details))
+                        @if (json_decode($detail->details))
+                            @foreach (json_decode($detail->details) as $key => $value)
+                                <td style="">
+                                    {{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
+                                    <td style=" padding: 2px;">:</td>
+                                <td style="">{{ $value ?? '' }} <sup> m2</sup></td>
+                            @endforeach
+                        @endif
+                    @endif
+                </tr>
+            @endforeach
+        @endif
 
 
             <tr>
@@ -256,18 +275,6 @@
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
 
-            <tr>
-                @php
-                    $cekLuas = isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai';
-
-                    $luas = $forminspeksi['tanah']['luas_tanah'][$cekLuas] ?? null;
-                @endphp
-                <td style="width: 20%; padding: 2px;">Luas Tanah</td>
-                <td style="width: 1%;  padding: 2px;">:</td>
-                <td style="width: 79%;  padding: 2px;">{{ $luas ?? '' }}</td>
-            </tr>
-
-
             <tr>
                 <td style="width: 20%; padding: 2px;">Lokasi Jaminan</td>
                 <td style="width: 1%;  padding: 2px;">:</td>

resources/views/penilai/components/print-out-rap.blade.php

@@ -158,11 +158,11 @@
 
         <div style="border-top: 1px solid black; width: 100%;"></div>
 
-        <h2 style="text-transform: uppercase;">Copy Dokumen yang Dilampirkan</h2>
+        <h2 style="text-transform: uppercase;">DOKUMEN TERLAMPIR</h2>
         <table style="width: 100%;">
-            $senior_officer = null;
             @foreach ($permohonan->debiture->documents as $dokumen)
                 @php
+                    $senior_officer = null;
                     $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
                     $teams = $permohonan->region->teams;
 
@@ -210,116 +210,195 @@
             @endforeach
         </table>
 
-        <h2 style="text-transform: uppercase;">Informasi Perusahaan/Kondisi dan Lingkungan Sekitar</h2>
+        <h2 style="text-transform: uppercase;">DESKRIPSI DEVELOPER</h2>
         <table style="width: 100%;">
             <tr>
-                <td>{{ $permohonan->debiture->name ?? '' }} {{ $forminspeksi['pengalaman_developer'] ?? '' }}
+                <td>{{ $forminspeksi['pengalaman_developer'] ?? '' }}
-                    {{ $forminspeksi['developer_anggota'] ?? '' }}
+                </td>
-                    <p style="padding-left: 15px;">
+            </tr>
+            <tr>
+                <td>{{ $forminspeksi['developer_anggota'] ?? '' }}</td>
+            </tr>
 
-                        @isset($forminspeksi['lainnya_developer'])
+            @isset($forminspeksi['lainnya_developer'])
-                            @foreach ($forminspeksi['lainnya_developer'] as $item)
+                @foreach ($forminspeksi['lainnya_developer'] as $item)
-                                <div>{{ $item }}</div>
+                    <tr>
-                            @endforeach
+                        <td>
-                        @endisset
+                            {{ $item }}
-                    </p>
+                        </td>
+                    </tr>
+                @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN</h2>
+        <table style="width: 100%;">
+            <tr>
+                <td>{{ $forminspeksi['kapan_mulai_dibangun'] ?? '' }}
                 </td>
             </tr>
             <tr>
-                <td>{{ $forminspeksi['kapan_mulai_dibangun'] ?? '' }}<br>
+                <td> {{ $forminspeksi['kondisi_perumahan'] ?? '' }}</td>
-                    <p style="padding-left: 15px;">
-                        {{ $forminspeksi['kondisi_perumahan'] ?? '' }}<br>
-                        {{ $forminspeksi['progres_pembangunan'] ?? '' }}<br>
-                        {{ $forminspeksi['kontraktor'] ?? '' }}
-                    </p>
-                </td>
-            </tr>
-            <tr>
-                <td>{{ $forminspeksi['kontraktor'] ?? '' }}</td>
             </tr>
+
             <tr>
                 <td>
-                    @isset($forminspeksi['kerjasama_dengan_bank'])
+                    {{ $forminspeksi['progres_pembangunan'] ?? '' }}
-                        @foreach ($forminspeksi['kerjasama_dengan_bank'] as $item)
+
-                            <div>{{ $item }}</div>
-                        @endforeach
-                    @endisset
-                    <p style="padding-left: 15px;">
-                        @isset($forminspeksi['batas_batas_perumahan'])
-                            @foreach ($forminspeksi['batas_batas_perumahan'] as $item)
-                                <div>{{ $item }}</div>
-                            @endforeach
-                        @endisset
-                    </p>
                 </td>
             </tr>
             <tr>
                 <td>
-                    @isset($forminspeksi['harga_unit'])
+                    {{ $forminspeksi['kontraktor'] ?? '' }}
-                        @foreach ($forminspeksi['harga_unit'] as $item)
+
-                            <div>{{ $item }}</div>
-                        @endforeach
-                    @endisset
-                    <p style="padding-left: 15px;">
-                        @isset($forminspeksi['progres_penjualan'])
-                            @foreach ($forminspeksi['progres_penjualan'] as $item)
-                                <div>{{ $item }}</div>
-                            @endforeach
-                        @endisset
-                    </p>
                 </td>
             </tr>
-            <tr>
-                <td>
-                    @isset($forminspeksi['fasus_fasum'])
-                        @foreach ($forminspeksi['fasus_fasum'] as $item)
-                            <div>{{ $item }}</div>
-                        @endforeach
-                    @endisset
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    @isset($forminspeksi['target_market'])
-                        @foreach ($forminspeksi['target_market'] as $item)
-                            <div>{{ $item }}</div>
-                        @endforeach
-                    @endisset
-                </td>
-            </tr>
-            <tr>
-                <td>{{ $forminspeksi['kontraktor'] ?? '' }}</td>
-            </tr>
             <tr>
                 <td>{{ $forminspeksi['lingkungan_sekitar'] ?? '' }}</td>
             </tr>
             <tr>
-                <td>{{ $forminspeksi['rute_menuju_lokasi'] ?? '' }}</td>
+                <td>{{ $forminspeksi['komplek_disekitar'] ?? '' }}</td>
             </tr>
+            <tr>
+                <td>{{ $forminspeksi['pusat_keramaian'] ?? '' }}</td>
+            </tr>
+            <tr>
+                <td>{{ $forminspeksi['transportasi_umum'] ?? '' }}</td>
+            </tr>
+
+            @isset($forminspeksi['lainnya_kondisi'])
+                @foreach ($forminspeksi['lainnya_kondisi'] as $item)
+                    <tr>
+                        <td>
+                            {{ $item }}
+                        </td>
+                    </tr>
+                @endforeach
+            @endisset
+
+
+        </table>
+
+        <h2 style="text-transform: uppercase;">PARTISI BANGUNAN</h2>
+        <table>
+            @isset($forminspeksi['jumlah_unit'])
+            @foreach ($forminspeksi['jumlah_unit'] as $item)
             <tr>
                 <td>
-                    <p style="padding-left: 15px;">
+                     {{ $item }}
-
-                        {{ $forminspeksi['fakta']['peruntukan'] ?? '' }}<br>
-                        {{ $forminspeksi['fakta']['gsb'] ?? '' }}<br>
-                        {{ $forminspeksi['fakta']['kdb'] ?? '' }}<br>
-                        {{ $forminspeksi['fakta']['klb'] ?? '' }}
-                    </p>
                 </td>
             </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN</h2>
+        <table>
+            @isset($forminspeksi['jumlah_unit'])
+            @foreach ($forminspeksi['jumlah_unit'] as $item)
             <tr>
-                <td>13. {{ $forminspeksi['rute_menuju_lokasi'] ?? '' }}</td>
+                <td>
+                     {{ $item }}
+                </td>
             </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">BATAS-BATAS PERUMAHAN</h2>
+        <table>
+            @isset($forminspeksi['batas_batas_perumahan'])
+            @foreach ($forminspeksi['batas_batas_perumahan'] as $item)
+            <tr>
+                <td>
+                     {{ $item }}
+                </td>
+            </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">FASOS/FASUM</h2>
+        <table>
+            @isset($forminspeksi['fasus_fasum'])
+            @foreach ($forminspeksi['fasus_fasum'] as $item)
+            <tr>
+                <td>
+                     {{ $item }}
+                </td>
+            </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">PROGRES PENJUALAN SAAT INI</h2>
+        <table>
+            @isset($forminspeksi['progres_penjualan'])
+            @foreach ($forminspeksi['progres_penjualan'] as $item)
+            <tr>
+                <td>
+                     {{ $item }}
+                </td>
+            </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">HARGA UNIT</h2>
+        <table>
+            @isset($forminspeksi['harga_unit'])
+            @foreach ($forminspeksi['harga_unit'] as $item)
+            <tr>
+                <td>
+                     {{ $item }}
+                </td>
+            </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">TARGET MARKET</h2>
+        <table>
+            @isset($forminspeksi['target_market'])
+            @foreach ($forminspeksi['target_market'] as $item)
+            <tr>
+                <td>
+                     {{ $item }}
+                </td>
+            </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">KERJASAMA DENGAN BANK LAIN</h2>
+        <table>
+            @isset($forminspeksi['kerjasama_dengan_bank'])
+            @foreach ($forminspeksi['kerjasama_dengan_bank'] as $item)
+            <tr>
+                <td>
+                     {{ $item }}
+                </td>
+            </tr>
+            @endforeach
+            @endisset
+        </table>
+        <h2 style="text-transform: uppercase;">RUTE MENUJU LOKASI</h2>
+        <table>
 
             <tr>
                 <td>
-                    @isset($forminspeksi['keterangan'])
+                     {{  $forminspeksi['rute_menuju_lokasi'] ?? '' }}
-                        @foreach ($forminspeksi['keterangan'] as $item)
-                            <div>{{ $item }}</div>
-                        @endforeach
-                    @endisset
                 </td>
             </tr>
+
+        </table>
+        <h2 style="text-transform: uppercase;">ATURAN TATA KOTA</h2>
+        <h2 style="text-transform: uppercase;">CATATAN LAINNYA</h2>
+        <table>
+
+                   @isset($forminspeksi['keterangan'])
+                       @foreach ($forminspeksi['keterangan'] as $item)
+            <tr>
+                <td>
+                          {{ $item }}
+                        </td>
+                    </tr>
+                    @endforeach
+                @endisset
+
+
         </table>
 
         <p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p>
@@ -364,19 +443,19 @@
             <tr>
                 <td></td>
                 <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
-                    <br>{{ ucwords(strtolower('PENILAI'))}}
+                    <br>{{ ucwords(strtolower('PENILAI')) }}
                 </td>
                 <td>
                     @if ($permohonan->approval_eo != null)
-                    {{ $senior_officer->name ?? '' }}
+                        {{ $senior_officer->name ?? '' }}
-                    <br> {{ ucwords(strtolower('SENIOR OFFICER'))}}
+                        <br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
                     @endif
                 </td>
 
                 <td>
                     @if ($permohonan->approval_dd != null)
-                    {{ User::role('DD Appraisal')->first()->name ?? '' }}
+                        {{ User::role('DD Appraisal')->first()->name ?? '' }}
-                    <br>{{ ucwords(strtolower('DEPUTY DIRECTOR'))}}
+                        <br>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
                     @endif
                 </td>
             </tr>

resources/views/penilai/components/print-resume.blade.php

@@ -26,8 +26,8 @@
         }
 
         #header {
-            /* position: fixed; */
+            position: fixed;
-            /* top: -100px; */
+            top: -100px;
             /* Posisi header di luar konten */
             left: 0;
             right: 0;
@@ -195,28 +195,33 @@
                 <td style="vertical-align: top; padding:2px;">
                     <table>
                         @if (@isset($dokumen))
-                            @foreach ($dokumen->detail as $details)
+                            @foreach ($dokumen->detail as $detail)
                                 <tr>
-                                    <td>{{ $details->jenisLegalitasJaminan->name ?? '' }}
+                                    @if (isset($detail->dokumen_jaminan))
+                                    <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+                                    <td>
                                         @if (isset($detail->dokumen_jaminan))
                                             @php
+                                                $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
+                                                    ? json_decode($detail->dokumen_jaminan)
+                                                    : [$detail->dokumen_jaminan];
                                                 $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
                                                     ? json_decode($detail->dokumen_nomor)
                                                     : ($detail->dokumen_nomor
                                                         ? [$detail->dokumen_nomor]
                                                         : []);
                                             @endphp
+
                                             @foreach ($dokumen_jaminan as $index => $dokumen)
                                                 <div>
-                                                    @if (!empty($dokumen_nomor))
+                                                    @if (!empty($dokumen_nomor[$index]))
-                                                        <span>
+                                                        <span>{{ $dokumen_nomor[$index] }}</span>
-                                                            {{ $dokumen_nomor[$index] }}</span>
                                                     @endif
                                                 </div>
-                                                <br>
                                             @endforeach
                                         @endif
                                     </td>
+                                @endif
                                 </tr>
                             @endforeach
                         @endif
@@ -238,6 +243,11 @@
                 <td>:</td>
                 <td>{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
             </tr>
+            <tr>
+                <td>Surveyor</td>
+                <td>:</td>
+                <td>{{ $surveyor->userPenilaiTeam->name ?? '' }}</td>
+            </tr>
 
             <tr>
                 <td>Tanggal Resume</td>
@@ -422,9 +432,6 @@
 
                     </tr>
                     <tr>
-                        <td> {{ $surveyor->userPenilaiTeam->name ?? '' }}</br>
-                            {{ ucwords(strtolower('SURVEYOR'))}}
-                        </td>
                         <td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
                             {{ ucwords(strtolower('PENILAI'))}}
                         </td>
@@ -446,6 +453,12 @@
                             {{ ucwords(strtolower('EXECUTIVE OFFICER'))}}
                             @endif
                         </td>
+                        <td>
+                            @if ($permohonan->approval_eo != null)
+                            {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                            {{ ucwords(strtolower('DEPUTY DIRECTOR'))}}
+                            @endif
+                        </td>
 
                     </tr>
                 </table>