diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index ab47dd1..357d984 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -4,6 +4,7 @@ namespace Modules\Lpj\Http\Controllers; use Illuminate\Http\Request; use Modules\Lpj\Models\Permohonan; +use Modules\Lpj\Models\Inspeksi; use App\Http\Controllers\Controller; class PenilaiController extends Controller @@ -21,6 +22,22 @@ class PenilaiController extends Controller /** * Show the form for creating a new resource. */ + public function lampiran($id){ + $permohonan = Permohonan::with('debiture.documents')->find($id); + + $jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id; + + $inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); + + $formFoto = null; + if ($inpeksi) { + $formFoto = json_decode($inpeksi->foto_form, true); + } + + + return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto')); + } + public function create() { return view('lpj::create'); diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 8daef81..e0ebfa8 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -116,7 +116,7 @@ class PenilaianController extends Controller } if ($validatedData['surveyor_id'] === 'pilih_dari_region' || $validatedData['penilai_id'] === 'pilih_dari_region') { - $status = 'registered'; + $status = $permohonan->status; } else { $status = 'assign'; } diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 681dbe1..86eaa95 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -39,12 +39,19 @@ use Modules\Lpj\Models\Teams; use Modules\Lpj\Models\Lantai; use Modules\Lpj\Models\Inspeksi; use Modules\Lpj\Models\ViewUnit; +use Modules\Lpj\Models\JenisUnit; +use Modules\Lpj\Models\BentukUnit; +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\JenisKapal; use Modules\Lpj\Models\JenisKendaraan; use Modules\Lpj\Models\RuteJaminan; +use Modules\Lpj\Models\HubunganPemilikJaminan; use Modules\Lpj\Models\AnalisaUnit; use Modules\Lpj\Models\GolonganMasySekitar; use Modules\Lpj\Models\TingkatKeramaian; @@ -566,6 +573,8 @@ class SurveyorController extends Controller $jenisKapal = JenisKapal::all(); $jenisPesawat = JenisPesawat::all(); $modelAlatBerat = ModelAlatBerat::all(); + $hubCadeb =HubunganPemilikJaminan::all(); + // return response()->json([ // 'per'=> @@ -606,7 +615,8 @@ class SurveyorController extends Controller 'jenisKendaraan', 'jenisKapal', 'jenisPesawat', - 'modelAlatBerat' + 'modelAlatBerat', + 'hubCadeb' )); } @@ -779,6 +789,12 @@ class SurveyorController extends Controller 'model-alat-berat' => ['Model Alat Berat', 'model-alat-berat', ModelAlatBerat::class], 'jenis-kapal' => ['Jenis Kapal', 'jenis-kapal', JenisKapal::class], 'jenis-kendaraan' => ['Jenis Kendaraan', 'jenis-kendaraan', JenisKendaraan::class], + 'jenis-unit' => ['Jenis unit', 'jenis-unit', JenisUnit::class], + 'terletak-area' => ['Terletak di Area', 'terletak-area', TerletakArea::class], + 'merupakan-daerah' => ['Merupakan Daerah', 'merupakan-daerah', MerupakanDaerah::class], + 'posisi-unit' => ['Posisi unit', 'posisi-unit', PosisiUnit::class], + 'bentuk-unit' => ['Bentuk unit', 'bentuk-unit', BentukUnit::class], + 'fasilitas-objek' => ['Fasilitas Umum Dekat Objek', 'fasilitas-objek', FasilitasObjek::class], ]; @@ -931,6 +947,12 @@ class SurveyorController extends Controller 'Model alat berat' => ModelAlatBerat::class, 'Jenis kapal' => JenisKapal::class, 'Jenis kendaraan' => JenisKendaraan::class, + 'Terletak di Area' => TerletakArea::class, + 'Posisi unit' => PosisiUnit::class, + 'Bentuk unit' => BentukUnit::class, + 'Fasilitas Umum Dekat Objek' => FasilitasObjek::class, + 'Merupakan Daerah' => MerupakanDaerah::class, + 'Jenis unit' => JenisUnit::class, ]; @@ -1067,6 +1089,12 @@ class SurveyorController extends Controller 'model-alat-berat' => ModelAlatBerat::class, 'jenis-kapal' => JenisKapal::class, 'jenis-kendaraan' => JenisKendaraan::class, + 'terletak-area' => TerletakArea::class, + 'posisi-unit' => PosisiUnit::class, + 'bentuk-unit' => BentukUnit::class, + 'fasilitas-objek' => FasilitasObjek::class, + 'merupakan-daerah' => MerupakanDaerah::class, + 'jenis-unit' => JenisUnit::class, ]; @@ -1125,6 +1153,12 @@ class SurveyorController extends Controller 'model-alat-berat' => ['Model alat berat', 'model-alat-berat'], 'jenis-kapal' => ['Jenis kapal', 'jenis-kapal'], 'jenis-kendaraan' => ['Jenis kendaraan', 'jenis-kendaraan'], + 'jenis-unit' => ['Jenis unit', 'jenis-unit'], + 'terletak-area' => ['Terletak di Area', 'terletak-area'], + 'merupakan-daerah' => ['Merupakan Daerah', 'merupakan-daerah'], + 'posisi-unit' => ['Posisi unit', 'posisi-unit'], + 'bentuk-unit' => ['Bentuk unit', 'bentuk-unit'], + 'fasilitas-objek' => ['Fasilitas Umum Dekat Objek', 'fasilitas-objek'], ]; private function getAssetData($data) diff --git a/app/Http/Requests/SurveyorRequest.php b/app/Http/Requests/SurveyorRequest.php index b6b1791..379d24b 100644 --- a/app/Http/Requests/SurveyorRequest.php +++ b/app/Http/Requests/SurveyorRequest.php @@ -3,7 +3,6 @@ namespace Modules\Lpj\Http\Requests; use Illuminate\Foundation\Http\FormRequest; - use Illuminate\Validation\Rule; class SurveyorRequest extends FormRequest @@ -32,6 +31,12 @@ class SurveyorRequest extends FormRequest 'model-alat-berat' => 'model_alat_berat', 'jenis-kapal' => 'jenis_kapal', 'jenis-kendaraan' => 'jenis_kendaraan', + 'jenis-unit' => 'jenis_unit', + 'terletak-area' => 'terletak_area', + 'merupakan-daerah' => 'merupakan_daerah', + 'posisi-unit' => 'posisi_unit', + 'bentuk-unit' => 'bentuk_unit', + 'fasilitas-objek' => 'fasilitas_objek', ]; /** diff --git a/app/Models/BentukUnit.php b/app/Models/BentukUnit.php new file mode 100644 index 0000000..0c93b1d --- /dev/null +++ b/app/Models/BentukUnit.php @@ -0,0 +1,24 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('terletak_area'); + } +}; diff --git a/database/migrations/2024_11_22_023940_create_merupakan_daerah_table.php b/database/migrations/2024_11_22_023940_create_merupakan_daerah_table.php new file mode 100644 index 0000000..cabd257 --- /dev/null +++ b/database/migrations/2024_11_22_023940_create_merupakan_daerah_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('merupakan_daerah'); + } +}; diff --git a/database/migrations/2024_11_22_024041_create_fasilitas_objek_table.php b/database/migrations/2024_11_22_024041_create_fasilitas_objek_table.php new file mode 100644 index 0000000..cbeb96e --- /dev/null +++ b/database/migrations/2024_11_22_024041_create_fasilitas_objek_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('fasilitas_objek'); + } +}; diff --git a/database/migrations/2024_11_22_025919_create_posisi_unit_table.php b/database/migrations/2024_11_22_025919_create_posisi_unit_table.php new file mode 100644 index 0000000..52d550e --- /dev/null +++ b/database/migrations/2024_11_22_025919_create_posisi_unit_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('posisi_unit'); + } +}; diff --git a/database/migrations/2024_11_22_025956_create_jenis_unit_table.php b/database/migrations/2024_11_22_025956_create_jenis_unit_table.php new file mode 100644 index 0000000..a823476 --- /dev/null +++ b/database/migrations/2024_11_22_025956_create_jenis_unit_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jenis_unit'); + } +}; diff --git a/database/migrations/2024_11_22_030026_create_bentuk_unit_table.php b/database/migrations/2024_11_22_030026_create_bentuk_unit_table.php new file mode 100644 index 0000000..1cadad0 --- /dev/null +++ b/database/migrations/2024_11_22_030026_create_bentuk_unit_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('bentuk_unit'); + } +}; diff --git a/module.json b/module.json index 9e3a069..e39f112 100644 --- a/module.json +++ b/module.json @@ -496,6 +496,49 @@ "roles": ["administrator","surveyor"] }, + { + "title": "Jenis Unit", + "path": "basicdata.jenis-unit", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + { + "title": "Bentuk Unit", + "path": "basicdata.bentuk-unit", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + { + "title": "Merupakan Daerah", + "path": "basicdata.merupakan-daerah", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + + { + "title": "Fasilitas Umum Dekat Objek", + "path": "basicdata.fasilitas-objek", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + + { + "title": "Posisi Unit", + "path": "basicdata.posisi-unit", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + { "title": "Lalu Lintas Sekitar", "path": "basicdata.lalu-lintas-lokasi", diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php new file mode 100644 index 0000000..59fdfa7 --- /dev/null +++ b/resources/views/penilai/lampiran.blade.php @@ -0,0 +1,259 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection + +@section('content') +
{{ $surveyor->userPenilaiTeam->name }}
+{{ $surveyor->userPenilaiTeam->name }} +
-{{ $permohonan->region->name }}
+{{ $permohonan->region->name }}
+{{ $penilai->userPenilaiTeam->name }} +
+ ++ {{ $permohonan->region->name }} +
+{{ $penilai->userPenilaiTeam->name }}
- -- {{ $permohonan->region->name }} +
+ {{ $permohonan->tujuanPenilaian->name }}
+ ++ @foreach ($permohonan->debiture->documents as $document) + {{ $document->jenisjaminan->name }} + @endforeach
- {{ $permohonan->tujuanPenilaian->name }}
- -- @foreach ($permohonan->debiture->documents as $document) - {{ $document->jenisjaminan->name }} - @endforeach -
-- {{ formatTanggalIndonesia($permohonan->created_at) }}
++ {{ formatTanggalIndonesia($permohonan->created_at) }}
+- {{ formatTanggalIndonesia($permohonan->created_at) }}
++ {{ formatTanggalIndonesia($permohonan->created_at) }}
+- PJ/001/001
++ PJ/001/001
+