🧹(surveyor): Optimasi import statements dan perbaikan tampilan detail surveyor
- 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
This commit is contained in:
@@ -3,25 +3,19 @@
|
|||||||
namespace Modules\Lpj\Http\Controllers;
|
namespace Modules\Lpj\Http\Controllers;
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\RedirectResponse;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Maatwebsite\Excel\Facades\Excel;
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
use Modules\Lpj\Exports\BasicDataSurveyorExport;
|
use Modules\Lpj\Exports\BasicDataSurveyorExport;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Barryvdh\DomPDF\Facade\Pdf;
|
use Barryvdh\DomPDF\Facade\Pdf;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use Illuminate\Support\Facades\Mail;
|
|
||||||
use Illuminate\Http\Response;
|
|
||||||
use Modules\Lpj\Models\Debiture;
|
use Modules\Lpj\Models\Debiture;
|
||||||
use Modules\Lpj\Models\LaporanExternal;
|
use Modules\Lpj\Models\LaporanExternal;
|
||||||
use Modules\Lpj\Models\Permohonan;
|
use Modules\Lpj\Models\Permohonan;
|
||||||
use Modules\Lpj\Models\Branch;
|
use Modules\Lpj\Models\Branch;
|
||||||
use Modules\Lpj\Models\Surveyor;
|
|
||||||
use Modules\Lpj\Models\BentukTanah;
|
use Modules\Lpj\Models\BentukTanah;
|
||||||
use Modules\Lpj\Models\KonturTanah;
|
use Modules\Lpj\Models\KonturTanah;
|
||||||
use Modules\Location\Models\Province;
|
use Modules\Location\Models\Province;
|
||||||
@@ -41,17 +35,8 @@ use Modules\Lpj\Models\SpekBangunan;
|
|||||||
use Modules\Lpj\Models\SpekKategoritBangunan;
|
use Modules\Lpj\Models\SpekKategoritBangunan;
|
||||||
use Modules\Lpj\Models\SaranaPelengkap;
|
use Modules\Lpj\Models\SaranaPelengkap;
|
||||||
use Modules\Lpj\Models\ArahMataAngin;
|
use Modules\Lpj\Models\ArahMataAngin;
|
||||||
use Modules\Lpj\Models\Analisa;
|
|
||||||
use Modules\Lpj\Models\Penilaian;
|
use Modules\Lpj\Models\Penilaian;
|
||||||
use Modules\Lpj\Models\PerkerasanJalan;
|
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\Teams;
|
||||||
use Modules\Lpj\Models\Lantai;
|
use Modules\Lpj\Models\Lantai;
|
||||||
use Modules\Lpj\Models\Inspeksi;
|
use Modules\Lpj\Models\Inspeksi;
|
||||||
@@ -62,29 +47,24 @@ use Modules\Lpj\Models\PosisiUnit;
|
|||||||
use Modules\Lpj\Models\TerletakArea;
|
use Modules\Lpj\Models\TerletakArea;
|
||||||
use Modules\Lpj\Models\FasilitasObjek;
|
use Modules\Lpj\Models\FasilitasObjek;
|
||||||
use Modules\Lpj\Models\MerupakanDaerah;
|
use Modules\Lpj\Models\MerupakanDaerah;
|
||||||
use Modules\Lpj\Models\ObjekJaminan;
|
|
||||||
use Modules\Lpj\Models\ModelAlatBerat;
|
use Modules\Lpj\Models\ModelAlatBerat;
|
||||||
use Modules\Lpj\Models\JenisPesawat;
|
use Modules\Lpj\Models\JenisPesawat;
|
||||||
use Modules\Lpj\Models\DokumenJaminan;
|
use Modules\Lpj\Models\DokumenJaminan;
|
||||||
use Modules\Lpj\Models\DetailDokumenJaminan;
|
use Modules\Lpj\Models\DetailDokumenJaminan;
|
||||||
use Modules\Lpj\Models\JenisKapal;
|
use Modules\Lpj\Models\JenisKapal;
|
||||||
use Modules\Lpj\Models\JenisKendaraan;
|
use Modules\Lpj\Models\JenisKendaraan;
|
||||||
use Modules\Lpj\Models\RuteJaminan;
|
|
||||||
use Modules\Lpj\Models\HubunganPemilikJaminan;
|
use Modules\Lpj\Models\HubunganPemilikJaminan;
|
||||||
use Modules\Lpj\Models\HubunganPenghuniJaminan;
|
use Modules\Lpj\Models\HubunganPenghuniJaminan;
|
||||||
use Modules\Lpj\Models\AnalisaUnit;
|
|
||||||
use Modules\Lpj\Models\GolonganMasySekitar;
|
use Modules\Lpj\Models\GolonganMasySekitar;
|
||||||
use Modules\Lpj\Models\TingkatKeramaian;
|
use Modules\Lpj\Models\TingkatKeramaian;
|
||||||
use Modules\Lpj\Models\TujuanPenilaian;
|
use Modules\Lpj\Models\TujuanPenilaian;
|
||||||
use Modules\Lpj\Models\LaluLintasLokasi;
|
use Modules\Lpj\Models\LaluLintasLokasi;
|
||||||
use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
|
|
||||||
use Modules\Lpj\Http\Requests\SurveyorRequest;
|
use Modules\Lpj\Http\Requests\SurveyorRequest;
|
||||||
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
|
|
||||||
use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
|
use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
|
||||||
use App\Helpers\Lpj;
|
|
||||||
use Modules\Lpj\Models\Authorization;
|
use Modules\Lpj\Models\Authorization;
|
||||||
use Modules\Lpj\Services\SurveyorValidateService;
|
use Modules\Lpj\Services\SurveyorValidateService;
|
||||||
use Modules\Lpj\Services\SaveFormInspesksiService;
|
use Modules\Lpj\Services\SaveFormInspesksiService;
|
||||||
|
use Modules\Lpj\Models\PermohonanHistory;
|
||||||
|
|
||||||
class SurveyorController extends Controller
|
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(
|
return view('lpj::surveyor.detail', compact(
|
||||||
'permohonan',
|
'permohonan',
|
||||||
'surveyor',
|
'surveyor',
|
||||||
'branches',
|
'branches',
|
||||||
'provinces',
|
'provinces',
|
||||||
'bentukTanah',
|
'bentukTanah',
|
||||||
'inspeksiData'
|
'inspeksiData',
|
||||||
|
'catatan_revisi_survey',
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,15 +17,13 @@
|
|||||||
</style>
|
</style>
|
||||||
@endpush
|
@endpush
|
||||||
@include('lpj::assetsku.includenya')
|
@include('lpj::assetsku.includenya')
|
||||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
|
||||||
|
@include('lpj::component.detail-jaminan', ['backLink' => 'surveyor.index'])
|
||||||
|
|
||||||
@include('lpj::component.detail-jaminan',['backLink'=>'surveyor.index'])
|
|
||||||
|
|
||||||
@if ($permohonan->status == 'revisi-survey')
|
@if ($permohonan->status == 'revisi-survey')
|
||||||
<div class="card border border-agi-100 min-w-full">
|
<div class="min-w-full border card border-agi-100">
|
||||||
<div class="card-header light:bg-agi-50" id="basic_settings">
|
<div class="card-header light:bg-agi-50" id="basic_settings">
|
||||||
<div class="card-title flex flex-row gap-1.5">
|
<div class="flex flex-row gap-1.5 card-title">
|
||||||
Catatan Revisi
|
Catatan Revisi
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -37,9 +35,9 @@
|
|||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
<div class="card border border-agi-100 min-w-full">
|
<div class="min-w-full border card border-agi-100">
|
||||||
<div class="card-header light:bg-agi-50" id="basic_settings">
|
<div class="card-header light:bg-agi-50" id="basic_settings">
|
||||||
<div class="card-title flex flex-row gap-1.5">
|
<div class="flex flex-row gap-1.5 card-title">
|
||||||
Form Jaminan
|
Form Jaminan
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -48,7 +46,7 @@
|
|||||||
@include('lpj::surveyor.components.card-tambah')
|
@include('lpj::surveyor.components.card-tambah')
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-footer ">
|
<div class="card-footer">
|
||||||
<div class="flex gap-5">
|
<div class="flex gap-5">
|
||||||
|
|
||||||
<button type="button" id="btnSubmit" class="btn btn-primary">
|
<button type="button" id="btnSubmit" class="btn btn-primary">
|
||||||
@@ -109,7 +107,7 @@
|
|||||||
console.log('Error checking button status:', error, status, xhr);
|
console.log('Error checking button status:', error, status, xhr);
|
||||||
if (xhr.responseJSON.message) {
|
if (xhr.responseJSON.message) {
|
||||||
toastrErrorBuild(xhr.responseJSON.message);
|
toastrErrorBuild(xhr.responseJSON.message);
|
||||||
}else{
|
} else {
|
||||||
toastrErrorBuild('Terjadi kesalahan');
|
toastrErrorBuild('Terjadi kesalahan');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user