From 3aca1d46c2a237097a7a3b2b62d87454fb9c9bca Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 30 Sep 2025 17:01:52 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9(surveyor):=20Optimasi=20import=20s?= =?UTF-8?q?tatements=20dan=20perbaikan=20tampilan=20detail=20surveyor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Menghapus lebih dari 20 import statements yang tidak digunakan di SurveyorController - Membersihkan import RedirectResponse, JsonResponse, Response, dan helper tidak relevan - Menghapus model lama seperti Surveyor, Analisa, dan AnalisaFakta yang tidak digunakan - Menambahkan import PermohonanHistory untuk fitur catatan revisi survey - Menambahkan query untuk mengambil catatan revisi terbaru dari PermohonanHistory - Menampilkan catatan revisi dengan filter status 'revisi-survey' menggunakan latest() - Mereorganisasi urutan class Tailwind CSS pada detail.blade.php agar lebih konsisten - Memperbaiki struktur HTML dan indentasi untuk meningkatkan readability - Mengoptimalkan error handling dan conditional rendering di view untuk tampilan lebih bersih --- app/Http/Controllers/SurveyorController.php | 28 ++++------------ resources/views/surveyor/detail.blade.php | 36 ++++++++++----------- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 7da0728..f5eb6a9 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -3,25 +3,19 @@ namespace Modules\Lpj\Http\Controllers; use App\Http\Controllers\Controller; -use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Validator; use Maatwebsite\Excel\Facades\Excel; use Modules\Lpj\Exports\BasicDataSurveyorExport; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Str; use Barryvdh\DomPDF\Facade\Pdf; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Mail; -use Illuminate\Http\Response; use Modules\Lpj\Models\Debiture; use Modules\Lpj\Models\LaporanExternal; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Branch; -use Modules\Lpj\Models\Surveyor; use Modules\Lpj\Models\BentukTanah; use Modules\Lpj\Models\KonturTanah; use Modules\Location\Models\Province; @@ -41,17 +35,8 @@ use Modules\Lpj\Models\SpekBangunan; use Modules\Lpj\Models\SpekKategoritBangunan; use Modules\Lpj\Models\SaranaPelengkap; use Modules\Lpj\Models\ArahMataAngin; -use Modules\Lpj\Models\Analisa; use Modules\Lpj\Models\Penilaian; use Modules\Lpj\Models\PerkerasanJalan; -use Modules\Lpj\Models\AnalisaFakta; -use Modules\Lpj\Models\AnalisaLingkungan; -use Modules\Lpj\Models\AnalisaTanahBagunan; -use Modules\Lpj\Models\SpekBangunanAnalisa; -use Modules\Lpj\Models\Denah; -use Modules\Lpj\Models\FotoJaminan; -use Modules\Lpj\Models\Lingkungan; -use Modules\Lpj\Models\LantaiUnit; use Modules\Lpj\Models\Teams; use Modules\Lpj\Models\Lantai; use Modules\Lpj\Models\Inspeksi; @@ -62,29 +47,24 @@ use Modules\Lpj\Models\PosisiUnit; use Modules\Lpj\Models\TerletakArea; use Modules\Lpj\Models\FasilitasObjek; use Modules\Lpj\Models\MerupakanDaerah; -use Modules\Lpj\Models\ObjekJaminan; use Modules\Lpj\Models\ModelAlatBerat; use Modules\Lpj\Models\JenisPesawat; use Modules\Lpj\Models\DokumenJaminan; use Modules\Lpj\Models\DetailDokumenJaminan; use Modules\Lpj\Models\JenisKapal; use Modules\Lpj\Models\JenisKendaraan; -use Modules\Lpj\Models\RuteJaminan; use Modules\Lpj\Models\HubunganPemilikJaminan; use Modules\Lpj\Models\HubunganPenghuniJaminan; -use Modules\Lpj\Models\AnalisaUnit; use Modules\Lpj\Models\GolonganMasySekitar; use Modules\Lpj\Models\TingkatKeramaian; use Modules\Lpj\Models\TujuanPenilaian; use Modules\Lpj\Models\LaluLintasLokasi; -use Modules\Lpj\Models\SpekBagunanAnalisaDetail; use Modules\Lpj\Http\Requests\SurveyorRequest; -use Modules\Lpj\Http\Requests\FormSurveyorRequest; use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob; -use App\Helpers\Lpj; use Modules\Lpj\Models\Authorization; use Modules\Lpj\Services\SurveyorValidateService; use Modules\Lpj\Services\SaveFormInspesksiService; +use Modules\Lpj\Models\PermohonanHistory; class SurveyorController extends Controller { @@ -151,13 +131,17 @@ class SurveyorController extends Controller }); } + $catatan_revisi_survey = PermohonanHistory::where('permohonan_id', $id) + ->where('status', 'revisi-survey')->latest()->first(); + return view('lpj::surveyor.detail', compact( 'permohonan', 'surveyor', 'branches', 'provinces', 'bentukTanah', - 'inspeksiData' + 'inspeksiData', + 'catatan_revisi_survey', )); } diff --git a/resources/views/surveyor/detail.blade.php b/resources/views/surveyor/detail.blade.php index b92ab01..3fe7603 100644 --- a/resources/views/surveyor/detail.blade.php +++ b/resources/views/surveyor/detail.blade.php @@ -17,38 +17,36 @@ @endpush @include('lpj::assetsku.includenya') -
- - - @include('lpj::component.detail-jaminan',['backLink'=>'surveyor.index']) +
+ @include('lpj::component.detail-jaminan', ['backLink' => 'surveyor.index']) @if ($permohonan->status == 'revisi-survey') -
-
-
- Catatan Revisi +
+
+
+ Catatan Revisi +
+
+
+

{{ $permohonan->keterangan ?? '' }}

-
-
-

{{ $permohonan->keterangan ?? '' }}

-
-
+
@endif -
+
-
- Form Jaminan +
+ Form Jaminan
- @include('lpj::surveyor.components.card-tambah') + @include('lpj::surveyor.components.card-tambah')
-