Merge pull request 'Fix Navigation Button back and Update Document Id Handling' (#142) from feature/senior-officer into staging

Reviewed-on: #142
2025-05-21 11:08:31 +07:00
parent 79e66226b0 7aae88ce85
commit fdfe591c39
18 changed files with 64 additions and 71 deletions
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -82,7 +82,7 @@ class PenilaiController extends Controller
    public function sederhana(Request $request, $id)
    {

-        $documentId = $request->query('dokument');
+        $documentId = $request->query('documentId');
        $jaminanId = $request->query('jaminanId');
        $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
        $basicData =  $this->surveyorController->getCommonData();
@@ -148,7 +148,7 @@ class PenilaiController extends Controller
    public function standar(Request $request, $id)
    {

-        $documentId = $request->query('dokument');
+        $documentId = $request->query('documentId');
        $jaminanId = $request->query('jaminanId');

        $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
@@ -401,7 +401,7 @@ class PenilaiController extends Controller
    {

        $permohonanId = $request->query('permohonanId');
-        $documentId = $request->query('dokument');
+        $documentId = $request->query('documentId');
        $jaminanId = $request->query('jaminanId');
        $provinces = Province::all();
        $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
@@ -1153,20 +1153,9 @@ 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);
+            $validatedData = $request->all();
+            $result = $this->inspeksiService->storeInspeksi($validatedData, $request->input('type'), $request);

            $data = [
                'kepada' => $request->input('kepada'),
@@ -1431,7 +1420,7 @@ class PenilaiController extends Controller
    }


-    // pengunaan request query by id permohonan, dokument, jaminan , inspeksi
+    // pengunaan request query by id permohonan, documentId, jaminan , inspeksi
    protected function getRequestQueryId(Request $request)
    {
        return [
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -1556,11 +1556,11 @@ class SurveyorController extends Controller
    {

        $validated = $request->validate([
-            'dokument' => 'required',
+            'documentId' => 'required',
            'jenis_jaminan' => 'required'
        ]);

-        $dokumentId = $validated['dokument'];
+        $dokumentId = $validated['documentId'];
        $jaminanId = $validated['jenis_jaminan'];

        $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1644,11 +1644,11 @@ class SurveyorController extends Controller
    public function denah(Request $request, $id)
    {
        $validated = $request->validate([
-          'dokument' => 'required',
+          'documentId' => 'required',
          'jenis_jaminan' => 'required'
        ]);

-        $dokumentId = $validated['dokument'];
+        $dokumentId = $validated['documentId'];
        $jaminanId = $validated['jenis_jaminan'];

        $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1672,11 +1672,11 @@ class SurveyorController extends Controller
    public function foto(Request $request, $id)
    {
        $validated = $request->validate([
-            'dokument' => 'required',
+            'documentId' => 'required',
            'jenis_jaminan' => 'required'
        ]);

-        $dokumentId = $validated['dokument'];
+        $dokumentId = $validated['documentId'];
        $jaminanId = $validated['jenis_jaminan'];
        $fotoObjekJaminan = FotoObjekJaminan::all();

@@ -1707,11 +1707,11 @@ class SurveyorController extends Controller
            // Ambil data permohonan dengan eager loading

            $validated = $request->validate([
-                'dokument' => 'required',
+                'documentId' => 'required',
                'jenis_jaminan' => 'required'
            ]);

-            $dokumentId = $validated['dokument'];
+            $dokumentId = $validated['documentId'];
            $jaminanId = $validated['jenis_jaminan'];

            $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
--- a/app/Services/SaveFormInspesksiService.php
+++ b/app/Services/SaveFormInspesksiService.php
@@ -122,7 +122,7 @@ class SaveFormInspesksiService
        }

        if ($hasFactaData) {
-            $rules = array_merge($rules, $this->getFactData($data, $request));
+            $rules = array_merge($rules, $this->getFactData($data, $request,  $inspeksi));
        }

        return $rules;
--- a/resources/views/penilai/components/lpj-sederhana-standar.blade.php
+++ b/resources/views/penilai/components/lpj-sederhana-standar.blade.php
@@ -23,7 +23,7 @@
    @include('lpj::assetsku.includenya')
    <form id="form-lpj" method="post" class="w-full grid gap-5">
        <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 }}">
        <input type="hidden" id="lpj-data" value="{{ json_encode($lpjData ?? []) }}" />
        @include('lpj::component.form-penilai')
@@ -52,15 +52,15 @@
            @endif
            @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                <a class="btn btn-info"
-                    href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ request('dokument') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
+                    href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
                    Lampiran Foto dan Dokumen
                </a>
-                <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('dokument'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
+                <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
                    >
                    <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
                </a>
                <a class="btn btn-success"
-                    onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('dokument') }}', {{ request('jaminanId') }}, 0)">
+                    onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', {{ request('jaminanId') }}, 0)">
                    <i class="ki-filled ki-printer"></i> Cetak Laporan
                </a>
            @endif
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -19,7 +19,7 @@
                        @endphp
                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) &&
                                Route::currentRouteName('otorisator.show'))
-                            <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => 'Pelaporan']) }}"
+                            <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => request('header')]) }}"
                                class="btn btn-xs btn-info">
                                <i class="ki-filled ki-exit-left"></i> Back
                            </a>
--- a/resources/views/penilai/components/rap-penilai.blade.php
+++ b/resources/views/penilai/components/rap-penilai.blade.php
@@ -14,14 +14,13 @@
            <input type="hidden" name="action" value="rap">
            <input type="hidden" name="type" value="rap">
            @include('lpj::assetsku.includenya')
-            @include('lpj::surveyor.components.header')
-            @include('lpj::surveyor.components.rap')
-
            <div class="card">
                <div class="card-header bg-agi-50">
                    <h3 class="card-title uppercase">
                        RAP
                    </h3>
+
+
                </div>
                <div class="card-body grid gap-5">
                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -64,24 +63,27 @@
                    </div>
                </div>
            </div>
+            @include('lpj::surveyor.components.header')
+            @include('lpj::surveyor.components.rap')
            <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
                @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
-                <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
-                    <i class="ki-filled ki-save-2"></i>
-                    <span id="saveButtonText" >Save</span>
-                    <div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;"
-                        id="saveButtonSpinner">
+                    <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()"
+                        {{ $permohonan->status == 'proses-paparan' || ($permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])) ? 'disabled' : '' }}>
+                        <i class="ki-filled ki-save-2"></i>
+                        <span id="saveButtonText">Save</span>
+                        <div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;"
+                            id="saveButtonSpinner">

-                    </div>
-                </button>
+                        </div>
+                    </button>
                @endif
                @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                    <a class="btn btn-info"
                        href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
                        Lampiran Foto dan Dokumen
                    </a>
-                    <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
-                        >
+                    <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
+                        class="btn btn-light">
                        <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
                    </a>
                    <a class="btn btn-success"
--- a/resources/views/penilai/components/resume.blade.php
+++ b/resources/views/penilai/components/resume.blade.php
@@ -57,7 +57,7 @@

                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) &&
                                Route::currentRouteName('otorisator.show'))
-                            <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => $paparan]) }}"
+                            <a href="{{ route('otorisator.show', ['id' => $permohonan->id, 'type' => request('header')]) }}"
                                class="btn btn-xs btn-info">
                                <i class="ki-filled ki-exit-left"></i> Back
                            </a>
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -493,11 +493,11 @@
                        if (data.status === 'standar') {
                            showLoadingSwal('Tunggu ...');
                            window.location.href =
-                                `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
+                                `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`;
                        } else if (data.status === 'sederhana') {
                            showLoadingSwal('Tunggu ...');
                            window.location.href =
-                                `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
+                                `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`;
                        }
                    } else {
                        if (fasilitasKredit.toUpperCase() === 'KPR KERJASAMA') {
@@ -556,10 +556,10 @@
                if (data.success) {
                    if (type === 'standar') {
                        window.location.href =
-                            `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
+                            `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`;
                    } else if (type === 'sederhana') {
                        window.location.href =
-                            `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
+                            `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`;
                    }
                }
            });
@@ -640,7 +640,7 @@
    function rap(permohonanId, documentId,  jaminanId) {
        showLoadingSwal('Tunggu ...');
        window.location.href =
-            `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&dokument=${documentId}&jaminanId=${jaminanId}`;
+            `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`;
    }


--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -159,7 +159,7 @@

                    @if ($dataHeader == 'pelaporan')
                        <a class="btn btn-success"
-                            href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
+                            href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}">
                            Lihat Laporan
                        </a>
                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == 0)
@@ -203,7 +203,7 @@


                        <a class="btn btn-success"
-                            href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
+                            href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}">
                            Lihat resume
                        </a>

--- a/resources/views/penilaian/otorisator/sla.blade.php
+++ b/resources/views/penilaian/otorisator/sla.blade.php
@@ -161,7 +161,7 @@

                    @if ($dataHeader == 'pelaporan')
                        <a class="btn btn-success"
-                           href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
+                           href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header }}">
                            Lihat Laporan
                        </a>
                    @endif
--- a/resources/views/surveyor/components/card-tambah.blade.php
+++ b/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">
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/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">
--- a/resources/views/surveyor/components/foto.blade.php
+++ b/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(),
--- a/resources/views/surveyor/components/header.blade.php
+++ b/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>
--- a/resources/views/surveyor/components/informasi.blade.php
+++ b/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);
--- a/resources/views/surveyor/components/inspeksi.blade.php
+++ b/resources/views/surveyor/components/inspeksi.blade.php
@@ -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>
--- a/resources/views/surveyor/components/pembanding-kendaraan.blade.php
+++ b/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>
--- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
+++ b/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>