Merge pull request 'feature/senior-officer' (#125) from feature/senior-officer into staging

Reviewed-on: #125

app/Http/Controllers/PenilaiController.php

@@ -109,7 +109,34 @@ class PenilaiController extends Controller
             $lpjData = json_decode($lpj->lpj, true);
         }
 
-        return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces'));
+        $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null;
+
+        if ($cekAlamat) {
+            $provinceCode = $cekAlamat['province_code'] ?? $provinceCode;
+            $cityCode     = $cekAlamat['city_code'] ?? $cityCode;
+            $districtCode = $cekAlamat['district_code'] ?? $districtCode;
+            // Ambil data menggunakan kode yang telah ditentukan
+
+        }
+        $cities    = City::where('province_code', $provinceCode)->get();
+        $districts = District::where('city_code', $cityCode)->get();
+        $villages  = Village::where('district_code', $districtCode)->get();
+
+        if ($forminspeksi) {
+            if (isset($forminspeksi['alamat']['sesuai']['province_code'])) {
+                $cities = City::where('province_code', $forminspeksi['alamat']['sesuai']['province_code'])->get();
+            }
+
+            if (isset($forminspeksi['alamat']['sesuai']['city_code'])) {
+                $districts = District::where('city_code', $forminspeksi['alamat']['sesuai']['city_code'])->get();
+            }
+
+            if (isset($forminspeksi['alamat']['sesuai']['district_code'])) {
+                $villages = Village::where('district_code', $forminspeksi['alamat']['sesuai']['district_code'])->get();
+            }
+        }
+
+        return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages'));
     }
 
     public function standard(Request $request, $id)
@@ -146,7 +173,34 @@ class PenilaiController extends Controller
             $lpjData = json_decode($lpj->lpj, true);
         }
 
-        return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces'));
+        $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null;
+
+        if ($cekAlamat) {
+            $provinceCode = $cekAlamat['province_code'] ?? $provinceCode;
+            $cityCode     = $cekAlamat['city_code'] ?? $cityCode;
+            $districtCode = $cekAlamat['district_code'] ?? $districtCode;
+            // Ambil data menggunakan kode yang telah ditentukan
+
+        }
+        $cities    = City::where('province_code', $provinceCode)->get();
+        $districts = District::where('city_code', $cityCode)->get();
+        $villages  = Village::where('district_code', $districtCode)->get();
+
+        if ($forminspeksi) {
+            if (isset($forminspeksi['alamat']['sesuai']['province_code'])) {
+                $cities = City::where('province_code', $forminspeksi['alamat']['sesuai']['province_code'])->get();
+            }
+
+            if (isset($forminspeksi['alamat']['sesuai']['city_code'])) {
+                $districts = District::where('city_code', $forminspeksi['alamat']['sesuai']['city_code'])->get();
+            }
+
+            if (isset($forminspeksi['alamat']['sesuai']['district_code'])) {
+                $villages = Village::where('district_code', $forminspeksi['alamat']['sesuai']['district_code'])->get();
+            }
+        }
+
+        return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages'));
     }
 
     public function resume(Request $request)
@@ -989,21 +1043,8 @@ class PenilaiController extends Controller
     {
         DB::beginTransaction();
         try {
-            $formRequest = new FormSurveyorRequest();
-            $formRequest->setContainer(app());
-            $formRequest->initialize(
-                $request->all(),
-                $request->query->all(),
-                $request->attributes->all(),
-                $request->cookies->all(),
-                $request->files->all(),
-                $request->server->all(),
-                $request->getContent()
-            );
 
-            $validated = $formRequest->validateResolved();
-
-            $result = $this->surveyorController->store($formRequest);
+            $result = $this->surveyorController->store($request);
 
 
             $data = [
@@ -1061,7 +1102,7 @@ class PenilaiController extends Controller
                 'message' => 'Berhasil menyimpan LPJ',
                 'data' => $result
             ], 200);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e) {
             DB::rollBack();
             return response()->json([
                 'success' => false,
@@ -1409,7 +1450,7 @@ class PenilaiController extends Controller
 
     public function generateNoLaporan($permohonan, $documentId, $type)
     {
-        $typeMapping = ['sederhana' => 'LPJ', 'standard' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR'];
+        $typeMapping = ['lpj' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR'];
 
         // Cek apakah data sudah ada
         $laporan = Laporan::where([
@@ -1698,7 +1739,7 @@ class PenilaiController extends Controller
 
         $permohonan->update([
             'status' => 'revisi-survey',
-            'keterangan' => $request->keterangan,
+            'keterangan' => $request->message,
             'submitted_at' => now()
         ]);
 

app/Http/Requests/FormSurveyorRequest.php

@@ -626,6 +626,8 @@ class FormSurveyorRequest extends FormRequest
             'foto_bhumi' => 'nullable',
             'foto_argis_region' => 'nullable',
             'foto_tempat' => 'nullable',
+            'upload_gs' => 'nullable',
+            'foto_sentuh_tanahku' => 'nullable',
             'keterangan' => 'nullable|array',
         ];
     }
@@ -687,6 +689,8 @@ class FormSurveyorRequest extends FormRequest
             'foto_bhumi' => 'nullable',
             'foto_argis_region' => 'nullable',
             'foto_tempat' => 'nullable',
+            'upload_gs' => 'nullable',
+            'foto_sentuh_tanahku' => 'nullable',
             'keterangan' => 'nullable|array',
 
         ];

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

@@ -109,10 +109,20 @@
 
 
 @php
-    $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat', 'foto_sentuh_tanahku'];
-    if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
+    $fotoTypes = ['upload_gs','foto_sentuh_tanahku','foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
+
+    $customLabels = [
+        'upload_gs' => 'Gambar Situasi',
+        'foto_sentuh_tanahku' => 'Sentuh Tanahku',
+        'foto_gistaru' => 'Gistaru',
+        'foto_bhumi' => 'Bhumi',
+        'foto_argis_region' => 'Region',
+        'foto_tempat' => 'Tempat',
+    ];
+
+    if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
         unset($fotoTypes[$key]);
-        array_unshift($fotoTypes, 'foto_tempat');
+        array_unshift($fotoTypes, 'upload_gs');
     }
     $adaFoto = false;
     if (isset($forminspeksi)) {
@@ -130,11 +140,10 @@
     <div class="card">
         <div class="card-header bg-agi-50" id="basic_settings">
             <h3 class="card-title">
-                Peta
+                Peta, dan tata ruang, blad
             </h3>
         </div>
         <div class="card-body">
-
             <div>
                 @if (isset($forminspeksi))
                     @forelse ($fotoTypes as $type)
@@ -147,7 +156,7 @@
                                 <img src="{{ asset('storage/' . $imagePath) }}" alt="{{ $type }}"
                                     class="w-full h-auto object-cover">
                             @endif
-                            <p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>
+                            <p class="mt-2 text-sm">{{ $customLabels[$type] ?? '' }}</p>
                         </div>
                     @empty
                         <p>Tidak ada tipe foto yang tersedia</p>

resources/views/penilai/lampiran.blade.php

@@ -22,7 +22,7 @@
             @include('lpj::component.detail-jaminan', [
                 'backLink' => 'penilai.show',
                 'id' => $permohonan->id,
-                'title' => 'Lampiran foto dan dokument',
+                'title' => 'Lampiran foto dan dokumen',
             ])
         @endif
 

resources/views/penilai/show.blade.php

@@ -95,22 +95,19 @@
                         <p class="flex w-full text-gray-600 font-medium text-sm">
                             {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) ?? '' }}</p>
                     </div>
-                    <label class="form-label max-w-56 ">
-                        Status Bayar
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
-                        @if (strtolower($permohonan->tujuanPenilaian->name) ==
-                                'penilaian ulang')
-                            <span>-</span>
-                        @else
+                    @if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang']))
+
+                        <label class="form-label max-w-56 ">
+                            Status Bayar
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
                             <span
                                 class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
                                 {{ str_replace('_', ' ', $permohonan->status_bayar) }}
                             </span>
-                        @endif
-                    </div>
+                        </div>
                 </div>
-
+                @endif
             </div>
         </div>
 

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

@@ -181,14 +181,14 @@
                                 $selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null;
                             @endphp
                             <div id="jenis_asset" class="flex items-baseline gap-2"
-                                style="{{ isset($selectedValue) === 'tidak sesuai' ? '' : 'display: none;' }}">
+                            style="{{ old('jenis_asset_tidak_sesuai', isset($forminspeksi['asset']['jenis_asset']['tidak sesuai'])) ? '' : 'display: none;' }}">
                                 <select id="jenis_asset_tidak_sesuai" class="input w-full"
                                     name="jenis_asset_tidak_sesuai">
                                     <option value="">Select Jenis asset</option>
                                     @if (isset($basicData['jenisJaminan']))
                                         @foreach ($basicData['jenisJaminan'] as $item)
                                             <option value="{{ $item->name }}"
-                                                {{ old('jenis_asset_tidak_sesuai', $forminspeksi['asset']['jenis_asset_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                                {{ old('jenis_asset_tidak_sesuai', $selectedValue) == $item->name ? 'selected' : '' }}>
                                                 {{ $item->name }}
                                             </option>
                                         @endforeach

resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php

@@ -7,7 +7,7 @@
             </a>
         @else
             <a href="{{ route('surveyor.show', ['id' => $permohonan->id]) }}" class="btn btn-xs btn-info">
-                <i class="ki-filled ki-exit-left"></i> Kembali
+                <i class="ki-filled ki-exit-left"></i> Back
             </a>
         @endif