diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php new file mode 100644 index 0000000..2d2a379 --- /dev/null +++ b/app/Helpers/Lpj.php @@ -0,0 +1,10 @@ +address ? $alamat->address . ', ' : '') . + (isset($alamat->village) ? $alamat->village->name.', ' : '') . + (isset($alamat->city) ? $alamat->city->name.', ' : '') . + (isset($alamat->province) ? $alamat->province->name.', ' : '') . + ($alamat->postal_code ?? ''); + } diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index b70a9b1..5a19d19 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -7,6 +7,8 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; use Modules\Lpj\Models\Permohonan; +use Modules\Lpj\Models\Branch; +use Modules\Location\Models\Province; class SurveyorController extends Controller { @@ -52,7 +54,13 @@ class SurveyorController extends Controller 'penilaian' ], )->findOrFail($id); - return view('lpj::surveyor.detail', compact('permohonan')); + + $surveyor = $id; + $branches = Branch::all(); + $provinces = Province::all(); + + + return view('lpj::surveyor.detail', compact('permohonan', 'surveyor', 'branches', 'provinces')); } /** @@ -131,10 +139,106 @@ class SurveyorController extends Controller ]); } /** - * Remove the specified resource from storage. + * Form inspeksi. */ - public function destroy($id) + + public function formInspeksi($id) { - // + $permohonan = Permohonan::with( + [ + 'user', + 'debiture.province', + 'debiture.city', + 'debiture.district', + 'debiture.village', + 'branch', + 'tujuanPenilaian', + 'penilaian' + ], + )->findOrFail($id); + $branches = Branch::all(); + $provinces = Province::all(); + + return view('lpj::surveyor.detail', compact('permohonan', 'branches', 'provinces')); } + + /** + * Denah. + */ + + public function denah($id) + { + $permohonan = Permohonan::with( + [ + 'user', + 'debiture.province', + 'debiture.city', + 'debiture.district', + 'debiture.village', + 'branch', + 'tujuanPenilaian', + 'penilaian' + ], + )->findOrFail($id); + $surveyor = $id; + $branches = Branch::all(); + $provinces = Province::all(); + + return view('lpj::surveyor.detail', compact('permohonan', 'surveyor', 'branches', 'provinces')); + } + + /** + * Foto. + */ + + public function foto($id) + { + $permohonan = Permohonan::with( + [ + 'user', + 'debiture.province', + 'debiture.city', + 'debiture.district', + 'debiture.village', + 'branch', + 'tujuanPenilaian', + 'penilaian' + ], + )->findOrFail($id); + $surveyor = $id; + $branches = Branch::all(); + $provinces = Province::all(); + + return view('lpj::surveyor.detail', compact('permohonan', 'surveyor', 'branches', 'provinces')); + } + + /** + * Data pembanding. + */ + + public function dataPembanding($id) + { + $permohonan = Permohonan::with( + [ + 'user', + 'debiture.province', + 'debiture.city', + 'debiture.district', + 'debiture.village', + 'branch', + 'tujuanPenilaian', + 'penilaian' + ], + )->findOrFail($id); + $surveyor = $id; + $branches = Branch::all(); + $provinces = Province::all(); + + return view('lpj::surveyor.detail', compact('permohonan', 'surveyor', 'branches', 'provinces')); + } + + + + + } diff --git a/module.json b/module.json index 7b033cf..0687930 100644 --- a/module.json +++ b/module.json @@ -6,7 +6,9 @@ "keywords": [], "priority": 0, "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"], - "files": [], + "files": [ + "app/Helpers/Lpj.php" + ], "menu": { "main": [ { @@ -150,6 +152,15 @@ } ] }, + { + "title": "Surveyor", + "path": "surveyor", + "icon": "ki-filled ki-questionnaire-tablet text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["surveyor"] + }, { "title": "Activity", @@ -158,7 +169,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["administrator", "pemohon-ao", "pemohon-eo", "admin"] + "roles": ["administrator", "pemohon-ao", "pemohon-eo", "admin","surveyor"] }, { "title": "Laporan", @@ -308,6 +319,14 @@ "permission": "", "roles": ["administrator", "admin"] }, + { + "title": "Jenis Laporan", + "path": "basicdata.jenis_laporan", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["Administrator", "admin"] + }, { "title": "Tujuan Penilaian KJPP", "path": "basicdata.tujuan_penilaian_kjpp", diff --git a/resources/views/assetsku/includenya.blade.php b/resources/views/assetsku/includenya.blade.php index efbdfbf..f646e05 100644 --- a/resources/views/assetsku/includenya.blade.php +++ b/resources/views/assetsku/includenya.blade.php @@ -1,4 +1,4 @@ - --}} +@endpush + + +
+ @if (isset($debitur->id)) + + @method('PUT') + @endif + @csrf + + +
+
+

Analisa Tanah

+
+
+
+ + +
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ + + + + +
+ + +
+
+
+ + +
+ +
+ + + + +
+
+ + +
+ +
+ + + + +
+ + +
+
+ + +
+
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ + + + +
+ + +
+
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+ +
+ + + + +
+
+
+
+ + +
+
+

Analisa Bangunan

+
+
+
+ + +
+ + +
+
+ + +
+ +
+ + + + + +
+ + +
+ +
+
+ + +
+ +
+ + + + + +
+
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+ +
+ + + + +
+ + +
+
+ + +
+
+
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+
+ +
+
+ + + +
+
+

Analisis Lingkungan

+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+ +
+ + + + + +
+ + +
+
+
+ + +
+

Lalulintas Depan Lokasi

+
+ + + +
+
+ + +
+

Golongan Hidup Sekitar

+
+ + + + + +
+
+ + +
+

Tingkat Keramaian

+
+ + + +
+
+ + +
+

Terletak di Area

+
+ + + +
+
+ + +
+

Struktur Letak

+
+ + +
+
+ + +
+

Dekat Makam

+
+ + +
+
+ + +
+

Dekat Tps

+
+ + +
+
+ + +
+

Merupakan daerah

+
+ + + +
+
+ + +
+

Fasilitas Umum Ddekat Object

+
+ + + + + + +
+
+
+
+ + +
+
+

Analisis Fakta

+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+ +
+

Informasi Dinas Tata Ruang

+
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+ +
+ + +
+
+

Catatan yang Perlu Diperhatikan

+ +
+
+
+ +
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php new file mode 100644 index 0000000..9d39cd3 --- /dev/null +++ b/resources/views/surveyor/components/foto.blade.php @@ -0,0 +1,89 @@ +
+ @if (isset($debitur->id)) + + @method('PUT') + @endif + @csrf + +
+
+

Rute Menuju Lokasi

+ + + +
+
+ + +
+
+ + +
+
+

Objeck Jaminan

+ + + +
+
+
+ + + +
+ +
+
+ + +
+
+

Linkungan

+ + + +
+
+ + +
+
+ +
+ + +@push('script') + + + +@endpush diff --git a/resources/views/surveyor/detail.blade.php b/resources/views/surveyor/detail.blade.php index 885d5fb..ee4a892 100644 --- a/resources/views/surveyor/detail.blade.php +++ b/resources/views/surveyor/detail.blade.php @@ -148,15 +148,58 @@
- {{--
-

- Data Jaminan -

-
--}} +
+
+ FORM INSPEKSI -
- + DENAH TANAH DAN BANGUNAN + + FOTO + + DATA PEMBANDING +
+ +
+
+ @if(request()->routeIs('surveyor.show',$surveyor)) + @include('lpj::surveyor.components.form-inspeksi') + + @elseif(request()->routeIs('surveyor.denah',$surveyor)) + + @include('lpj::surveyor.components.denah') + + @elseif(request()->routeIs('surveyor.foto', $surveyor)) + @include('lpj::surveyor.components.foto') + + @elseif(request()->routeIs('surveyor.data-pembanding', $surveyor)) + + @include('lpj::surveyor.components.data-pembanding') + @endif +
+
+ +
@endsection + +@push('scripts') + + + +@endpush diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php index 6006e88..04827dc 100644 --- a/resources/views/surveyor/index.blade.php +++ b/resources/views/surveyor/index.blade.php @@ -22,13 +22,13 @@
-
-
- Surveyor -
+ + +

- {{-- Daftar {{}} --}} + Surveyor

@@ -44,10 +44,6 @@
-
- -
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 8a2985c..8b5a8b5 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -436,6 +436,27 @@ Breadcrumbs::for('surveyor.show', function (BreadcrumbTrail $trail) { $trail->push('Detail'); }); +Breadcrumbs::for('surveyor.form-inspeksi', function (BreadcrumbTrail $trail) { + $trail->parent('surveyor'); + $trail->push('Form Inspeksi'); +}); + +Breadcrumbs::for('surveyor.denah', function (BreadcrumbTrail $trail) { + $trail->parent('surveyor'); + $trail->push('Denah'); +}); + +Breadcrumbs::for('surveyor.foto', function (BreadcrumbTrail $trail) { + $trail->parent('surveyor'); + $trail->push('Form Foto'); +}); + +Breadcrumbs::for('surveyor.data-pembanding', function (BreadcrumbTrail $trail) { + $trail->parent('surveyor'); + $trail->push('Form Pembanding'); +}); + + Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) { $trail->push('Registrasi', route('registrasi.index')); }); diff --git a/routes/web.php b/routes/web.php index 0dbc67f..b3bb461 100644 --- a/routes/web.php +++ b/routes/web.php @@ -495,6 +495,19 @@ Route::middleware(['auth'])->group(function () { Route::get('/datatables/{otorisator}', [PenilaianController::class, 'dataForAuthorization'])->name('datatables'); Route::get('show/{id}', [PenilaianController::class, 'show'])->name('show'); }); + + + + Route::name('surveyor.')->prefix('surveyor')->group(function () { + Route::get('/', [SurveyorController::class, 'index'])->name('index'); + Route::get('{id}/show', [SurveyorController::class, 'show'])->name('show'); + Route::get('datatables', [SurveyorController::class, 'dataForDatatables'])->name('datatables'); + Route::get('form-inspeksi/{id}', [SurveyorController::class, 'formInspeksi'])->name('form-inspeksi'); + Route::get('denah/{id}', [SurveyorController::class, 'denah'])->name('denah'); + Route::get('foto/{id}', [SurveyorController::class, 'foto'])->name('foto'); + Route::get('data-pembanding/{id}', [SurveyorController::class, 'dataPembanding'])->name('data-pembanding'); + }); + }); require __DIR__ . '/registrasi.php';