diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 8fb1e58..d00270c 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -19,11 +19,16 @@ use Modules\Location\Models\Village; function formatTanggalIndonesia($date, $time = false) { Carbon::setLocale('id'); - $waktu = Carbon::parse($date); - if (!$time) { - return $waktu->translatedFormat('d F Y'); + try { + $waktu = Carbon::parse($date); + if (!$time) { + return $waktu->translatedFormat('d F Y'); + } + return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB'; + } catch (\Throwable $e) { + return $date; } - return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB'; + } diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e46ea62..b66021b 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -84,7 +84,6 @@ class PenilaiController extends Controller $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); - $inspeksiId = $request->query('inspeksiId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); $provinces = Province::all(); @@ -96,7 +95,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $id, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'sederhana', @@ -152,7 +150,6 @@ class PenilaiController extends Controller $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); - $inspeksiId = $request->query('inspeksiId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); @@ -164,7 +161,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $id, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'standar', @@ -219,7 +215,6 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -230,7 +225,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $permohonanId, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'resume', @@ -269,7 +263,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $req['permohonanId'], 'dokument_id' => $req['documentId'], - 'inspeksi_id' => $request->inspeksiId, ], [ 'type_penilai' => 'memo', @@ -348,7 +341,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $request->permohonan_id, 'dokument_id' => $request->dokument_id, - 'inspeksi_id' => $request->inspeksi_id, ] ); @@ -377,7 +369,6 @@ class PenilaiController extends Controller $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -398,7 +389,6 @@ class PenilaiController extends Controller $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -409,7 +399,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $permohonanId, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'rap', @@ -478,7 +467,6 @@ class PenilaiController extends Controller $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -489,7 +477,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $permohonanId, 'dokument_id' => $documentId, - 'inspeksi_id' => $inspeksiId, ], [ 'type_penilai' => 'call-report', @@ -721,7 +708,6 @@ class PenilaiController extends Controller $validatedData = $request->validate([ 'permohonan_id' => 'required|integer', 'document_id' => 'required|integer', - 'inspeksi_id' => 'required|integer', 'kertas_kerja' => 'required|file|mimes:pdf', ]); @@ -734,7 +720,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validatedData['permohonan_id'], 'dokument_id' => $validatedData['document_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], ], [ 'kertas_kerja' => $filePath, @@ -761,11 +746,9 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); $statusLpj = Penilai::where('permohonan_id', $permohonanId) ->where('dokument_id', $documentId) - ->where('inspeksi_id', $inspeksiId) ->first(); return response()->json(['status' => $statusLpj ? $statusLpj->type : null]); @@ -778,8 +761,7 @@ class PenilaiController extends Controller Penilai::updateOrCreate( [ 'permohonan_id' => $request->permohonan_id, - 'dokument_id' => $request->document_id, - 'inspeksi_id' => $request->inspeksi_id, + 'dokument_id' => $request->document_i ], [ 'type' => $request->type, @@ -887,7 +869,7 @@ class PenilaiController extends Controller $validatedData = $request->validate([ 'permohonan_id' => 'required', 'dokument_id' => 'required', - 'inspeksi_id' => 'required', + 'resume' => 'required|array', 'fakta_positif' => 'nullable|array', 'fakta_negatif' => 'nullable|array', @@ -901,7 +883,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validatedData['permohonan_id'], 'dokument_id' => $validatedData['dokument_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], + ], [ 'resume' => json_encode($validatedData['resume']), @@ -970,7 +952,6 @@ class PenilaiController extends Controller $validatedData = $request->validate([ 'permohonan_id' => 'required|integer', 'document_id' => 'required|integer', - 'inspeksi_id' => 'required|integer', 'memo' => 'required', ]); @@ -980,7 +961,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validatedData['permohonan_id'], 'dokument_id' => $validatedData['document_id'], - 'inspeksi_id' => $validatedData['inspeksi_id'], + ], [ 'memo' => json_encode($memoData), @@ -1075,7 +1056,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $request->permohonanId, 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, + ], [ 'lpj' => json_encode($data), @@ -1129,7 +1110,7 @@ class PenilaiController extends Controller [ 'permohonan_id' => $request->permohonanId, 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, + ], [ 'rap' => json_encode($data), @@ -1160,7 +1141,6 @@ class PenilaiController extends Controller $validated = $request->validate([ 'permohonan_id' => 'required|exists:permohonan,id', 'dokument_id' => 'required', - 'inspeksi_id' => 'required', 'data' => 'required', 'fakta_positif' => 'nullable|array', 'fakta_negatif' => 'nullable|array', @@ -1175,7 +1155,6 @@ class PenilaiController extends Controller [ 'permohonan_id' => $validated['permohonan_id'], 'dokument_id' => $validated['dokument_id'], - 'inspeksi_id' => $validated['inspeksi_id'], ], [ 'call_report' => json_encode($validated['data']), @@ -1389,7 +1368,6 @@ class PenilaiController extends Controller 'permohonanId' => $request->query('permohonanId'), 'documentId' => $request->query('documentId'), 'jaminanId' => $request->query('jaminanId'), - 'inspeksiId' => $request->query('inspeksiId') ]; } @@ -1397,12 +1375,10 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); - $inspeksiId = $request->query('inspeksiId'); // Ambil data berdasarkan ID $statusLpj = Penilai::where('permohonan_id', $permohonanId) ->where('dokument_id', $documentId) - ->where('inspeksi_id', $inspeksiId) ->first(); // Jika data tidak ditemukan, kembalikan status null diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 3c88325..5aeb88b 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -786,7 +786,6 @@ class PenilaianController extends Controller $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $lpj = Penilai::where('permohonan_id', $id) ->where('dokument_id', $documentId) - ->where('inspeksi_id', $inspeksi->id) ->first(); $penilai = $lpj; @@ -879,7 +878,7 @@ class PenilaianController extends Controller [ 'permohonan_id' => $request->permohonanId, 'dokument_id' => $request->documentId, - 'inspeksi_id' => $request->inspeksiId, + ], [ 'lpj' => json_encode($data), diff --git a/database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php b/database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php new file mode 100644 index 0000000..286ad78 --- /dev/null +++ b/database/migrations/2025_03_17_013537_remove_field_inspeksi_id_in_table_penilai_table.php @@ -0,0 +1,30 @@ +dropForeign(['inspeksi_id']); + $table->dropColumn('inspeksi_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('penilai', function (Blueprint $table) { + $table->unsignedBigInteger('inspeksi_id')->nullable(); + $table->foreign('inspeksi_id')->references('id')->on('inspeksi')->onDelete('cascade'); + }); + } +}; diff --git a/resources/views/penilai/components/analisa/tanah.blade.php b/resources/views/penilai/components/analisa/tanah.blade.php index 7806951..8c50a6a 100644 --- a/resources/views/penilai/components/analisa/tanah.blade.php +++ b/resources/views/penilai/components/analisa/tanah.blade.php @@ -16,7 +16,7 @@ @endphp