From f626aeecfee824cb8cb3882bb28977e907331662 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Mon, 17 Feb 2025 12:07:26 +0700
Subject: [PATCH] perbaikan form inspeksi dan ganti surveyor

---
 app/Http/Controllers/ActivityController.php          | 6 +++---
 resources/views/permohonan/index.blade.php           | 4 ++--
 resources/views/surveyor/components/header.blade.php | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index adde98d..4b1bf5a 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -98,10 +98,10 @@ class ActivityController extends Controller
             $permohonan = Permohonan::findOrFail($permohonanId);
 
             // Validasi status permohonan
-            if ($permohonan->status !== 'assign') {
+            if ($permohonan->status !== 'assign' && $permohonan->status !== 'proses-survey') {
                 return response()->json([
                     'status' => 'error',
-                    'message' => 'Tidak bisa ganti tim, permohonan ini sudah mengatur jadwal.',
+                    'message' => 'Tidak dapat mengganti tim, status permohonan tidak memungkinkan.',
                 ]);
             }
 
@@ -392,7 +392,7 @@ class ActivityController extends Controller
             $q->where('user_id', $id);
         })
         ->whereHas('permohonan', function ($q) {
-            $q->whereIn('status', ['assign', 'proses-laporan', 'done']);
+            $q->whereIn('status', ['assign', 'proses-laporan', 'done', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-laporan', 'survey']);
         });
 
 
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index 38522d5..7bf297e 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -316,7 +316,7 @@
         title: 'Reschedule Jadwal Kunjungan',
         html: `
             <div class="text-left space-y-4">
-               
+
                 <p class="text-gray-700">
                     Yakin akan Reschedule Jadwal Kunjungan
                     <span class="font-semibold text-blue-600">${noReg}</span>
@@ -339,7 +339,7 @@
                               placeholder="Masukkan alasan reschedule..."></textarea>
                 </div>
 
-                 ${rejectedNote ? `
+                 ${rejectedNote && rejectedNote.trim() ? `
                     <p class="text-gray-700"><strong>Catatan Reject:</strong> ${rejectedNote}</p>
                 ` : ''}
             </div>
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 70455f8..2c18f33 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -7,14 +7,15 @@
             {{ $title }}
         </h3>
         <div class="flex items-center gap-2">
+            @php
+            use Illuminate\Support\Facades\Route;
+        @endphp
             @if (isset($id))
                 <a href="{{ route($backLink, ['id' => $id]) }}" class="btn btn-xs btn-info">
                     <i class="ki-filled ki-exit-left"></i> Back
                 </a>
             @else
-                @php
-                    use Illuminate\Support\Facades\Route;
-                @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']) }}"