From 1376a9202054fb6c079cebfdc90a8be4e7431a7d Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 7 Mar 2025 11:17:31 +0700 Subject: [PATCH] fix(surveyor): perbaikkan proses jadwal dan hapus nib di form inspeksi --- app/Http/Controllers/SurveyorController.php | 11 ++++++++--- resources/views/surveyor/components/header.blade.php | 4 ++-- resources/views/surveyor/index.blade.php | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 69c3653..67e7e5b 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -967,8 +967,11 @@ class SurveyorController extends Controller 'keterangan' => 'required', ]); + $penilaian = Penilaian::findOrFail($id); + $permohonan = Permohonan::where('nomor_registrasi', $penilaian->nomor_registrasi)->first(); + ; if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) { return response()->json([ 'success' => false, @@ -986,7 +989,9 @@ class SurveyorController extends Controller SendJadwalKunjunganEmailJob::dispatch($emailData); - + $permohonan->update([ + 'status' => 'request-jadwal', + ]); $penilaian->update([ @@ -2107,7 +2112,7 @@ class SurveyorController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-survey' ]); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?, ?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-survey', 'request-jadwal' ]); if (!Auth::user()->hasRole('administrator')) { @@ -2457,7 +2462,7 @@ class SurveyorController extends Controller 'kordinat_lng' => $data['kordinat_lng'] ?? null, 'kordinat_lat' => $data['kordinat_lat'] ?? null, - 'nomor_nib' => $data['nomor_nib'] ?? null + // 'nomor_nib' => $data['nomor_nib'] ?? null ] ]; } diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 7ef39f7..0cc9318 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -289,14 +289,14 @@
@include('lpj::component.detail-jaminan', ['status' => true]) -
+ {{--
-
+
--}}
diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php index 70c2043..8cc5671 100644 --- a/resources/views/surveyor/index.blade.php +++ b/resources/views/surveyor/index.blade.php @@ -500,7 +500,7 @@ id: permohonanId, waktu_penilaian: tanggal, deskripsi_penilaian: keterangan, - keterangan:'Tanggal Kunjungan: ' + tanggal + ', Keterangan: ' + keterangan + keterangan:'Permintaan Jadwal Kujungan: ' + window.formatTanggalWaktuIndonesia(tanggal) + ', ' + keterangan }; $.ajax({