Merge branch 'staging' into lpj-db-migratio

resources/views/surveyor/components/card-tambah.blade.php

@@ -14,7 +14,7 @@
                     'url' =>
                         route('surveyor.inspeksi', [
                             'id' => $permohonan->id,
-                        ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
+                        ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
                     'show' => true,
                     'icon' => !empty($currentInspeksi['data_form']),
                 ],
@@ -27,7 +27,7 @@
                     'url' =>
                         route('surveyor.denah', [
                             'id' => $permohonan->id,
-                        ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
+                        ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
                     'show' => true,
                     'icon' => !empty($currentInspeksi['denah_form']),
                 ];
@@ -39,7 +39,7 @@
                     'url' =>
                         route('surveyor.foto', [
                             'id' => $permohonan->id,
-                        ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
+                        ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
                     'show' => true,
                     'icon' => !empty($currentInspeksi['foto_form']),
                 ],
@@ -48,7 +48,7 @@
                     'url' =>
                         route('surveyor.data-pembanding', [
                             'id' => $permohonan->id,
-                        ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
+                        ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}",
                     'show' => true,
                     'icon' => !empty($currentInspeksi['data_pembanding']),
                 ],
@@ -84,7 +84,7 @@
                 <a href="{{ route('surveyor.inspeksi', ['id' => $permohonan->id]) .
                     '?' .
                     http_build_query([
-                        'dokument' => $jaminanId,
+                        'documentId' => $jaminanId,
                         'jenis_jaminan' => $dokumen->jenisJaminan->id,
                     ]) }}"
                     class="flex items-center justify-between border border-gray-200 rounded-xl gap-2 px-4 py-4 btn-outline {{ !empty($currentInspeksi['data_form']) ? 'btn-success' : 'btn-primary' }} hover:btn-light">
@@ -109,7 +109,7 @@
                 <a href="{{ route('surveyor.foto', ['id' => $permohonan->id]) .
                     '?' .
                     http_build_query([
-                        'dokument' => $jaminanId,
+                        'documentId' => $jaminanId,
                         'jenis_jaminan' => $dokumen->jenisJaminan->id,
                     ]) }}"
                     class="flex items-center justify-between border border-gray-200 rounded-xl gap-2 px-4 py-4 btn-outline {{ !empty($currentInspeksi['foto_form']) ? 'btn-success' : 'btn-primary' }} hover:btn-light">

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

@@ -20,7 +20,7 @@
                     @csrf
                     <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
 
-                    <input type="hidden" name="dokument_id" value="{{ request('dokument') }}">
+                    <input type="hidden" name="dokument_id" value="{{ request('documentId') }}">
                     <input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}">
                     <div class="card">
                         <div class="card-body">

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

@@ -35,7 +35,7 @@
                 <form id="formDenah" method="POST" enctype="multipart/form-data" class="w-full">
                     @csrf
                     <input type="hidden" value="{{ $permohonan->id }}" name="permohonan_id">
-                    <input type="hidden" name="dokument_id" value="{{ request('dokument') }}">
+                    <input type="hidden" name="dokument_id" value="{{ request('documentId') }}">
                     <input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}">
                     <!-- Container untuk daftar denah -->
                     <div id="denah-container">

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

@@ -171,7 +171,7 @@
 
         <form id="formFoto" method="POST" class="grid gap-5" enctype="multipart/form-data">
             <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
-            <input type="hidden" name="dokument_id" value="{{ request('dokument') }}">
+            <input type="hidden" name="dokument_id" value="{{ request('documentId') }}">
             <input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}">
 
 
@@ -303,7 +303,7 @@
 
                         params: {
                             permohonan_id: {{ $permohonan->id ?? 0 }},
-                            dokument_id: '{{ request('dokument') ?? '' }}',
+                            dokument_id: '{{ request('documentId') ?? '' }}',
                             param_name: paramName,
                             nomor_registrasi: '{{ $permohonan->nomor_registrasi ?? '' }}',
                         },
@@ -531,7 +531,7 @@
                     method: 'GET',
                     data: {
                         permohonan_id: {{ $permohonan->id ?? 0 }},
-                        dokument_id: '{{ request('dokument') ?? '' }}',
+                        dokument_id: '{{ request('documentId') ?? '' }}',
                         param_name: paramName
                     },
                     headers: {
@@ -881,7 +881,7 @@
                             data: {
                                 path: response.path,
                                 permohonan_id: {{ $permohonan->id ?? 0 }},
-                                dokument_id: '{{ request('dokument') ?? '' }}',
+                                dokument_id: '{{ request('documentId') ?? '' }}',
                                 param_name: response.param_name
                             },
                             headers: {
@@ -916,7 +916,7 @@
                 },
                 data: {
                     permohonan_id: {{ $permohonan->id }},
-                    dokument_id: '{{ request('dokument') ?? '' }}',
+                    dokument_id: '{{ request('documentId') ?? '' }}',
                     name: $('#editDataName').val(),
                     description: $('#editDataDescription').val(),
                     category: $('#editDataCategory').val(),

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

@@ -9,6 +9,8 @@
         <div class="flex items-center gap-2">
             @php
                 use Illuminate\Support\Facades\Route;
+
+                // dd(request('header'));
             @endphp
             @if (isset($id))
                 <a href="{{ route($backLink, ['id' => $id]) }}" class="btn btn-xs btn-info">
@@ -16,13 +18,13 @@
                 </a>
             @else
                 @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) &&
-                        Request::is('otorisator/show/*/Pelaporan'))
-                    <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => 'Pelaporan']) }}"
+                        Request::is('otorisator/*'))
+                    <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => request('header') ?? 'Pelaporan']) }}"
                         class="btn btn-xs btn-info">
                         <i class="ki-filled ki-exit-left"></i> Back
                     </a>
                 @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor', 'penilai']))
-                    @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan'))
+                    @if (Request::is('surveyor/inspeksi/*/create') && request()->has('documentId') && request()->has('jenis_jaminan'))
                         <a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>

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

@@ -342,7 +342,7 @@
             // Buat FormData untuk mengirim file
             const formData = new FormData();
 
-            const dokument = "{{ request('dokument') }}";
+            const dokument = "{{ request('documentId') }}";
             const permohonan = "{{ $permohonan->id }}";
             formData.append('file', file);
             formData.append('dokument_id', dokument);

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

@@ -10,7 +10,7 @@
         <form id="formInspeksi" method="POST" enctype="multipart/form-data" class="grid gap-5">
             @csrf
             <input id="permohonan_id" type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
-            <input id="dokument_id" type="hidden" name="dokument_id" value="{{ request('dokument') }}">
+            <input id="dokument_id" type="hidden" name="dokument_id" value="{{ request('documentId') }}">
             <input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}">
 
             @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
@@ -70,7 +70,7 @@
                     <i class="ki-filled ki-save-2"></i>
                     <span id="saveButtonText">Simpan</span>
                 </button>
-                <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('dokument'), 'jenis_jaminan_id' => request('jenis_jaminan')]) }}"
+                <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jenis_jaminan')]) }}"
                     class="btn btn-info" id="saveButton">
                     <i class="ki-filled ki-printer"></i>
                     <span>Cetak Form Inspeksi</span>

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

@@ -1,7 +1,7 @@
 <div class="card-header bg-agi-50">
     <h3 class="card-title">Data Pembanding</h3>
     <div class="flex items-center gap-2">
-        @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('dokument') && request()->has('jenis_jaminan'))
+        @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('documentId') && request()->has('jenis_jaminan'))
         <a href="{{ url()->previous() }}" class="btn btn-xs btn-info">
             <i class="ki-filled ki-exit-left"></i> Back
         </a>

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

@@ -1,7 +1,7 @@
 <div class="card-header bg-agi-50">
     <h3 class="card-title">Data Pembanding</h3>
     <div class="flex items-center gap-2">
-        @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('dokument') && request()->has('jenis_jaminan'))
+        @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('documentId') && request()->has('jenis_jaminan'))
             <a href="{{ url()->previous() }}" class="btn btn-xs btn-info">
                 <i class="ki-filled ki-exit-left"></i> Back
             </a>